diff --git a/nixos/core.nix b/nixos/core.nix
index 14d143e..d902324 100644
--- a/nixos/core.nix
+++ b/nixos/core.nix
@@ -8,6 +8,7 @@
   ...
 }: {
   imports = [
+    ./core/packages.nix
     ./core/programs.nix
   ];
 }
diff --git a/nixos/core/packages.nix b/nixos/core/packages.nix
new file mode 100644
index 0000000..fad4b82
--- /dev/null
+++ b/nixos/core/packages.nix
@@ -0,0 +1,61 @@
+{
+  inputs,
+  lib,
+  config,
+  pkgs,
+  unstablePkgs,
+  ...
+}: {
+  environment.systemPackages = [
+    pkgs.atuin
+    pkgs.bat
+    pkgs.bitwarden-cli
+    pkgs.bottom
+    pkgs.brotli
+    pkgs.delta
+    pkgs.du-dust
+    pkgs.duf
+    pkgs.fastfetch
+    pkgs.fd
+    pkgs.fzf
+    pkgs.gcc
+    pkgs.gh
+    pkgs.git
+    pkgs.git-extras
+    pkgs.glab
+    pkgs.glow
+    pkgs.gnumake
+    pkgs.gnupg
+    pkgs.hexyl
+    pkgs.killall
+    pkgs.less
+    pkgs.libsecret
+    pkgs.micro
+    pkgs.netcat-gnu
+    pkgs.nix-index
+    pkgs.openssl
+    pkgs.ouch
+    pkgs.pass
+    pkgs.passh
+    pkgs.pkg-config
+    pkgs.podman-compose
+    pkgs.powertop
+    pkgs.pueue
+    pkgs.ripgrep
+    pkgs.rm-improved
+    pkgs.starship
+    pkgs.tealdeer
+    pkgs.wget
+    pkgs.wl-clipboard
+    pkgs.xclip
+    pkgs.xcp
+    pkgs.zellij
+    pkgs.zoxide
+    unstablePkgs.just
+    unstablePkgs.neovim
+    unstablePkgs.nushell
+    unstablePkgs.onefetch
+    unstablePkgs.serie
+    unstablePkgs.yazi
+  ];
+}
diff --git a/nixos/homeserver.nix b/nixos/homeserver.nix
index 94f9a52..cb4575b 100644
--- a/nixos/homeserver.nix
+++ b/nixos/homeserver.nix
@@ -122,58 +122,7 @@
 
   # $ nix search wget
   environment.systemPackages = [
-    pkgs.atuin
-    pkgs.bat
-    pkgs.bitwarden-cli
-    pkgs.bottom
-    pkgs.delta
-    pkgs.du-dust
-    pkgs.duf
-    pkgs.fastfetch
-    pkgs.fd
-    pkgs.fzf
-    pkgs.gh
-    pkgs.git
-    pkgs.git-extras
-    pkgs.glab
-    pkgs.glow
-    pkgs.gnupg
-    pkgs.hexyl
-    pkgs.killall
-    pkgs.less
-    pkgs.libsecret
-    pkgs.netcat-gnu
-    pkgs.nix-index
-    pkgs.openssl
-    pkgs.ouch
-    pkgs.pass
-    pkgs.passh
-    pkgs.pueue
     pkgs.pinentry-tty
-    pkgs.pkg-config
-    pkgs.podman-compose
-    pkgs.powertop
-    pkgs.pueue
-    pkgs.ripgrep
-    pkgs.rm-improved
-    pkgs.starship
-    pkgs.tealdeer
-    pkgs.wget
-    pkgs.wl-clipboard
-    pkgs.xclip
-    pkgs.xcp
-    pkgs.zellij
-    pkgs.zoxide
-    pkgs.brotli
-    pkgs.gcc
-    pkgs.gnumake
-    pkgs.micro
-    unstablePkgs.just
-    unstablePkgs.neovim
-    unstablePkgs.nushell
-    unstablePkgs.onefetch
-    unstablePkgs.serie
-    unstablePkgs.yazi
   ];
 
   # Enable the OpenSSH daemon and other remote tools.
diff --git a/nixos/worklaptop.nix b/nixos/worklaptop.nix
index aa7454c..9b3d1a8 100644
--- a/nixos/worklaptop.nix
+++ b/nixos/worklaptop.nix
@@ -174,93 +174,38 @@
 
   # $ nix search wget
   environment.systemPackages = [
-    # shell env programs
-    pkgs.atuin
-    pkgs.bat
-    pkgs.bitwarden-cli
-    pkgs.bottom
-    pkgs.delta
-    pkgs.du-dust
-    pkgs.duf
-    pkgs.fastfetch
-    pkgs.fd
-    pkgs.fzf
-    pkgs.gdm
-    pkgs.gh
-    pkgs.git
-    pkgs.git-extras
-    pkgs.glab
-    pkgs.glow
-    pkgs.gnupg
-    pkgs.grub2_efi
-    pkgs.hexyl
-    pkgs.killall
-    pkgs.less
-    pkgs.libsecret
-    pkgs.mosh
-    pkgs.netcat-gnu
-    pkgs.nix-index
-    pkgs.nix-ld
-    pkgs.nmap
-    pkgs.nodejs
-    pkgs.openssl
-    pkgs.ouch
-    pkgs.pass
-    pkgs.passh
-    pkgs.phinger-cursors
-    pkgs.pinentry-gnome3
-    pkgs.pkg-config
-    pkgs.podman-compose
-    pkgs.powertop
-    pkgs.pueue
-    pkgs.qmk
-    pkgs.qmk-udev-rules
-    pkgs.qmk_hid
-    pkgs.ripgrep
-    pkgs.rm-improved
-    pkgs.seahorse
-    pkgs.starship
-    pkgs.tealdeer
-    pkgs.wget
-    pkgs.wl-clipboard
-    pkgs.xclip
-    pkgs.xcp
-    pkgs.xfce.thunar
-    pkgs.xfce.tumbler
-    pkgs.zellij
-    pkgs.zoxide
-    unstablePkgs.yazi
-    # package managers
     pkgs.flatpak
-    # back-end dev tools
-    pkgs.brotli
-    pkgs.gcc
-    pkgs.gnumake
-    unstablePkgs.just
-    unstablePkgs.ruff
-    unstablePkgs.serie
-    unstablePkgs.uv
-    # front-end dev environment
-    pkgs.micro
-    unstablePkgs.ghostty
-    unstablePkgs.neovim
-    unstablePkgs.nushell
-    unstablePkgs.onefetch
-    # DE and accompanying tools
-    pkgs.wayland
-    pkgs.wayland-utils
-    pkgs.sway # More stable, backup DE
+    pkgs.gdm
+    pkgs.grub2_efi
     pkgs.hyprland
     pkgs.hyprlock
     pkgs.hyprpaper
     pkgs.hyprpicker
     pkgs.hyprshot
+    pkgs.mosh
+    pkgs.nix-ld
+    pkgs.nmap
+    pkgs.nodejs
+    pkgs.phinger-cursors
+    pkgs.pinentry-gnome3
+    pkgs.qmk
+    pkgs.qmk-udev-rules
+    pkgs.qmk_hid
+    pkgs.seahorse
+    pkgs.sway # More stable, backup DE
+    pkgs.wayland
+    pkgs.wayland-utils
+    pkgs.xdg-desktop-portal-gtk
     pkgs.xdg-desktop-portal-hyprland
     pkgs.xdg-desktop-portal-wlr
-    pkgs.xdg-desktop-portal-gtk
     pkgs.xdg-desktop-portal-xapp
+    pkgs.xfce.thunar
+    pkgs.xfce.tumbler
+    unstablePkgs.ghostty
     unstablePkgs.libnotify
+    unstablePkgs.ruff
     unstablePkgs.swaynotificationcenter
+    unstablePkgs.uv
     unstablePkgs.waybar
     unstablePkgs.wofi
   ];