diff --git a/system/global/home.nix b/system/global/home.nix
index 940bd1d..709c985 100644
--- a/system/global/home.nix
+++ b/system/global/home.nix
@@ -56,7 +56,7 @@ let
 
     open-code = (pkgs.writeShellScriptBin "open-code" ''
       code_dir=~/Documents/code
-      ls $code_dir/ | ${my-deps.menu} | ${my-deps.xargs} -I_ code $code_dir/_
+      ls $code_dir/ | ${my-deps.menu} | ${my-deps.xargs} -I_ codium $code_dir/_
     '');
   };
 
@@ -156,7 +156,7 @@ in
       bind = SUPER, d,       exec, wofi --show drun
       bind = SUPER, Z,       exec, "${pkgs.swaylock-effects}/bin/swaylock" -f
       bind = SUPER, M,       exec, ${ my-deps.terminal } -e ncmpcpp
-      bind = SUPER, E,       exec, ${ my-deps.terminal } -e neomutt
+      bind = SUPER, E,       exec, ${ my-deps.terminal } -e aerc
       bind = SUPER, O,       exec, pcmanfm
       bind = SUPER, C,       exec, ${ my-scripts.open-code }/bin/open-code
 
@@ -541,6 +541,13 @@ in
           command = "${pkgs.rnix-lsp}/bin/rnix-lsp";
         };
       }
+      {
+        name = "go";
+        auto-format = true;
+        language-server = {
+          command = "${pkgs.gopls}/bin/gopls";
+        };
+      }
     ];
   };
 
diff --git a/system/work/home.nix b/system/work/home.nix
index 13b5963..c71e5e9 100644
--- a/system/work/home.nix
+++ b/system/work/home.nix
@@ -69,6 +69,9 @@ in
 
   programs.firefox.enable = true;
 
+  home.shellAliases = {
+    codium = lib.mkForce "code";
+  };
   programs.vscode = {
     package = lib.mkForce pkgs.vscode;
     extensions = with pkgs; [