diff --git a/nix/users/base/neovim/core/colors.lua b/nix/users/base/neovim/core/colors.lua
new file mode 100644
index 0000000..0ca8021
--- /dev/null
+++ b/nix/users/base/neovim/core/colors.lua
@@ -0,0 +1,9 @@
+local status, color = pcall(vim.cmd.colorscheme, "catppuccin")
+if not status then
+	print(color, 'using murphy instead')
+	vim.cmd.colorscheme("murphy")
+end
+
+vim.opt.fillchars:append { eob = " "}
+vim.cmd.set("noshowmode")
+vim.cmd.set("noruler")
diff --git a/nix/users/base/neovim/default.nix b/nix/users/base/neovim/default.nix
index e7195d2..b992486 100644
--- a/nix/users/base/neovim/default.nix
+++ b/nix/users/base/neovim/default.nix
@@ -42,10 +42,25 @@
         config = toLuaFile ./plugins/indent.lua;
       }
 
+      {
+        plugin = nvim-ts-autotag;
+        config = toLuaFile ./plugins/autotag.lua;
+      }
+
       {
         plugin = nvim-colorizer-lua;
         config = toLuaFile ./plugins/colorizer.lua;
       }
     ];
+
+    extraLuaConfig = ''
+      vim.cmd("runtime! core/*.lua")
+    '';
+
+    extraPackages = with pkgs; [
+      lua-language-server
+      nodePackages_latest.vscode-langservers-extracted
+      nixd
+    ];
   };
 }
diff --git a/nix/users/base/neovim/plugins/autotag.lua b/nix/users/base/neovim/plugins/autotag.lua
new file mode 100644
index 0000000..c4f4abd
--- /dev/null
+++ b/nix/users/base/neovim/plugins/autotag.lua
@@ -0,0 +1,11 @@
+local status, plugin = pcall(require, 'nvim-ts-autotag')
+if not status then
+	print('Error with plugin: ', plugin)
+	return
+end
+
+plugin.setup({
+    autotag = {
+		enable = true,
+	}
+})
diff --git a/nix/users/base/neovim/plugins/colorschemes/catppuccin.lua b/nix/users/base/neovim/plugins/colorschemes/catppuccin.lua
index 93638aa..b199a9f 100644
--- a/nix/users/base/neovim/plugins/colorschemes/catppuccin.lua
+++ b/nix/users/base/neovim/plugins/colorschemes/catppuccin.lua
@@ -49,7 +49,4 @@ plugin.setup({
         },
         -- For more plugins integrations please scroll down (https://github.com/catppuccin/nvim#integrations)
     },
-})
-
--- setup must be called before loading
-vim.cmd.colorscheme "catppuccin"
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/nix/users/base/neovim/plugins/indent.lua b/nix/users/base/neovim/plugins/indent.lua
index c4844ac..3bd6d05 100644
--- a/nix/users/base/neovim/plugins/indent.lua
+++ b/nix/users/base/neovim/plugins/indent.lua
@@ -1,4 +1,4 @@
-local status, plugin = pcall(require,'indent_blankline')
+local status, plugin = pcall(require,'ibl')
 if not status then
     print('Error with plugin: ', plugin)
     return