made module categories

modules/apps/default.nix

@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./rofi
+    ./kitty.nix
+    ./zathura.nix
+  ];
+  home-manager.users.moritz.home.packages = with pkgs; [
+    neofetch
+    keepassxc
+    spotify
+    spicetify-cli
+  ];
+}

modules/cli/default.nix

@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+   ./git.nix
+   ./nix.nix
+   ./zsh.nix
+  ];
+}

modules/default.nix

@@ -2,19 +2,10 @@
 
 {
   imports = [
-    ./bspwm
+    ./apps
-    ./dunst
+    ./cli
-    ./emacs
+    ./desktop
-    ./polybar
+    ./services
-    ./rofi
-    ./agenix.nix
-    ./diskstation.nix
-    ./git.nix
-    ./kitty.nix
-    ./picom.nix
-    ./zathura.nix
-    ./zsh.nix
-    ./nix.nix
   ];
 
   # USERS
@@ -44,17 +35,6 @@
     home.username = "moritz";
     home.homeDirectory = "/home/moritz";
 
-    services = {
-      kdeconnect.enable = true;
-    };
-
-    home.packages = with pkgs; [
-      neofetch
-      keepassxc
-      spotify
-      spicetify-cli
-    ];
-
     home.stateVersion = "21.05";
   };
 }

modules/desktop/default.nix

@@ -0,0 +1,8 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./bspwm
+    ./polybar
+  ];
+}

modules/services/default.nix

@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./dunst
+    ./emacs
+    ./agenix.nix
+    ./diskstation.nix
+    ./picom.nix
+  ];
+
+  home-manager.users.moritz.services = {
+      kdeconnect.enable = true;
+  };
+}