code review

flake.nix

@@ -81,3 +81,4 @@
       in forEachPkg (pkgs: import ./shell.nix { inherit pkgs; });
     };
 }
+# Note: Can also be referenced withou

home/arrakis/default.nix

@@ -4,6 +4,7 @@
     inputs.nixvim.homeManagerModules.nixvim
     catppuccin.homeManagerModules.catppuccin
     ../common/programs/default.nix
+    ../common/programs/desktop.nix
     ../common/programs/hyprland.nix
     ../common/programs/eww
     ../common/programs/kitty.nix

home/common/programs/basePrograms.nix

@@ -1 +0,0 @@
-{ pkgs, ... }: { programs = { gh.enable = true; }; }

home/common/programs/default.nix

@@ -1,5 +1,7 @@
 { lib, config, ... }: {
-  imports = [ ./basePrograms.nix ./zsh.nix ./neovim ./solidity.nix ];
+  imports = [ ./zsh.nix ./neovim ./solidity.nix ];
+
+  programs.gh.enable = true;
 
   home = {
     homeDirectory = lib.mkDefault "/home/${config.home.username}";

home/common/programs/desktop.nix

@@ -0,0 +1,26 @@
+{ pkgs, ... }: {
+  home.packages = [
+    # various
+    pkgs.google-chrome
+    pkgs.firefox-devedition
+    pkgs.spotify
+    pkgs.spicetify-cli
+    pkgs.xfce.thunar
+    pkgs.obsidian
+    pkgs.mpv
+    pkgs.obs-studio
+    pkgs.calibre
+    pkgs.gimp
+    pkgs.font-manager
+
+    # communication
+    pkgs.slack
+    pkgs.zoom-us
+
+    # dev tools
+    pkgs.ferdium
+    pkgs.bruno
+    pkgs.bun
+
+  ];
+}

hosts/common/features/desktop-apps.nix

@@ -1,29 +1,4 @@
 { inputs, pkgs, fonts, ... }: {
-  environment.systemPackages = [
-    # various
-    pkgs.google-chrome
-    pkgs.firefox-devedition
-    pkgs.spotify
-    pkgs.spicetify-cli
-    pkgs.xfce.thunar
-    pkgs.obsidian
-    pkgs.mpv
-    pkgs.obs-studio
-    pkgs.calibre
-    pkgs.gimp
-    pkgs.font-manager
-
-    # communication
-    pkgs.slack
-    pkgs.zoom-us
-
-    # dev tools
-    pkgs.ferdium
-    pkgs.bruno
-    pkgs.bun
-
-  ];
-
   fonts = {
     enableDefaultPackages = true;
     packages = with pkgs; [