diff --git a/home/programs/go.nix b/home/programs/go.nix
index dba450c..168e728 100644
--- a/home/programs/go.nix
+++ b/home/programs/go.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 let
   cfg = config.profile.go;
 in
@@ -10,5 +10,13 @@ in
         "gitlab.bareksa.com"
       ];
     };
+    home.packages = with pkgs; [
+      gotools
+
+      ###### Golang development tools ######
+      gomodifytags
+      gotests
+      iferr
+    ];
   };
 }
diff --git a/home/programs/neovim.nix b/home/programs/neovim.nix
index b3eb302..88c39d8 100644
--- a/home/programs/neovim.nix
+++ b/home/programs/neovim.nix
@@ -62,11 +62,8 @@ in
       docker-compose-language-service
       emmet-ls
       silicon # For code screenshots
+      lua-language-server
 
-      ###### Golang development tools ######
-      gomodifytags
-      gotests
-      iferr
       curl
       cargo
       nixpkgs-fmt