diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index dbfff24..d67b5ac 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -1,17 +1,17 @@
 {
-  "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" },
+  "conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" },
   "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
   "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "luau-lsp.nvim": { "branch": "main", "commit": "f81c6c713e4598abc484cbeabca918475d176c54" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
-  "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
-  "mini.nvim": { "branch": "main", "commit": "473cdbff498ed120f1768c75ef65fa42859aa14f" },
-  "nvim-lspconfig": { "branch": "master", "commit": "4bc481b6f0c0cf3671fc894debd0e00347089a4e" },
-  "nvim-treesitter": { "branch": "master", "commit": "94ea4f436d2b59c80f02e293466c374584f03b8c" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "3856bbb0da214d1f2f3d5a2dd3fea26591f930f9" },
+  "mason.nvim": { "branch": "main", "commit": "9eaedb864cdadc29c6eb7d761a6c0d8aee26c91b" },
+  "mini.nvim": { "branch": "main", "commit": "14ce72476995255fc5cb919da8067f65865e1225" },
+  "nvim-lspconfig": { "branch": "master", "commit": "562487bc108bf73c2493f9e701b9334b48163216" },
+  "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" },
   "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "rose-pine": { "branch": "main", "commit": "614892e32e94378d976a238f287532cfe790c1fe" },
-  "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
+  "rose-pine": { "branch": "main", "commit": "6b9840790cc7acdfadde07f308d34b62dd9cc675" },
+  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
   "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }
 }
diff --git a/.config/nvim/lua/rocketcamel/plugins/conform.lua b/.config/nvim/lua/rocketcamel/plugins/conform.lua
index 277986d..3b29a9e 100755
--- a/.config/nvim/lua/rocketcamel/plugins/conform.lua
+++ b/.config/nvim/lua/rocketcamel/plugins/conform.lua
@@ -11,6 +11,7 @@ return {
 				json = { "prettier" },
 				tsx = { "prettier" },
 				nix = { "nixfmt" },
+				go = { "gofmt" },
 			},
 			format_on_save = {
 				-- These options will be passed to conform.format()
diff --git a/.config/nvim/lua/rocketcamel/plugins/lsp.lua b/.config/nvim/lua/rocketcamel/plugins/lsp.lua
index fb1706d..0ebdbdf 100755
--- a/.config/nvim/lua/rocketcamel/plugins/lsp.lua
+++ b/.config/nvim/lua/rocketcamel/plugins/lsp.lua
@@ -20,6 +20,8 @@ return {
 					"tailwindcss",
 					"svelte",
 					"html",
+					"gopls",
+					"templ",
 				},
 				handlers = {
 					function(server)
diff --git a/.config/nvim/lua/rocketcamel/plugins/mini.lua b/.config/nvim/lua/rocketcamel/plugins/mini.lua
index 798e80c..4b3805a 100755
--- a/.config/nvim/lua/rocketcamel/plugins/mini.lua
+++ b/.config/nvim/lua/rocketcamel/plugins/mini.lua
@@ -6,6 +6,7 @@ return {
 			require("mini.completion").setup()
 			require("mini.fuzzy").setup()
 			require("mini.pairs").setup()
+			require("mini.comment").setup()
 		end,
 	},
 }
diff --git a/nix/flake.lock b/nix/flake.lock
index 1929883..d7c1460 100644
--- a/nix/flake.lock
+++ b/nix/flake.lock
@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746413188,
-        "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=",
+        "lastModified": 1747834438,
+        "narHash": "sha256-AHJt79W8wADzur2htCx1U8FtEk4XjvrHb9/3iDfNedI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a",
+        "rev": "6c2eb1e24cd0e76d88bdd633ef4c50d6286586e0",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1746286866,
-        "narHash": "sha256-oSFEsgSEcLX7kYQXH5q/xyncD3qmrGgXv22pGDPPfBY=",
+        "lastModified": 1746453552,
+        "narHash": "sha256-r66UGha+7KVHkI7ksrcMjnw/mm9Sg4l5bQlylxHwdGU=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "0f4ffe22d9736192f560cb851d64106fe65b6adc",
+        "rev": "be618645aa0adf461f778500172b6896d5ab2d01",
         "type": "github"
       },
       "original": {
@@ -94,11 +94,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1746328495,
-        "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
+        "lastModified": 1747744144,
+        "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
+        "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
         "type": "github"
       },
       "original": {
diff --git a/nix/modules/commonPackages.nix b/nix/modules/commonPackages.nix
index cc2dd24..c87fb8d 100644
--- a/nix/modules/commonPackages.nix
+++ b/nix/modules/commonPackages.nix
@@ -39,6 +39,8 @@
       jq
       nfs-utils
       bluetui
+      go
+      templ
     ];
     programs.nix-ld.enable = lib.mkDefault true;
     programs.zsh.enable = lib.mkDefault true;
diff --git a/nix/modules/default.nix b/nix/modules/default.nix
index 38be5d8..79f2395 100644
--- a/nix/modules/default.nix
+++ b/nix/modules/default.nix
@@ -12,5 +12,6 @@
     ./kanata.nix
     ./pipewire.nix
     ./keys.nix
+    ./keyd.nix
   ];
 }
diff --git a/nix/modules/i3.nix b/nix/modules/i3.nix
index 3ad0da0..a124c94 100644
--- a/nix/modules/i3.nix
+++ b/nix/modules/i3.nix
@@ -13,6 +13,10 @@
     services.xserver = {
       enable = true;
       windowManager.i3.enable = true;
+      xkb = {
+        options = "grp:alt_shift_toggle";
+        layout = "us";
+      };
       serverLayoutSection = ''
         Option "BlankTime" "0"
         Option "StandbyTime" "0"
@@ -42,6 +46,7 @@
       jellyfin-media-player
       anki-bin
       mpv
+      ahk_x11
     ];
 
     home-manager.users.luca = {
diff --git a/nix/modules/keyd.nix b/nix/modules/keyd.nix
new file mode 100644
index 0000000..d95162d
--- /dev/null
+++ b/nix/modules/keyd.nix
@@ -0,0 +1,31 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
+  options.keyd = {
+    enable = lib.mkEnableOption "enable keyd";
+  };
+
+  config = lib.mkIf config.keyd.enable {
+    users.extraGroups.keyd = {
+      name = "keyd";
+    };
+    users.users.luca.extraGroups = [ "keyd" ];
+    environment.systemPackages = with pkgs; [
+      keyd
+    ];
+    services.keyd = {
+      enable = true;
+      keyboards.main = {
+        settings = {
+          main = {
+            capslock = "esc";
+          };
+        };
+      };
+    };
+  };
+}