diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index b15f382..ab2d1e0 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -128,8 +128,6 @@
     extraGroups = [ "networkmanager" "wheel" "libvirtd" ];
     packages = with pkgs; [
       gnome-boxes
-      go
-      gopls
       i2p
       jellyfin-media-player
       jq
diff --git a/hosts/default/golang.nix b/hosts/default/golang.nix
new file mode 100644
index 0000000..84c3d4c
--- /dev/null
+++ b/hosts/default/golang.nix
@@ -0,0 +1,6 @@
+{ config, pkgs, ... }: {
+  home.packages = with pkgs; [
+    go
+    gopls
+  ];
+}
diff --git a/hosts/default/home.nix b/hosts/default/home.nix
index cb86402..9eff0cb 100644
--- a/hosts/default/home.nix
+++ b/hosts/default/home.nix
@@ -17,6 +17,7 @@
     ./rust.nix
     ./shell.nix
     ./video-editing.nix
+    ./golang.nix
     ./zellij.nix
     # ./hud.nix
   ];