diff --git a/etc/nixos/configuration.nix b/etc/nixos/configuration.nix
index 8a6503f..3ed8055 100644
--- a/etc/nixos/configuration.nix
+++ b/etc/nixos/configuration.nix
@@ -5,8 +5,6 @@ in {
     [
       ./hardware-configuration.nix
       (import "${home-manager}/nixos")
-      ./zsh.nix
-      ./packages.nix
     ];
 
   home-manager.useUserPackages = true;
diff --git a/etc/nixos/home.nix b/etc/nixos/home.nix
index 81f51e5..b1e1ee1 100644
--- a/etc/nixos/home.nix
+++ b/etc/nixos/home.nix
@@ -6,7 +6,17 @@
         kitty = "kitty";
         foot = "foot";
         mako = "mako";
-    }; in {
+      };
+      utilPkgs = with pkgs; [
+        alsa-utils nix-search-cli neofetch dysk nsxiv tree wl-clipboard appimage-run libnotify grim slurp yazi mate.caja htop
+      ];
+      windowManagerPkgs = with pkgs; [
+        mako nsxiv autotiling nwg-look
+      ];
+      devPkgs = with pkgs; [
+        gcc ruby_3_4 git nodejs
+      ];
+in {
     home.username = "coast";
     home.homeDirectory = "/home/coast";
     home.stateVersion = "25.05";
@@ -15,4 +25,56 @@
         source = mkSymlink "${dotDir}/${subpath}";
         recursive = true;
     }) configs;
+
+    home.packages = windowManagerPkgs ++ devPkgs ++ utilPkgs;
+
+    programs.firefox.enable = true;
+    programs.vesktop.enable = true;
+
+    programs.zsh = {
+      enable = true;
+      history = {
+        path = "/home/coast/.cache/zsh/history";
+        size = 100000000;
+        save = 100000000;
+        append = true;
+      };
+      enableCompletion = true;
+      shellAliases = {
+        nf = "neofetch";
+        nrs = "doas nixos-rebuild switch";
+        emoji = "cat ~/.local/src/local/share/emoji | grep";
+        ls = "ls --color=auto";
+        smi = "nvidia-smi";
+        battery = "sb-battery";
+        weather = "curl wttr.in/masjedsoleyman";
+        las = "ls";
+        c = "clear";
+        cear = "clear";
+        ".." = "cd ..";
+        hotp = "htop";
+        main = "man";
+        mian = "man";
+        mna = "man";
+        dias = "doas";
+        delgen = "doas nix-env --delete-generations old --profile /nix/var/nix/profiles/system";
+        alsamixer = "alsamixer -c 0 --no-color";
+        la = "ls --color=auto -la";
+      };
+      initContent = ''
+        autoload -U compinit
+        zstyle ':completion:*' menu select
+        zmodload zsh/complist
+        compinit
+        comp_options+=(globdots)
+        zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}'
+        ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=12"
+        autoload -U colors && colors && setopt prompt_subst
+        PROMPT="[%n@%m %~]$ "
+        export LIBCLANG_PATH=/usr/lib/llvm/20/lib64
+        export PATH=$PATH:/home/coast/.spicetify
+        source ~/.local/src/zsh.d/zsh-autosuggestions.zsh
+        export PATH="/usr/bin:$PATH"
+      '';
+    };
 }
diff --git a/etc/nixos/packages.nix b/etc/nixos/packages.nix
deleted file mode 100644
index ce93bef..0000000
--- a/etc/nixos/packages.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ config, pkgs, lib, ... }: {
-  home-manager.users.coast = {
-    home.packages = with pkgs; [
-      smartmontools
-      autotiling
-      nsxiv
-      nodejs
-      tree
-      zig
-      nwg-look
-      mate.caja
-      htop
-      alsa-utils
-      wl-clipboard
-      dysk
-      yazi
-      nix-search-cli
-      neofetch
-      mako
-      ruby_3_4
-      gcc
-      libnotify
-      grim
-      slurp
-      git
-      autotiling
-      appimage-run
-    ];
-
-    programs.firefox.enable = true;
-    programs.vesktop.enable = true;
-  };
-}
diff --git a/etc/nixos/zsh.nix b/etc/nixos/zsh.nix
deleted file mode 100644
index 886eb9a..0000000
--- a/etc/nixos/zsh.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ pkgs, ... }: {
-  home-manager.users.coast = {
-    programs.zsh = {
-      enable = true;
-
-      history = {
-        path = "/home/coast/.cache/zsh/history";
-        size = 100000000;
-        save = 100000000;
-        append = true;
-      };
-
-      enableCompletion = true;
-
-      shellAliases = {
-        nf = "neofetch";
-        nrs = "doas nixos-rebuild switch";
-        emoji = "cat ~/.local/src/local/share/emoji | grep";
-        ls = "ls --color=auto";
-        smi = "nvidia-smi";
-        battery = "sb-battery";
-        weather = "curl wttr.in/masjedsoleyman";
-        las = "ls";
-        c = "clear";
-        cear = "clear";
-        ".." = "cd ..";
-        hotp = "htop";
-        main = "man";
-        mian = "man";
-        mna = "man";
-        dias = "doas";
-        delgen = "doas nix-env --delete-generations old --profile /nix/var/nix/profiles/system";
-        alsamixer = "alsamixer -c 0 --no-color";
-      };
-
-      initContent = ''
-        autoload -U compinit
-        zstyle ':completion:*' menu select
-        zmodload zsh/complist
-        compinit
-        comp_options+=(globdots)
-        zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}'
-        ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=12"
-        autoload -U colors && colors && setopt prompt_subst
-        PROMPT="[%n@%m %~]$ "
-        export LIBCLANG_PATH=/usr/lib/llvm/20/lib64
-        export PATH=$PATH:/home/coast/.spicetify
-        source ~/.local/src/zsh.d/zsh-autosuggestions.zsh
-        export PATH="/usr/bin:$PATH"
-      '';
-    };
-  };
-}
-