From a2c7984916d6d7a110cec60e23cb0a232da0cb9e Mon Sep 17 00:00:00 2001
From: Miguel Palhas <mpalhas@gmail.com>
Date: Fri, 4 Oct 2024 18:00:38 +0100
Subject: [PATCH] code review

---
 flake.nix                              |  1 +
 home/arrakis/default.nix               |  1 +
 home/common/programs/basePrograms.nix  |  1 -
 home/common/programs/default.nix       |  4 +++-
 home/common/programs/desktop.nix       | 26 ++++++++++++++++++++++++++
 hosts/common/features/desktop-apps.nix | 25 -------------------------
 6 files changed, 31 insertions(+), 27 deletions(-)
 delete mode 100644 home/common/programs/basePrograms.nix
 create mode 100644 home/common/programs/desktop.nix

diff --git a/flake.nix b/flake.nix
index c2c7d5d..7e084fe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -81,3 +81,4 @@
       in forEachPkg (pkgs: import ./shell.nix { inherit pkgs; });
     };
 }
+# Note: Can also be referenced withou
diff --git a/home/arrakis/default.nix b/home/arrakis/default.nix
index a1978ee..489f16d 100644
--- a/home/arrakis/default.nix
+++ b/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
diff --git a/home/common/programs/basePrograms.nix b/home/common/programs/basePrograms.nix
deleted file mode 100644
index 5117747..0000000
--- a/home/common/programs/basePrograms.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { programs = { gh.enable = true; }; }
diff --git a/home/common/programs/default.nix b/home/common/programs/default.nix
index 2aa07ec..4e2b615 100644
--- a/home/common/programs/default.nix
+++ b/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}";
diff --git a/home/common/programs/desktop.nix b/home/common/programs/desktop.nix
new file mode 100644
index 0000000..cc5d078
--- /dev/null
+++ b/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
+
+  ];
+}
diff --git a/hosts/common/features/desktop-apps.nix b/hosts/common/features/desktop-apps.nix
index f827a54..2af242e 100644
--- a/hosts/common/features/desktop-apps.nix
+++ b/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; [