diff --git a/home/gui/default.nix b/home/gui/default.nix
index aa6fecc..b3056bb 100644
--- a/home/gui/default.nix
+++ b/home/gui/default.nix
@@ -9,8 +9,15 @@
 	];
 
 	home.packages = with pkgs; [
+		bazel
+		bazel-buildtools
+		cdrtools
+		ffmpeg
 		gopls
+		jdk11
+		libtheora
 		synology-drive-client
+		x265
 		zoom-us
 	] ++ ( if pkgs.system == "x86_64-darwin" then
 		[
diff --git a/home/home.nix b/home/home.nix
index 60c91da..424a327 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -32,12 +32,8 @@ in {
 
 	home.stateVersion = "22.05";
 	home.packages = with pkgs; [
-		bazel
-		bazel-buildtools
 		bitwarden-cli
-		cdrtools
 		diffutils
-		ffmpeg
 		findutils
 		gh
 		git
@@ -45,9 +41,7 @@ in {
 		gregpy
 		hms
 		htop
-		jdk11
 		jq
-		libtheora
 		nmap
 		nano
 		openssl
@@ -55,7 +49,6 @@ in {
 		transcrypt
 		unzip
 		wget
-		x265
 		yamllint
 		#yawsso
 	];