commit message

modules/apps/audio/default.nix

@@ -24,6 +24,7 @@
           [
             pavucontrol
             playerctl
+            streamrip
           ]
         else
           [ ]

modules/apps/default.nix

@@ -11,6 +11,8 @@
     ./development
     ./gaming
     ./image
+    ./internet
+    ./messaging
     ./misc
     ./peripherals
     ./video

modules/apps/development/editor.nix

@@ -7,7 +7,7 @@
 
 {
   options = {
-    development = {
+    apps.development = {
       editor = {
         vscodium.enable = lib.mkEnableOption "enable vscodium";
         emacs.enable = lib.mkEnableOption "enable emacs";
@@ -25,15 +25,15 @@
       [
         nixfmt
       ]
-      ++ (if config.development.editor.vscodium.enable then [ vscodium ] else [ ]);
+      ++ (if config.apps.development.editor.vscodium.enable then [ vscodium ] else [ ]);
 
     programs = {
       vscode =
-        if config.development.editor.vscodium.enable then
+        if config.apps.development.editor.vscodium.enable then
           {
             enable = true;
             package = pkgs.vscodium;
-            defaultEditor = if (config.development.editor.default == "vscodium") then true else false;
+            defaultEditor = if (config.apps.development.editor.default == "vscodium") then true else false;
             # profiles.default.extensions = with pkgs.vscode-extensions; [
             #   catppuccin.catppuccin-vsc
             #   catppuccin.catppuccin-vsc-icons
@@ -51,11 +51,11 @@
     };
     services = {
       emacs =
-        if config.development.editor.emacs.enable then
+        if config.apps.development.editor.emacs.enable then
           {
             enable = true;
             install = true;
-            defaultEditor = if (config.development.editor.default == "emacs") then true else false;
+            defaultEditor = if (config.apps.development.editor.default == "emacs") then true else false;
           }
         else
           { };

modules/apps/internet/browser.nix

@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  inputs,
   ...
 }:
 
@@ -10,13 +11,25 @@
     apps.internet.browsers = {
       zen-browser = {
         enable = lib.mkEnableOption "enable zen browser";
-        package = inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default;
-        binary = "${config.apps.internet.browsers.zen-browser.package}/bin/zen";
+        package = lib.mkOption {
+          default = inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default;
+          description = "zen browser package";
+        };
+        binary = lib.mkOption {
+          default = "${config.apps.internet.browsers.zen-browser.package}/bin/zen";
+          description = "zen browser binary";
+        };
       };
       tor-browser = {
         enable = lib.mkEnableOption "enable tor browser";
-        package = pkgs.tor-browser;
-        binary = "${config.apps.internet.browsers.tor-browser.package}/bin/tor-browser";
+        package = lib.mkOption {
+          default = pkgs.tor-browser;
+          description = "zen browser package";
+        };
+        binary = lib.mkOption {
+          default = "${config.apps.internet.browsers.tor-browser.package}/bin/tor-browser";
+          description = "zen browser binary";
+        };
       };
       default = lib.mkOption {
         default = "zen";

modules/apps/internet/mail.nix

@@ -0,0 +1,35 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options = {
+    apps.internet = {
+      mail.enable = lib.mkEnableOption "enable e-mail";
+      mail.providers.protonmail.enable = lib.mkEnableOption "enable protonmail";
+    };
+  };
+  config = {
+    programs = {
+      thunderbird =
+        if config.apps.internet.mail.enable then
+          {
+            enable = true;
+          }
+        else
+          { };
+    };
+    services = {
+      protonmail-bridge =
+        if config.apps.internet.mail.providers.protonmail.enable then
+          {
+            enable = true;
+          }
+        else
+          { };
+    };
+  };
+}

modules/apps/messaging/default.nix

@@ -0,0 +1,26 @@
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}:
+
+{
+  options = {
+    apps.messaging = {
+      signal.enable = lib.mkEnableOption "enable signal";
+      element = {
+        enable = lib.mkEnableOption "enable element";
+        selfhosted = lib.mkEnableOption "selfhosted matrix server?";
+      };
+    };
+  };
+  config = {
+    environment.systemPackages =
+      with pkgs;
+      [ ]
+      ++ (if config.apps.messaging.element.enable then [ element-desktop ] else [ ])
+      ++ (if config.apps.messaging.signal.enable then [ signal-desktop ] else [ ]);
+  };
+}

modules/apps/misc/default.nix

@@ -33,11 +33,13 @@
       ++ (
         if (config.apps.misc.bitwarden.enable) then
 
-          [ rbw ]
+          [
+            rbw
+            pinentry-curses
+          ]
           ++ (
             if (config.desktop.shell.rofi.enable) then
               [
-                pinentry-curses
                 rofi-rbw
               ]
             else

modules/apps/sync/default.nix

@@ -12,6 +12,9 @@
       kde-connect = {
         enable = lib.mkEnableOption "enable kde-connect";
       };
+      nextcloud = {
+        enable = lib.mkEnableOption "enable nextcloud client";
+      };
       syncthing = {
         enable = lib.mkEnableOption "enable syncthing";
         devices = lib.mkOption {
@@ -30,6 +33,17 @@
     };
   };
   config = {
+    environment.systemPackages =
+      with pkgs;
+      [ ]
+      ++ (
+        if config.apps.sync.nextcloud.enable then
+          [
+            nextcloud-client
+          ]
+        else
+          [ ]
+      );
     programs = {
       kdeconnect =
         if config.apps.sync.kde-connect.enable then

modules/apps/terminal/kitty.nix

@@ -14,14 +14,10 @@
   };
 
   config = {
-    # apps.terminal =
-    #   if (config.apps.terminal.default == "kitty") then
-    #     {
-    #       package = pkgs.kitty;
-    #       binary = "${pkgs.kitty}/bin/kitty";
-    #     }
-    #   else
-    #     { };
+    apps.terminal = {
+      package = pkgs.kitty;
+      binary = "${pkgs.kitty}/bin/kitty";
+    };
     environment.systemPackages =
       with pkgs;
       [ ]

modules/apps/video/default.nix

@@ -22,7 +22,10 @@
       ++ (
         if config.apps.video.base.enable then
 
-          [ mpv ]
+          [
+            mpv
+            yt-dlp
+          ]
         else
           [ ]
       )