diff --git a/configs/default.nix b/configs/default.nix
index 4f321b9..3fa3147 100644
--- a/configs/default.nix
+++ b/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
diff --git a/configs/programs/ags.nix b/configs/graphical/ags.nix
similarity index 100%
rename from configs/programs/ags.nix
rename to configs/graphical/ags.nix
diff --git a/configs/programs/ags/test b/configs/graphical/ags/test
similarity index 100%
rename from configs/programs/ags/test
rename to configs/graphical/ags/test
diff --git a/configs/programs/clipse.nix b/configs/graphical/clipse.nix
similarity index 100%
rename from configs/programs/clipse.nix
rename to configs/graphical/clipse.nix
diff --git a/configs/graphical/default.nix b/configs/graphical/default.nix
new file mode 100644
index 0000000..012fa6b
--- /dev/null
+++ b/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
+  ];
+}
diff --git a/configs/programs/dunst.nix b/configs/graphical/dunst.nix
similarity index 100%
rename from configs/programs/dunst.nix
rename to configs/graphical/dunst.nix
diff --git a/configs/programs/firefox.nix b/configs/graphical/firefox.nix
similarity index 100%
rename from configs/programs/firefox.nix
rename to configs/graphical/firefox.nix
diff --git a/configs/programs/fuzzel.nix b/configs/graphical/fuzzel.nix
similarity index 100%
rename from configs/programs/fuzzel.nix
rename to configs/graphical/fuzzel.nix
diff --git a/configs/programs/getty.nix b/configs/graphical/getty.nix
similarity index 100%
rename from configs/programs/getty.nix
rename to configs/graphical/getty.nix
diff --git a/configs/programs/hyprland.nix b/configs/graphical/hyprland.nix
similarity index 100%
rename from configs/programs/hyprland.nix
rename to configs/graphical/hyprland.nix
diff --git a/configs/programs/hyprlock.nix b/configs/graphical/hyprlock.nix
similarity index 100%
rename from configs/programs/hyprlock.nix
rename to configs/graphical/hyprlock.nix
diff --git a/configs/programs/hyprshade.nix b/configs/graphical/hyprshade.nix
similarity index 100%
rename from configs/programs/hyprshade.nix
rename to configs/graphical/hyprshade.nix
diff --git a/configs/programs/kitty.nix b/configs/graphical/kitty.nix
similarity index 100%
rename from configs/programs/kitty.nix
rename to configs/graphical/kitty.nix
diff --git a/configs/programs/spicetify.nix b/configs/graphical/spicetify.nix
similarity index 100%
rename from configs/programs/spicetify.nix
rename to configs/graphical/spicetify.nix
diff --git a/configs/programs/default.nix b/configs/programs/default.nix
deleted file mode 100644
index d2f479d..0000000
--- a/configs/programs/default.nix
+++ /dev/null
@@ -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
-  ];
-}
diff --git a/configs/programs/comma.nix b/configs/shell/comma.nix
similarity index 100%
rename from configs/programs/comma.nix
rename to configs/shell/comma.nix
diff --git a/configs/shell/default.nix b/configs/shell/default.nix
new file mode 100644
index 0000000..8245513
--- /dev/null
+++ b/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
+    ];
+  };
+}
diff --git a/configs/programs/direnv.nix b/configs/shell/direnv.nix
similarity index 100%
rename from configs/programs/direnv.nix
rename to configs/shell/direnv.nix
diff --git a/configs/programs/editorconfig.nix b/configs/shell/editorconfig.nix
similarity index 100%
rename from configs/programs/editorconfig.nix
rename to configs/shell/editorconfig.nix
diff --git a/configs/programs/fzf.nix b/configs/shell/fzf.nix
similarity index 100%
rename from configs/programs/fzf.nix
rename to configs/shell/fzf.nix
diff --git a/configs/programs/git.nix b/configs/shell/git.nix
similarity index 100%
rename from configs/programs/git.nix
rename to configs/shell/git.nix
diff --git a/configs/programs/nh.nix b/configs/shell/nh.nix
similarity index 100%
rename from configs/programs/nh.nix
rename to configs/shell/nh.nix
diff --git a/configs/programs/nvf.nix b/configs/shell/nvf.nix
similarity index 100%
rename from configs/programs/nvf.nix
rename to configs/shell/nvf.nix
diff --git a/configs/programs/nvf/input.nix b/configs/shell/nvf/input.nix
similarity index 100%
rename from configs/programs/nvf/input.nix
rename to configs/shell/nvf/input.nix
diff --git a/configs/programs/nvf/languages.nix b/configs/shell/nvf/languages.nix
similarity index 100%
rename from configs/programs/nvf/languages.nix
rename to configs/shell/nvf/languages.nix
diff --git a/configs/programs/nvf/ui.nix b/configs/shell/nvf/ui.nix
similarity index 100%
rename from configs/programs/nvf/ui.nix
rename to configs/shell/nvf/ui.nix
diff --git a/configs/programs/nvf/utilities.nix b/configs/shell/nvf/utilities.nix
similarity index 100%
rename from configs/programs/nvf/utilities.nix
rename to configs/shell/nvf/utilities.nix
diff --git a/configs/scripts/byebye.sh b/configs/shell/scripts/byebye.sh
similarity index 100%
rename from configs/scripts/byebye.sh
rename to configs/shell/scripts/byebye.sh
diff --git a/configs/scripts/default.nix b/configs/shell/scripts/default.nix
similarity index 100%
rename from configs/scripts/default.nix
rename to configs/shell/scripts/default.nix
diff --git a/configs/scripts/git-extract.py b/configs/shell/scripts/git-extract.py
similarity index 100%
rename from configs/scripts/git-extract.py
rename to configs/shell/scripts/git-extract.py
diff --git a/configs/scripts/rebuild.sh b/configs/shell/scripts/rebuild.sh
similarity index 100%
rename from configs/scripts/rebuild.sh
rename to configs/shell/scripts/rebuild.sh
diff --git a/configs/programs/starship.nix b/configs/shell/starship.nix
similarity index 100%
rename from configs/programs/starship.nix
rename to configs/shell/starship.nix
diff --git a/configs/programs/tealdeer.nix b/configs/shell/tealdeer.nix
similarity index 100%
rename from configs/programs/tealdeer.nix
rename to configs/shell/tealdeer.nix
diff --git a/configs/programs/yazi.nix b/configs/shell/yazi.nix
similarity index 100%
rename from configs/programs/yazi.nix
rename to configs/shell/yazi.nix
diff --git a/configs/programs/yazi/starship.toml b/configs/shell/yazi/starship.toml
similarity index 100%
rename from configs/programs/yazi/starship.toml
rename to configs/shell/yazi/starship.toml
diff --git a/configs/programs/zellij.nix b/configs/shell/zellij.nix
similarity index 100%
rename from configs/programs/zellij.nix
rename to configs/shell/zellij.nix
diff --git a/configs/programs/zoxide.nix b/configs/shell/zoxide.nix
similarity index 100%
rename from configs/programs/zoxide.nix
rename to configs/shell/zoxide.nix
diff --git a/configs/programs/zsh.nix b/configs/shell/zsh.nix
similarity index 100%
rename from configs/programs/zsh.nix
rename to configs/shell/zsh.nix
diff --git a/configs/users.nix b/configs/users.nix
index 8bfba46..33cc601 100644
--- a/configs/users.nix
+++ b/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 = {
-      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
-      ];
-    };
+  home-manager.users.rafiq.home = {
+    username = "rafiq";
+    homeDirectory = "/home/rafiq";
+    stateVersion = "25.05";
   };
+
 }