diff --git a/home/terminal/default.nix b/home/terminal/default.nix
index d1cfa89..968b50d 100644
--- a/home/terminal/default.nix
+++ b/home/terminal/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, mail, ... }:
+{ pkgs, mail, ... }:
 
 {
   imports = [ ./nixvim ];
diff --git a/home/terminal/nixvim/default.nix b/home/terminal/nixvim/default.nix
index 228144a..1f5d13c 100644
--- a/home/terminal/nixvim/default.nix
+++ b/home/terminal/nixvim/default.nix
@@ -1,14 +1,11 @@
-{ config, pkgs, lib, mail, ... }:
+{ pkgs, ... }:
 {
   # TODO
   # Linter (ale)
   # Markdown spellcheck
   # Autocomplete
   # Missing plugins
-  # Telescope and fuzzy finder
-  # Ruff linter for python and black formatting on save
   # Language support for python, go, tofu, terraform, yaml
-  # Format on exit
   # Trailing spaces in statusline
   # Good example: https://github.com/fred-drake/neovim/blob/master/config/python/language.nix
 
@@ -68,6 +65,11 @@
           ruff.formatEnabled = false;
         };
       };
+      lsp.servers.gopls.enable = true;
+      lsp.servers.nixd.enable = true;
+      lsp.servers.terraform_lsp.enable = true;
+      lsp.servers.tflint.enable = true;
+      lsp.servers.yamlls.enable = true;
       lsp-format.enable = true;  # Automatically format on save
       lsp-lines.enable = true;  # Display lsp hints in lines
       lsp-signature.enable = true;  # Show function signature when typing
diff --git a/home/terminal/nixvim/telescope.nix b/home/terminal/nixvim/telescope.nix
index f10d35f..e0503c4 100644
--- a/home/terminal/nixvim/telescope.nix
+++ b/home/terminal/nixvim/telescope.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ...}:
+{ ... }:
 {
   programs.nixvim = {
     plugins.telescope = {