diff --git a/home/apps/neovim.nix b/home/apps/neovim.nix
index 6633a2f..8050307 100644
--- a/home/apps/neovim.nix
+++ b/home/apps/neovim.nix
@@ -34,6 +34,7 @@
       taplo
 
       # go
+      go
       delve
       ginkgo
       gofumpt
@@ -52,8 +53,10 @@
       nodePackages.vscode-langservers-extracted
       nodePackages.yaml-language-server
       nodePackages.intelephense
+      yarn
 
       # rust
+      cargo
       rust-analyzer
       rustc
       rustfmt
@@ -74,11 +77,9 @@
       pkgs.nur.repos.bandithedoge.nodePackages.emmet-ls
 
       # needed for some plugin build steps
-      cargo
-      yarn
-      unzip
       gcc
       gnumake
+      unzip
     ];
   };
 
diff --git a/home/default.nix b/home/default.nix
index 8ac9365..1d947f3 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -46,9 +46,6 @@ in {
         ranger
         ripgrep
         git-secret
-        cargo
-        unstable.deno
-        rustc
         gh
 
         nur.repos.nekowinston.org-stats
@@ -81,7 +78,6 @@ in {
 
   programs = {
     home-manager.enable = true;
-    go.enable = true;
     man.enable = true;
     taskwarrior.enable = true;
   };
diff --git a/home/xdg.nix b/home/xdg.nix
index 504648d..d2f98de 100644
--- a/home/xdg.nix
+++ b/home/xdg.nix
@@ -14,6 +14,7 @@ in {
     DOCKER_CONFIG = "${config.xdg.configHome}/docker";
     GEM_HOME = "${config.xdg.dataHome}/gem";
     GEM_SPEC_CACHE = "${config.xdg.cacheHome}/gem";
+    GOPATH = "${config.xdg.dataHome}/go";
     NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc";
     RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
     XCOMPOSECACHE = "${config.xdg.cacheHome}/X11/xcompose";
@@ -27,7 +28,6 @@ in {
       init-module="${config.xdg.configHome}/npm/config/npm-init.js"
   '';
 
-  programs.go.goPath = ".local/share/go";
   # NOTE: workaround for gpgme on Darwin, since GUI apps aren't aware of $GNUPGHOME
   programs.gpg.homedir =
     if isDarwin