refactor

modules/capabilities/desktop-defaults.nix

@@ -1,38 +1,40 @@
 { config, ... }:
 let
   homeModules = config.flake.modules.homeManager;
-  vivaldiPackage = pkgs: pkgs.vivaldi;
-  nautilusPackage = pkgs: pkgs.nautilus;
 in
 {
   flake.modules.homeManager.browser-vivaldi =
     { pkgs, ... }:
     {
-      home.packages = [ (vivaldiPackage pkgs) ];
+      home.packages = [ pkgs.vivaldi ];
     };
 
   flake.modules.homeManager.primary-browser-vivaldi =
     { lib, pkgs, ... }:
+    let
+      browser = pkgs.vivaldi;
+      browserCommand = lib.getExe browser;
+    in
     {
       imports = [ homeModules.browser-vivaldi ];
 
-      facts.desktop.browserCommand = lib.getExe (vivaldiPackage pkgs);
-      home.sessionVariables.BROWSER = lib.getExe (vivaldiPackage pkgs);
-      xdg.mimeApps.defaultApplicationPackages = [ (vivaldiPackage pkgs) ];
+      facts.desktop.browserCommand = browserCommand;
+      home.sessionVariables.BROWSER = browserCommand;
+      xdg.mimeApps.defaultApplicationPackages = [ browser ];
     };
 
   flake.modules.homeManager.file-manager-nautilus =
     { pkgs, ... }:
     {
-      home.packages = [ (nautilusPackage pkgs) ];
+      home.packages = [ pkgs.nautilus ];
     };
 
   flake.modules.homeManager.primary-file-manager-nautilus =
-    { lib, pkgs, ... }:
+    { pkgs, ... }:
     {
       imports = [ homeModules.file-manager-nautilus ];
 
-      xdg.mimeApps.defaultApplicationPackages = [ (nautilusPackage pkgs) ];
+      xdg.mimeApps.defaultApplicationPackages = [ pkgs.nautilus ];
     };
 
   flake.modules.homeManager.image-viewer-imv = {