diff --git a/modules/apps.nix b/modules/apps.nix
index 83a04f0..9b86082 100644
--- a/modules/apps.nix
+++ b/modules/apps.nix
@@ -1,9 +1,8 @@
 { pkgs, ... }:
 let
   devShellPaths = [
-    ./shells/node20.nix
-    ./shells/node22.nix
-    ./shells/node24.nix
+    ./shells/go.nix
+    ./shells/node.nix
   ];
   devShells = map (path: pkgs.callPackage path { }) devShellPaths;
 in {
@@ -15,7 +14,6 @@ in {
       docker
       eza
       git
-      go
       google-chrome
       iproute2mac
       iterm2
diff --git a/modules/shells/node20.nix b/modules/shells/go.nix
similarity index 57%
rename from modules/shells/node20.nix
rename to modules/shells/go.nix
index 2d4deab..6e86ce7 100644
--- a/modules/shells/node20.nix
+++ b/modules/shells/go.nix
@@ -1,21 +1,24 @@
 { pkgs, ... }:
 (let
   packages = with pkgs; [
-    nodejs_20
-    (pnpm.override { nodejs = nodejs_20; })
-    (yarn.override { nodejs = nodejs_20; })
-    bun
+    go
+    gopls
+    gotools
+    golangci-lint
+    delve
     zsh
   ];
-in pkgs.runCommand "dev-node20" {
+in pkgs.runCommand "dev-go" {
   # Dependencies that should exist in the runtime environment
   buildInputs = packages;
   # Dependencies that should only exist in the build environment
   nativeBuildInputs = [ pkgs.makeWrapper ];
 } ''
   mkdir -p $out/bin/
-  ln -s ${pkgs.zsh}/bin/zsh $out/bin/dev-node20
-  wrapProgram $out/bin/dev-node20 \
+  ln -s ${pkgs.zsh}/bin/zsh $out/bin/dev-go
+  wrapProgram $out/bin/dev-go \
     --prefix PATH : ${pkgs.lib.makeBinPath packages} \
-    --set DEV_SHELL node20
+    --set DEV_SHELL go \
+    --set GOPATH $HOME/go \
+    --set GOBIN $HOME/go/bin
 '')
diff --git a/modules/shells/node24.nix b/modules/shells/node.nix
similarity index 75%
rename from modules/shells/node24.nix
rename to modules/shells/node.nix
index b31fec6..2eb26b2 100644
--- a/modules/shells/node24.nix
+++ b/modules/shells/node.nix
@@ -7,15 +7,15 @@
     bun
     zsh
   ];
-in pkgs.runCommand "dev-node24" {
+in pkgs.runCommand "dev-node" {
   # Dependencies that should exist in the runtime environment
   buildInputs = packages;
   # Dependencies that should only exist in the build environment
   nativeBuildInputs = [ pkgs.makeWrapper ];
 } ''
   mkdir -p $out/bin/
-  ln -s ${pkgs.zsh}/bin/zsh $out/bin/dev-node24
-  wrapProgram $out/bin/dev-node24 \
+  ln -s ${pkgs.zsh}/bin/zsh $out/bin/dev-node
+  wrapProgram $out/bin/dev-node \
     --prefix PATH : ${pkgs.lib.makeBinPath packages} \
-    --set DEV_SHELL node24
+    --set DEV_SHELL node
 '')
diff --git a/modules/shells/node22.nix b/modules/shells/node22.nix
deleted file mode 100644
index 83020d1..0000000
--- a/modules/shells/node22.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs, ... }:
-(let
-  packages = with pkgs; [
-    nodejs_22
-    (pnpm.override { nodejs = nodejs_22; })
-    (yarn.override { nodejs = nodejs_22; })
-    bun
-    zsh
-  ];
-in pkgs.runCommand "dev-node22" {
-  # Dependencies that should exist in the runtime environment
-  buildInputs = packages;
-  # Dependencies that should only exist in the build environment
-  nativeBuildInputs = [ pkgs.makeWrapper ];
-} ''
-  mkdir -p $out/bin/
-  ln -s ${pkgs.zsh}/bin/zsh $out/bin/dev-node22
-  wrapProgram $out/bin/dev-node22 \
-    --prefix PATH : ${pkgs.lib.makeBinPath packages} \
-    --set DEV_SHELL node22
-'')