refactor

modules/capabilities/desktop-defaults.nix

@@ -1,66 +1,72 @@
-{ config, ... }:
-let
-  homeModules = config.flake.modules.homeManager;
-in
+{ ... }:
 {
-  flake.modules.homeManager.browser-vivaldi =
-    { pkgs, ... }:
+  flake.modules.homeManager.desktop-commands =
+    { lib, ... }:
     {
-      home.packages = [ pkgs.vivaldi ];
+      options.desktop = {
+        commands = {
+          browser = lib.mkOption {
+            type = lib.types.nonEmptyListOf lib.types.nonEmptyStr;
+          };
+          launcher = lib.mkOption {
+            type = lib.types.nonEmptyListOf lib.types.nonEmptyStr;
+          };
+          terminal = lib.mkOption {
+            type = lib.types.nonEmptyListOf lib.types.nonEmptyStr;
+          };
+        };
+        autostart = lib.mkOption {
+          type = lib.types.listOf (lib.types.nonEmptyListOf lib.types.nonEmptyStr);
+          default = [ ];
+        };
+      };
     };
 
-  flake.modules.homeManager.primary-browser-vivaldi =
+  flake.modules.homeManager.vivaldi =
     { lib, pkgs, ... }:
     let
-      browser = pkgs.vivaldi;
-      browserCommand = lib.getExe browser;
+      command = lib.getExe pkgs.vivaldi;
     in
     {
-      imports = [ homeModules.browser-vivaldi ];
-
-      facts.desktop.browserCommand = browserCommand;
-      home.sessionVariables.BROWSER = browserCommand;
-      xdg.mimeApps.defaultApplicationPackages = [ browser ];
+      desktop.commands.browser = [ command ];
+      home = {
+        packages = [ pkgs.vivaldi ];
+        sessionVariables.BROWSER = command;
+      };
+      xdg.mimeApps.defaultApplicationPackages = [ pkgs.vivaldi ];
     };
 
-  flake.modules.homeManager.file-manager-nautilus =
-    { pkgs, ... }:
+  flake.modules.homeManager.nautilus =
+    { config, pkgs, ... }:
     {
       home.packages = [ pkgs.nautilus ];
-    };
-
-  flake.modules.homeManager.primary-file-manager-nautilus =
-    { pkgs, ... }:
-    {
-      imports = [ homeModules.file-manager-nautilus ];
-
+      gtk.gtk3.bookmarks = [
+        "sftp://${config.facts.topology.server.sshAlias} Orion VPS"
+      ];
       xdg.mimeApps.defaultApplicationPackages = [ pkgs.nautilus ];
     };
 
-  flake.modules.homeManager.image-viewer-imv = {
-    programs.imv.enable = true;
-  };
-
-  flake.modules.homeManager.default-image-viewer-imv =
+  flake.modules.homeManager.imv =
     { pkgs, ... }:
     {
-      imports = [ homeModules.image-viewer-imv ];
-
+      programs.imv.enable = true;
       xdg.mimeApps.defaultApplicationPackages = [ pkgs.imv ];
     };
 
-  flake.modules.homeManager.document-viewer-sioyek = {
-    programs.sioyek.enable = true;
-  };
-
-  flake.modules.homeManager.default-document-viewer-sioyek =
+  flake.modules.homeManager.sioyek =
     { pkgs, ... }:
     {
-      imports = [ homeModules.document-viewer-sioyek ];
-
+      programs.sioyek.enable = true;
       xdg.mimeApps.defaultApplicationPackages = [ pkgs.sioyek ];
     };
 
+  flake.modules.homeManager.discord = {
+    programs.discord = {
+      enable = true;
+      settings.SKIP_HOST_UPDATE = true;
+    };
+  };
+
   flake.modules.homeManager.workstation-apps =
     { pkgs, ... }:
     {
@@ -110,9 +116,7 @@ in
           templates = "${localDir}/templates";
         };
 
-        mimeApps = {
-          enable = true;
-        };
+        mimeApps.enable = true;
       };
     };
 }