19 files changed, 2 insertions, 3 deletions
diff --git a/common/home/default.nix b/common/home/default.nix
index ac7a9dc..aceeaba 100644
--- a/common/home/default.nix
+++ b/common/home/default.nix
@@ -27,7 +27,6 @@ let
     "gpg-agent"
   ];
   packages = [
-    pkgs.networkmanagerapplet
     pkgs.pavucontrol
     pkgs.wl-clipboard
     pkgs.virt-manager
@@ -42,7 +41,7 @@ in
       map (n: {
         name = n;
         value =
-          if builtins.pathExists ./${n}/default.nix then
+          if builtins.pathExists ./${n}/programs/default.nix then
             (import ./${n} {
               inherit pkgs;
               home = config.home-manager.users.n8.home;
@@ -56,7 +55,7 @@ in
       map (n: {
         name = n;
         value =
-          if builtins.pathExists ./${n}/default.nix then
+          if builtins.pathExists ./${n}/services/default.nix then
             (import ./${n} { inherit pkgs; })
           else
             { enable = true; };
diff --git a/common/home/alacritty/default.nix b/common/home/programs/alacritty/default.nix
index 85b539f..85b539f 100644
--- a/common/home/alacritty/default.nix
+++ b/common/home/programs/alacritty/default.nix
diff --git a/common/home/btop/default.nix b/common/home/programs/btop/default.nix
index 949b5f8..949b5f8 100644
--- a/common/home/btop/default.nix
+++ b/common/home/programs/btop/default.nix
diff --git a/common/home/firefox/default.nix b/common/home/programs/firefox/default.nix
index 674384f..674384f 100644
--- a/common/home/firefox/default.nix
+++ b/common/home/programs/firefox/default.nix
diff --git a/common/home/git/default.nix b/common/home/programs/git/default.nix
index 91878ea..91878ea 100644
--- a/common/home/git/default.nix
+++ b/common/home/programs/git/default.nix
diff --git a/common/home/gpg/default.nix b/common/home/programs/gpg/default.nix
index 2c1ec57..2c1ec57 100644
--- a/common/home/gpg/default.nix
+++ b/common/home/programs/gpg/default.nix
diff --git a/common/home/hyprlock/default.nix b/common/home/programs/hyprlock/default.nix
index 91a28ea..91a28ea 100644
--- a/common/home/hyprlock/default.nix
+++ b/common/home/programs/hyprlock/default.nix
diff --git a/common/home/nixvim/default.nix b/common/home/programs/nixvim/default.nix
index 628b8d0..628b8d0 100644
--- a/common/home/nixvim/default.nix
+++ b/common/home/programs/nixvim/default.nix
diff --git a/common/home/opam/default.nix b/common/home/programs/opam/default.nix
index d0baee2..d0baee2 100644
--- a/common/home/opam/default.nix
+++ b/common/home/programs/opam/default.nix
diff --git a/common/home/password-store/default.nix b/common/home/programs/password-store/default.nix
index 29bbfb3..29bbfb3 100644
--- a/common/home/password-store/default.nix
+++ b/common/home/programs/password-store/default.nix
diff --git a/common/home/ssh/default.nix b/common/home/programs/ssh/default.nix
index da761d5..da761d5 100644
--- a/common/home/ssh/default.nix
+++ b/common/home/programs/ssh/default.nix
diff --git a/common/home/waybar/default.nix b/common/home/programs/waybar/default.nix
index 7e59bf2..7e59bf2 100644
--- a/common/home/waybar/default.nix
+++ b/common/home/programs/waybar/default.nix
diff --git a/common/home/waybar/style.css b/common/home/programs/waybar/style.css
index d3dc7a1..d3dc7a1 100644
--- a/common/home/waybar/style.css
+++ b/common/home/programs/waybar/style.css
diff --git a/common/home/wofi/default.nix b/common/home/programs/wofi/default.nix
index d8cf5a9..d8cf5a9 100644
--- a/common/home/wofi/default.nix
+++ b/common/home/programs/wofi/default.nix
diff --git a/common/home/wofi/style.css b/common/home/programs/wofi/style.css
index 7e38346..7e38346 100644
--- a/common/home/wofi/style.css
+++ b/common/home/programs/wofi/style.css
diff --git a/common/home/zsh/default.nix b/common/home/programs/zsh/default.nix
index ef08f7f..ef08f7f 100644
--- a/common/home/zsh/default.nix
+++ b/common/home/programs/zsh/default.nix
diff --git a/common/home/gpg-agent/default.nix b/common/home/services/gpg-agent/default.nix
index d29f924..d29f924 100644
--- a/common/home/gpg-agent/default.nix
+++ b/common/home/services/gpg-agent/default.nix
diff --git a/common/home/hyprpaper/default.nix b/common/home/services/hyprpaper/default.nix
index 56a11e1..56a11e1 100644
--- a/common/home/hyprpaper/default.nix
+++ b/common/home/services/hyprpaper/default.nix
diff --git a/common/home/syncthing/default.nix b/common/home/services/syncthing/default.nix
index 3887830..3887830 100644
--- a/common/home/syncthing/default.nix
+++ b/common/home/services/syncthing/default.nix