nvim/.config/nvim/after/plugin/lspconfig.lua

@@ -51,22 +51,6 @@ local servers = {
       telemetry = { enable = false },
     },
   },
-
-  html = {},
-  htmx = {},
-  unocss = {},
-}
-
-require 'lspconfig'.html.setup {
-  filetypes = { "html", "templ" },
-}
-
-require 'lspconfig'.htmx.setup {
-  filetypes = { "html", "templ" },
-}
-
-require 'lspconfig'.unocss.setup {
-  filetypes = { "html", "templ" },
 }
 
 -- Setup neovim lua configuration

nvim/.config/nvim/after/plugin/treesitter.lua

@@ -2,7 +2,7 @@ local org = require('orgmode')
 org.setup_ts_grammar()
 
 require('nvim-treesitter.configs').setup {
-  ensure_installed = { 'c', 'cpp', 'go', 'haskell', 'lua', 'org', 'python', 'rust', 'tsx', 'templ', 'typescript', 'vimdoc', 'vim' },
+  ensure_installed = { 'c', 'cpp', 'go', 'haskell', 'lua', 'org', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim' },
   auto_install = false,
   highlight = {
     enable = true,
@@ -72,6 +72,17 @@ require('nvim-treesitter.configs').setup {
   },
 }
 
+local treesitter_parser_config = require "nvim-treesitter.parsers".get_parser_configs()
+treesitter_parser_config.templ = {
+  install_info = {
+    url = "https://github.com/vrischmann/tree-sitter-templ.git",
+    files = { "src/parser.c", "src/scanner.c" },
+    branch = "master",
+  },
+}
+
+vim.treesitter.language.register('templ', 'templ')
+
 org.setup({
   org_agenda_files = { '~/org/*.org' },
   org_default_notes_file = '~/org/capture.org',

nvim/.config/nvim/after/plugin/vim-fugitive.lua

@@ -0,0 +1 @@
+vim.keymap.set('n', '<leader>gg', ':Git grep ')

nvim/.config/nvim/lua/lupan/remap.lua

@@ -27,7 +27,6 @@ end, { desc = '[/] Find in current buffer' })
 
 key('n', '<leader>gf', '<cmd>Telescope git_files<cr>', { desc = '[G]it [f]iles' })
 key('n', '<leader>gs', '<cmd>Telescope git_status<cr>', { desc = '[G]it [s]tatus' })
-key('n', '<leader>gg', ':Git grep ', { desc = '[G]it [g]rep' })
 key('n', '<leader>ff', '<cmd>Telescope find_files<cr>', { desc = '[F]ind [f]iles' })
 key('n', '<leader>fg', '<cmd>Telescope live_grep<cr>', { desc = '[F]ind [g]rep' })
 key('n', '<leader>fw', '<cmd>Telescope grep_string<cr>', { desc = '[F]ind [w]ord' })

nvim/.config/nvim/lua/plugins/appearance.lua

@@ -10,6 +10,10 @@ return {
       vim.cmd.colorscheme("onenord")
     end
   },
+  'neanias/everforest-nvim',
+  'bluz71/vim-nightfly-colors',
+  'bluz71/vim-moonfly-colors',
+  'Verf/deepwhite.nvim',
 
   {
     -- Statusline (see `:help lualine.txt`)

nvim/.config/nvim/lua/plugins/editing.lua

@@ -21,6 +21,8 @@ return {
     end
   },
 
+  'ggandor/lightspeed.nvim',
+
   -- change directory with telescope from a list of dierectories
   "SalOrak/whaler",
 }

nvim/.config/nvim/lua/plugins/init.lua

@@ -57,6 +57,16 @@ return {
   -- Show pending keybinds
   { 'folke/which-key.nvim', opts = {} },
 
+  {
+    'akinsho/toggleterm.nvim',
+    keys = { '<C-_>', '<cmd>ToggleTerm<cr>', desc = 'Toggle term' },
+    version = "*",
+    opts = {
+      direction = "float",
+      open_mapping = [[<C-_>]],
+    }
+  },
+
   {
     'ThePrimeagen/harpoon',
     dependencies = { 'nvim-lua/plenary.nvim' },