Changes

- cleaned up plugin files
- htmldjango snippets and highlight fix

lua/base/init.lua

@@ -140,6 +140,7 @@ opt.mouse = ""
 vim.cmd([[au BufRead,BufNewFile .env.* set filetype=sh]])
 vim.cmd([[au BufRead,BufNewFile Dockerfile.* set filetype=dockerfile]])
 --vim.cmd([[au BufRead,BufNewFile *.html set filetype=html]])
+vim.filetype.add({ extension = { templ = "templ" } })
 
 -- redo folds on write
 vim.cmd([[au BufWrite * normal zx]])

lua/plugins/config.lua

@@ -392,7 +392,7 @@ function M.lsp_zero()
 		"pyright",
 		"lua_ls",
 		"bashls",
-		--"gopls",
+		"gopls",
 
 		-- js web shit
 		"html",
@@ -401,6 +401,8 @@ function M.lsp_zero()
 		"svelte",
 		"angularls",
 		"tailwindcss",
+        "templ",
+        "htmx",
 	})
 
 	lsp.configure("pyright", {
@@ -416,7 +418,11 @@ function M.lsp_zero()
 	})
 
 	lsp.configure("html", {
-		filetypes = { "html", "htmldjango" },
+		filetypes = { "html", "htmldjango", "templ" },
+	})
+
+	lsp.configure("htmx", {
+		filetypes = { "html", "htmldjango", "templ" },
 	})
 
 	lsp.on_attach(function(client, bufnr)

lua/plugins/init.lua

@@ -1,8 +1,9 @@
-require("plugins.install_packer")
+local setup = require("plugins.setup")
-require("plugins.startup")
-
 local config = require("plugins.config")
 
+setup.install_packer()
+setup.install_plugins()
+
 config.auto_session()
 config.fzf()
 config.fzf_checkout()

lua/plugins/install_packer.lua

@@ -1,8 +0,0 @@
-local fn = vim.fn
-local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
-
-if fn.empty(fn.glob(install_path)) > 0 then
-	fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path })
-	vim.cmd("packadd packer.nvim")
-	vim.cmd(":PackerSync")
-end

lua/plugins/setup.lua

@@ -0,0 +1,109 @@
+local M = {}
+
+function M.install_packer()
+	local fn = vim.fn
+	local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
+
+	if fn.empty(fn.glob(install_path)) > 0 then
+		fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path })
+		vim.cmd("packadd packer.nvim")
+		vim.cmd(":PackerSync")
+	end
+end
+
+function M.install_plugins()
+	require("packer").startup(function(use)
+		use("wbthomason/packer.nvim")
+
+		-- NAVIGATION
+		use("phaazon/hop.nvim")
+
+		-- VIM THEMING
+		use("folke/tokyonight.nvim")
+
+		-- FILE MANAGEMENT
+		use("junegunn/fzf")
+		use("junegunn/fzf.vim")
+		use("kevinhwang91/rnvimr")
+		use("vijaymarupudi/nvim-fzf")
+		use("vijaymarupudi/nvim-fzf-commands")
+
+		-- SESSION
+		use("ThePrimeagen/harpoon")
+		use("nvim-lua/plenary.nvim")
+		use({
+			"rmagatti/auto-session",
+			config = function()
+				require("auto-session").setup({
+					log_level = "error",
+					auto_session_suppress_dirs = { "~/", "~/Projects", "~/Downloads", "/" },
+				})
+			end,
+		})
+		use("mbbill/undotree")
+
+		-- GIT
+		use("tpope/vim-fugitive")
+		use("stsewd/fzf-checkout.vim")
+		use("lewis6991/gitsigns.nvim")
+
+		-- EDITOR
+		use("lukas-reineke/indent-blankline.nvim")
+		use({
+			"nvim-lualine/lualine.nvim",
+			requires = { "kyazdani42/nvim-web-devicons", opt = true },
+		})
+
+		-- LSP
+		--use("p00f/nvim-ts-rainbow")
+		--use("nvimtools/none-ls.nvim")
+		use({
+			"nvim-treesitter/nvim-treesitter",
+			run = ":TSUpdate",
+		})
+		use("nvim-treesitter/nvim-treesitter-context")
+		use("nvim-treesitter/playground")
+		use("jose-elias-alvarez/null-ls.nvim")
+		use("windwp/nvim-autopairs")
+
+		use({
+			"VonHeikemen/lsp-zero.nvim",
+			branch = "v1.x",
+			requires = {
+				-- LSP Support
+				{ "neovim/nvim-lspconfig" }, -- Required
+				{ "williamboman/mason.nvim" }, -- Optional
+				{ "williamboman/mason-lspconfig.nvim" }, -- Optional
+
+				-- Autocompletion
+				{ "hrsh7th/nvim-cmp" }, -- Required
+				{ "hrsh7th/cmp-nvim-lsp" }, -- Required
+				{ "hrsh7th/cmp-buffer" }, -- Optional
+				{ "hrsh7th/cmp-path" }, -- Optional
+				{ "saadparwaiz1/cmp_luasnip" }, -- Optional
+				{ "hrsh7th/cmp-nvim-lua" }, -- Optional
+
+				-- Snippets
+				{ "L3MON4D3/LuaSnip" }, -- Required
+				{ "rafamadriz/friendly-snippets" }, -- Optional
+			},
+		})
+
+		-- JS
+		use("HerringtonDarkholme/yats.vim")
+		use("chemzqm/vim-jsx-improve")
+		use("yuezk/vim-js") -- js
+		use("maxmellon/vim-jsx-pretty") -- react/tsx syntax highlight & indent
+
+		-- HTML/CSS
+		use("mattn/emmet-vim")
+
+		-- ZIG
+		use("ziglang/zig.vim")
+
+		-- C#
+		use("jlcrochet/vim-razor")
+	end)
+end
+
+return M

lua/plugins/startup.lua

@@ -1,107 +0,0 @@
-require("packer").startup(function(use)
-	use("wbthomason/packer.nvim")
-
-	-- NAVIGATION
-	use("phaazon/hop.nvim")
-
-	-- VIM THEMING
-	--use("navarasu/onedark.nvim")
-	use("folke/tokyonight.nvim")
-
-	-- FILE MANAGEMENT
-	use("junegunn/fzf")
-	use("junegunn/fzf.vim")
-	use("kevinhwang91/rnvimr")
-	use("vijaymarupudi/nvim-fzf")
-	use("vijaymarupudi/nvim-fzf-commands")
-
-	-- SESSION
-	use("ThePrimeagen/harpoon")
-	use("nvim-lua/plenary.nvim")
-	use({
-		"rmagatti/auto-session",
-		config = function()
-			require("auto-session").setup({
-				log_level = "error",
-				auto_session_suppress_dirs = { "~/", "~/Projects", "~/Downloads", "/" },
-			})
-		end,
-	})
-	use("mbbill/undotree")
-
-	-- GIT
-	use("tpope/vim-fugitive")
-	use("stsewd/fzf-checkout.vim")
-	use("lewis6991/gitsigns.nvim")
-
-	-- EDITOR
-	use("lukas-reineke/indent-blankline.nvim")
-	use({
-		"nvim-lualine/lualine.nvim",
-		requires = { "kyazdani42/nvim-web-devicons", opt = true },
-	})
-
-	-- SNIPPETS
-	--use("SirVer/ultisnips")
-	--use("honza/vim-snippets")
-	--use("L3MON4D3/LuaSnip") -- Snippets plugin
-
-	-- LSP
-	--use("p00f/nvim-ts-rainbow")
-	use({
-		"nvim-treesitter/nvim-treesitter",
-		run = ":TSUpdate",
-	})
-	use("nvim-treesitter/nvim-treesitter-context")
-	use("nvim-treesitter/playground")
-	use("jose-elias-alvarez/null-ls.nvim")
-	--use("nvimtools/none-ls.nvim")
-	use("windwp/nvim-autopairs")
-
-	--use("neovim/nvim-lspconfig")
-	--use("williamboman/nvim-lsp-installer")
-	--use("jose-elias-alvarez/nvim-lsp-ts-utils")
-	--use({
-	--    "hrsh7th/cmp-nvim-lsp",
-	--    requires = "quangnguyen30192/cmp-nvim-ultisnips",
-	--})
-	--use("hrsh7th/nvim-cmp")
-
-	use({
-		"VonHeikemen/lsp-zero.nvim",
-		branch = "v1.x",
-		requires = {
-			-- LSP Support
-			{ "neovim/nvim-lspconfig" }, -- Required
-			{ "williamboman/mason.nvim" }, -- Optional
-			{ "williamboman/mason-lspconfig.nvim" }, -- Optional
-
-			-- Autocompletion
-			{ "hrsh7th/nvim-cmp" }, -- Required
-			{ "hrsh7th/cmp-nvim-lsp" }, -- Required
-			{ "hrsh7th/cmp-buffer" }, -- Optional
-			{ "hrsh7th/cmp-path" }, -- Optional
-			{ "saadparwaiz1/cmp_luasnip" }, -- Optional
-			{ "hrsh7th/cmp-nvim-lua" }, -- Optional
-
-			-- Snippets
-			{ "L3MON4D3/LuaSnip" }, -- Required
-			{ "rafamadriz/friendly-snippets" }, -- Optional
-		},
-	})
-
-	-- JS
-	use("HerringtonDarkholme/yats.vim")
-	use("chemzqm/vim-jsx-improve")
-	use("yuezk/vim-js") -- js
-	use("maxmellon/vim-jsx-pretty") -- react/tsx syntax highlight & indent
-
-	-- HTML/CSS
-	use("mattn/emmet-vim")
-
-	-- ZIG
-	use("ziglang/zig.vim")
-
-	-- C#
-	use("jlcrochet/vim-razor")
-end)

queries/htmldjango/highlights.scm

@@ -30,7 +30,7 @@
 
 (tag_statement tag_argument:
     (keyword_argument keyword_name:
-        ((identifier) @parameter)))
+        ((identifier) @variable.parameter)))
 
 (filter filter_name:
     ((identifier) @function))

snippets/htmldjango.snippets

@@ -0,0 +1,16 @@
+snippet pa
+	{% partial $0 %}
+
+snippet pd
+	{% partialdef $0 %}
+	{% endpartialdef %}
+
+snippet tt
+	{% $0 %}
+
+snippet ttt
+	{% $1 $2 %}
+	{% end$1 %}
+
+snippet vv
+	{{ $0 }}