diff --git a/home-server.nix b/home-server.nix
index 0a1ced1..979fbc6 100644
--- a/home-server.nix
+++ b/home-server.nix
@@ -38,67 +38,6 @@
 		PLATFORMTHEME = "kde";
 	};
 	home.packages = with pkgs; [
-		autossh
-		fastfetch
-		ranger
-		zip
-		unzip
-		xz
-		p7zip
-		ripgrep
-		jq
-		ripgrep
-		eza
-		fzf
-		tmux
-		cowsay
-		lolcat
-		fortune
-		gnused
-		gnutar
-		gnupg
-		hugo
-		bat
-		which
-		nix-output-monitor
-		devenv
-		irssi
-		luarocks
-		lua5_1
-		lua-language-server
-		go
-		nodejs
-		uv
-		readline
-		cachix
-		sqlite
-		vifm-full
-		ranger
-		zoxide
-		(
-			python313.withPackages (
-				python-pkgs: 
-				[
-					python-pkgs.prompt_toolkit
-					python-pkgs.pygments
-					python-pkgs.pynvim
-					python-pkgs.pudb
-					python-pkgs.ptpython
-					python-pkgs.ipython
-				]
-			)
-		)
-		neovim
-		zig
-		syncthing
-		lazygit
-		wofi
-		gopls
-		pyright
-		ncurses
-		rustup
-		wayvnc
-		gvfs
 	];
 	home.stateVersion = "25.05";
 }
diff --git a/home-xps13.nix b/home-xps13.nix
index 001a558..8285d96 100644
--- a/home-xps13.nix
+++ b/home-xps13.nix
@@ -53,85 +53,23 @@
 		PLATFORMTHEME = "kde";
 	};
 	home.packages = with pkgs; [
-		autossh
 		mesa-demos
 		bluez
 		bluez-tools
 		bluez-alsa
-		fastfetch
-		ranger
 		kdePackages.dolphin
-		zip
-		unzip
-		xz
-		p7zip
-		ripgrep
-		jq
-		ripgrep
-		eza
-		fzf
-		tmux
-		cowsay
-		lolcat
-		fortune
-		gnused
-		gnutar
-		gnupg
-		hugo
-		bat
-		which
-		nix-output-monitor
-		devenv
-		irssi
-		luarocks
-		lua5_1
 		gimp
-		lua-language-server
-		go
-		nodejs
-		uv
-		readline
-		cachix
-		sqlite
 		rofi
 		qutebrowser
 		foot
-		vifm-full
-		ranger
-		zoxide
 		hyprsysteminfo
-		(
-			python313.withPackages (
-				python-pkgs: 
-				[
-					python-pkgs.prompt_toolkit
-					python-pkgs.pygments
-					python-pkgs.pynvim
-					python-pkgs.pudb
-					python-pkgs.ptpython
-					python-pkgs.ipython
-				]
-			)
-		)
-		neovim
-		zig
-		nodejs
-		go
-		syncthing
 		dosbox-x
-		lazygit
 		wofi
 		qutebrowser
 		waybar
 		uwsm
-		gopls
-		pyright
-		ncurses
-		rustup
-		wayvnc
 		power-profiles-daemon
 		wpa_supplicant_gui
-		gvfs
 	];
 	programs.wofi = {
 		enable = true;
diff --git a/modules/home-manager-common.nix b/modules/home-manager-common.nix
index d3a2097..3c35929 100644
--- a/modules/home-manager-common.nix
+++ b/modules/home-manager-common.nix
@@ -3,6 +3,71 @@
 {
 	imports = [
 	];
+	home.packages = with pkgs; [
+		autossh
+		fastfetch
+		ranger
+		zip
+		unzip
+		xz
+		p7zip
+		ripgrep
+		jq
+		ripgrep
+		eza
+		fzf
+		tmux
+		cowsay
+		lolcat
+		fortune
+		gnused
+		gnutar
+		gnupg
+		hugo
+		bat
+		which
+		nix-output-monitor
+		devenv
+		direnv
+		irssi
+		luarocks
+		lua5_1
+		lua-language-server
+		go
+		nodejs
+		uv
+		readline
+		cachix
+		sqlite
+		vifm-full
+		ranger
+		zoxide
+		(
+			python313.withPackages (
+				python-pkgs: 
+				[
+					python-pkgs.prompt_toolkit
+					python-pkgs.pygments
+					python-pkgs.pynvim
+					python-pkgs.pudb
+					python-pkgs.ptpython
+					python-pkgs.ipython
+				]
+			)
+		)
+		neovim
+		zig
+		nodejs
+		go
+		syncthing
+		lazygit
+		gopls
+		pyright
+		ncurses
+		rustup
+		wayvnc
+		gvfs
+	];
 
 	programs.neovim.plugins = [
 		pkgs.vimPlugins.nvim-treesitter.withAllGrammars