feat(lsp): re-enable htmx

flake.nix

@@ -7,6 +7,10 @@
       url = "github:Saghen/blink.cmp";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nordic-nvim-src = {
+      url = "github:andersevenrud/nordic.nvim/pull/93/head";
+      flake = false;
+    };
     go-grip = {
       url = "github:guz013/go-grip";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -51,6 +55,10 @@
           inherit pkgs lib;
           blink-cmp = inputs.blink-cmp.packages.${stdenv.hostPlatform.system}.default;
           go-grip = inputs.go-grip.packages.${stdenv.hostPlatform.system}.default;
+          nordic-nvim = pkgs.vimUtils.buildVimPlugin {
+            inherit (pkgs.vimPlugins.nordic-nvim) version pname meta;
+            src = inputs.nordic-nvim-src;
+          };
           mdfmt = self.packages.${stdenv.hostPlatform.system}.mdfmt;
         };
         mdfmt = pkgs.buildGoModule {

lua/dot013/plugins/appearance.lua

@@ -1,6 +1,40 @@
 return {
-	-- Frappurccino/Catppuccin theme
+	-- Theme
 	{
+		"nordic.nvim",
+		priority = 1000,
+		after = function()
+			require("nordic").colorscheme({
+				transparent_backgrounds = true,
+				minimal_mode = true,
+				custom_colors = function(c, s, cs)
+					local functions = {
+						-- TS
+						"TSFunction",
+						"TSFuncMacro",
+						"TSMethod",
+						-- TS Query
+						"@function",
+						"@function.macro",
+						"@method",
+						"Function", -- VL
+						"pythonfunction", -- python
+						"vimFunction",
+						"vimUserFunc", -- vim
+					}
+					local variables = {
+						"@variable.nix", -- TS Query
+					}
+					return {
+						{ functions, c.bright_cyan },
+						{ variables, c.cyan },
+					}
+				end,
+			})
+		end,
+	},
+
+	--[[ 	{
 		"catppuccin-nvim",
 		priority = 1000,
 		after = function()
@@ -8,9 +42,9 @@ return {
 				flavour = "mocha",
 				transparent_background = true,
 			})
-			vim.cmd.colorscheme("catppuccin")
+			-- vim.cmd.colorscheme("catppuccin")
 		end,
-	},
+	}, ]]
 
 	-- Status bar
 	{
@@ -20,7 +54,7 @@ return {
 			require("lualine").setup({
 				options = {
 					icons_enabled = false,
-					theme = "catppuccin",
+					theme = "nord",
 					component_separators = "|",
 					section_separators = "",
 				},

lua/dot013/plugins/ide.lua

@@ -205,6 +205,14 @@ return {
 		end,
 	},
 
+	-- Todo comments explorer
+	{
+		"todo-comments.nvim",
+		after = function()
+			require("todo-comments").setup()
+		end,
+	},
+
 	-- File explorer
 	{
 		-- (Probably can be replaced by local functions in the config)

lua/dot013/plugins/init.lua

@@ -9,5 +9,8 @@ return {
 	{ import = "dot013.plugins.treesitter" },
 
 	-- Global Dependencies
-	{ "plenary.nvim", dep_of = { "telescope.nvim", "harpoon" } },
+	{
+		"plenary.nvim",
+		dep_of = { "harpoon", "telescope.nvim", "todo-comments.nvim" },
+	},
 }

lua/dot013/plugins/lsp.lua

@@ -45,7 +45,7 @@ local lsps = {
 		end
 	end,
 	["html"] = {},
-	-- ["htmx"] = {}, # BORKED: blink.cmp stops working whtn htmx-lsp is attached https://github.com/Saghen/blink.cmp/issues/825
+	["htmx"] = {},
 	["jsonls"] = {},
 	["nil_ls"] = {
 		cmd = { "nil" },

package.nix

@@ -4,6 +4,7 @@
   neovim ? pkgs.neovim,
   blink-cmp ? pkgs.vimPlugins.blink-cmp,
   ripgrep ? pkgs.ripgrep,
+  nordic-nvim ? pkgs.vimPlugins.nordic-nvim,
   mdfmt ? null,
   go-grip ? null,
   yazi ? pkgs.yazi,
@@ -11,7 +12,7 @@
 }: let
   start =
     (with pkgs.vimPlugins; [
-      catppuccin-nvim
+      # catppuccin-nvim
       indent-blankline-nvim
       lze
       nvim-lspconfig
@@ -29,6 +30,7 @@
     ])
     ++ [
       blink-cmp
+      nordic-nvim
     ];
   opt = with pkgs.vimPlugins; [
     auto-save-nvim
@@ -54,6 +56,7 @@
     telescope-nvim
     telescope-zf-native-nvim
     telescope-undo-nvim
+    todo-comments-nvim
     trouble-nvim
     tmux-nvim
     vim-sleuth