refactor: move programs into graphical and shell

configs/default.nix

@@ -14,10 +14,12 @@
       ./networking.nix
       ./nix-config.nix
       ./security.nix
+      ./shell
       ./users.nix
     ]
     # Options for graphical systems.
     (lib.optionals (type == "desktop") [
+      ./graphical
       ./hardware/audio.nix
       ./hardware/bluetooth.nix
       ./stylix.nix

configs/graphical/default.nix

@@ -0,0 +1,22 @@
+{ pkgs, inputs, ... }:
+{
+  imports = [
+    ./ags.nix
+    ./clipse.nix
+    ./dunst.nix
+    ./firefox.nix
+    ./fuzzel.nix
+    ./getty.nix
+    ./hyprland.nix
+    ./hyprlock.nix
+    ./hyprshade.nix
+    ./kitty.nix
+    ./spicetify.nix
+  ];
+
+  home-manager.users.rafiq.home.packages = with pkgs; [
+    hyprpicker
+    inputs.hyprcloser.packages.${pkgs.stdenv.hostPlatform.system}.default
+    wl-clipboard # provides cli copy and paste commands
+  ];
+}

configs/programs/default.nix

@@ -1,28 +0,0 @@
-{
-  imports = [
-    ./ags.nix
-    ./clipse.nix
-    ./comma.nix
-    ./direnv.nix
-    ./dunst.nix
-    ./editorconfig.nix
-    ./firefox.nix
-    ./fuzzel.nix
-    ./fzf.nix
-    ./getty.nix
-    ./git.nix
-    ./hyprland.nix
-    ./hyprlock.nix
-    ./hyprshade.nix
-    ./kitty.nix
-    ./nh.nix
-    ./nvf.nix
-    ./spicetify.nix
-    ./starship.nix
-    ./tealdeer.nix
-    ./yazi.nix
-    ./zellij.nix
-    ./zoxide.nix
-    ./zsh.nix
-  ];
-}

configs/shell/default.nix

@@ -0,0 +1,39 @@
+{ pkgs, ... }:
+{
+  imports = [
+    ./scripts
+    ./comma.nix
+    ./direnv.nix
+    ./editorconfig.nix
+    ./fzf.nix
+    ./git.nix
+    ./nh.nix
+    ./nvf.nix
+    ./starship.nix
+    ./tealdeer.nix
+    ./yazi.nix
+    ./zellij.nix
+    ./zoxide.nix
+    ./zsh.nix
+  ];
+
+  home-manager.users.rafiq.home = {
+    shell.enableShellIntegration = true;
+    shellAliases = {
+      gs = "git status";
+      ai = "aichat -r %shell% -e";
+      cd = "z";
+      list-all-packages = "nix-store --query --requisites /run/current-system | cut -d- -f2- | sort | uniq";
+    };
+
+    packages = with pkgs; [
+      aichat
+      bat
+      btop # add settings as home-manager module
+      devenv
+      fastfetch
+      ripgrep
+      ttyper
+    ];
+  };
+}

configs/users.nix

@@ -2,14 +2,11 @@
   inputs,
   config,
   specialArgs,
-  pkgs,
   ...
 }:
 {
   imports = [
     inputs.home-manager.nixosModules.home-manager
-    ./scripts
-    ./programs
   ];
 
   home-manager = {
@@ -36,36 +33,10 @@
     ];
   };
 
-  home-manager.users.rafiq = {
+  home-manager.users.rafiq.home = {
-    home = {
     username = "rafiq";
     homeDirectory = "/home/rafiq";
-
-      # This defines the version home-manager
-      # was originally bulit against on this system.
-      # Do not change it.
     stateVersion = "25.05";
-
-      shell.enableShellIntegration = true;
-      shellAliases = {
-        gs = "git status";
-        ai = "aichat -r %shell% -e";
-        cd = "z";
-        list-all-packages = "nix-store --query --requisites /run/current-system | cut -d- -f2- | sort | uniq";
   };
 
-      packages = with pkgs; [
-        aichat # duh
-        bat
-        btop # add settings as home-manager module
-        devenv
-        fastfetch # system info
-        hyprpicker
-        inputs.hyprcloser.packages.${pkgs.stdenv.hostPlatform.system}.default
-        ripgrep
-        ttyper
-        wl-clipboard # provides cli copy and paste commands
-      ];
-    };
-  };
 }