Updates to theme & stuff

configs/dotfiles/nvim/lua/plugins/avante.lua

@@ -116,7 +116,7 @@ return {
 				---@type "right" | "left" | "top" | "bottom"
 				position = "right", -- the position of the sidebar
 				wrap = true, -- similar to vim.o.wrap
-				width = 30, -- default % based on available width
+				width = 35, -- default % based on available width
 				sidebar_header = {
 					enabled = true, -- true, false to enable/disable the header
 					align = "center", -- left, center, right for title

configs/dotfiles/nvim/lua/plugins/lualine.lua

@@ -17,11 +17,25 @@ return {
 				},
 				ignore_focus = {},
 				always_divide_middle = true,
+				always_show_tabline = true,
 				globalstatus = false,
 				refresh = {
 					statusline = 1000,
 					tabline = 1000,
 					winbar = 1000,
+					refresh_time = 16, -- ~60fps
+					events = {
+						'WinEnter',
+						'BufEnter',
+						'BufWritePost',
+						'SessionLoadPost',
+						'FileChangedShellPost',
+						'VimResized',
+						'Filetype',
+						'CursorMoved',
+						'CursorMovedI',
+						'ModeChanged',
+					},
 				}
 			},
 			sections = {

configs/dotfiles/nvim/lua/plugins/neotree.lua

@@ -55,7 +55,7 @@ return {
 			{ '<leader>h', '<C-w>h', mode = { 'n', 'v' }, desc = 'Left' },
 			{ '<leader>j', '<C-w>j', mode = { 'n', 'v' }, desc = 'Down' },
 			{ '<leader>k', '<C-w>k', mode = { 'n', 'v' }, desc = 'Up' },
-			{ '<leader>l', '<C-w>l', mode = { 'n', 'v' }, desc = 'Right' },	
+			{ '<leader>l', '<C-w>l', mode = { 'n', 'v' }, desc = 'Right' },
 		},
     lazy = false,
     -----Instead of using `config`, you can use `opts` instead, if you'd like:
@@ -83,15 +83,15 @@ return {
 			enable_diagnostics = true,
 			open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, -- when opening files, do not use windows containing these filetypes or buftypes
 			open_files_using_relative_paths = false,
-			sort_case_insensitive = false, -- used when sorting files and directories in the tree
-			--sort_function = nil, -- use a custom function for sorting files and directories in the tree
-			 sort_function = function (a,b)
-						 if a.type == b.type then
-								 return a.path > b.path
-						 else
-								 return a.type > b.type
-						 end
-				 end , -- this sorts files and directories descendantly
+			sort_case_insensitive = true, -- used when sorting files and directories in the tree
+			sort_function = nil, -- use a custom function for sorting files and directories in the tree
+			--sort_function = function (a,b)
+				--if a.type == b.type then
+					--return a.path > b.path
+				--else
+					--return a.type > b.type
+				--end
+			--end, -- this sorts files and directories descendantly
 			default_component_configs = {
 				container = {
 					enable_character_fade = true,
@@ -185,7 +185,7 @@ return {
 			commands = {},
 			window = {
 				position = "left",
-				width = 35,
+				width = 30,
 				mapping_options = {
 					noremap = true,
 					nowait = true,

configs/dotfiles/nvim/lua/plugins/tokyonight.lua

@@ -1,29 +1,55 @@
 return {
-	{
-		'folke/tokyonight.nvim',
-		lazy = false,
-		priority = 1000,
-		opts = {
-			style = 'moon',
-			light_style = 'day',
-			transparent = true,
-			terminal_colors = true, -- Configure the colors used when opening a `:terminal` in [Neovim](https://github.com/neovim/neovim)
-			styles = {
-				-- Style to be applied to different syntax groups
-				-- Value is any valid attr-list value for `:help nvim_set_hl`
-				comments = { italic = true },
-				keywords = { italic = true },
-				functions = {},
-				variables = {},
-				-- Background styles. Can be "dark", "transparent" or "normal"
-				sidebars = "dark", -- style for sidebars, see below
-				floats = "dark", -- style for floating windows
-			},
-			sidebars = { "qf", "help" }, -- Set a darker background on sidebar-like windows. For example: `["qf", "vista_kind", "terminal", "packer"]`
-			day_brightness = 0.3, -- Adjusts the brightness of the colors of the **Day** style. Number between 0 and 1, from dull to vibrant colors
-			hide_inactive_statusline = false, -- Enabling this option, will hide inactive statuslines and replace them with a thin border instead. Should work with the standard **StatusLine** and **LuaLine**.
-			dim_inactive = false, -- dims inactive windows
-			lualine_bold = false, -- When `true`, section headers in the lualine theme will be bold
-		},
-	},
+  {
+    "folke/tokyonight.nvim",
+    lazy = false,
+    priority = 1000,
+    opts = {
+    style = "moon", -- The theme comes in three styles, `storm`, a darker variant `night` and `day`
+      light_style = "night", -- The theme is used when the background is set to light
+      transparent = true, -- Enable this to disable setting the background color
+      terminal_colors = true, -- Configure the colors used when opening a `:terminal` in Neovim
+      styles = {
+        comments = { italic = true },
+        keywords = { italic = true },
+        functions = {},
+        variables = {},
+        -- Background styles. Can be "dark", "transparent" or "normal"
+        sidebars = "dark", -- style for sidebars, see below
+        floats = "dark", -- style for floating windows
+      },
+      day_brightness = 0.3, -- Adjusts the brightness of the colors of the **Day** style. Number between 0 and 1, from dull to vibrant colors
+      dim_inactive = false, -- dims inactive windows
+      lualine_bold = true, -- When `true`, section headers in the lualine theme will be bold
+
+      --- You can override specific color groups to use other groups or a hex color
+      --- function will be called with a ColorScheme table
+      ---@param colors ColorScheme
+      on_colors = function(colors)
+        colors.comment = "#a0a7c5"
+        colors.terminal_black = "#828bb8"
+      end,
+
+      --- You can override specific highlights to use other groups or a hex color
+      --- function will be called with a Highlights and ColorScheme table
+      ---@param highlights tokyonight.Highlights
+      ---@param colors ColorScheme
+      on_highlights = function(highlights, colors) end,
+
+      cache = true, -- When set to true, the theme will be cached for better performance
+
+      ---@type table<string, boolean|{enabled:boolean}>
+      plugins = {
+        -- enable all plugins when not using lazy.nvim
+        -- set to false to manually enable/disable plugins
+        all = package.loaded.lazy == nil,
+        -- uses your plugin manager to automatically enable needed plugins
+        -- currently only lazy.nvim is supported
+        auto = true,
+        -- add any plugins here that you want to enable
+        -- for all possible plugins, see:
+        --   * https://github.com/folke/tokyonight.nvim/tree/main/lua/tokyonight/groups
+        telescope = true,
+      },
+    },
+  },
 }

configs/dotfiles/nvim/lua/plugins/treesitter.lua

@@ -4,77 +4,106 @@ return {
 		branch = 'master',
 		lazy = false,
 		build = ':TSUpdate',
-		opts = {
-			ensure_installed = {
-				'bash',
-				'c',
-				'cmake',
-				'cpp',
-				'css',
-				'diff',
-				'dockerfile',
-				'git_config',
-				'git_rebase',
-				'gitattributes',
-				'gitcommit',
-				'gitignore',
-				'html',
-				'java',
-				'javascript',
-				'jsdoc',
-				'json',
-				'jsonc',
-				'kotlin',
-				'lua',
-				'luadoc',
-				'luap',
-				'make',
-				'markdown',
-				'markdown_inline',
-				'php',
-				'printf',
-				'python',
-				'query',
-				'regex',
-				'rust',
-				'scala',
-				'sql',
-				'svelte',
-				'swift',
-				'toml',
-				'tsx',
-				'typescript',
-				'vim',
-				'vimdoc',
-				'xml',
-				'yaml',
-				'zig'
-			},
-			sync_install = false,
-			auto_install = true,
-			indent = { enable = true },
-			highlight = {
-				enable = true,
-				disable = function(lang, buf)
-						local max_filesize = 100 * 1024 -- 100 KB
-						local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
-						if ok and stats and stats.size > max_filesize then
-								return true
-						end
-				end,
-				-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-				-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-				-- Using this option may slow down your editor, and you may see some duplicate highlights.
-				-- Instead of true it can also be a list of languages
-				additional_vim_regex_highlighting = false,
-			},
-		},
+		config = function()
+			require'nvim-treesitter.configs'.setup ({
+				ensure_installed = {
+					'bash',
+					'c',
+					'cmake',
+					'cpp',
+					'css',
+					'diff',
+					'dockerfile',
+					'git_config',
+					'git_rebase',
+					'gitattributes',
+					'gitcommit',
+					'gitignore',
+					'html',
+					'java',
+					'javascript',
+					'jsdoc',
+					'json',
+					'jsonc',
+					'kotlin',
+					'lua',
+					'luadoc',
+					'luap',
+					'make',
+					'markdown',
+					'markdown_inline',
+					'php',
+					'printf',
+					'python',
+					'query',
+					'regex',
+					'rust',
+					'scala',
+					'sql',
+					'svelte',
+					'swift',
+					'toml',
+					'tsx',
+					'typescript',
+					'vim',
+					'vimdoc',
+					'xml',
+					'yaml',
+					'zig'
+				},
+				sync_install = false,
+				auto_install = true,
+				indent = { enable = true },
+				highlight = {
+					enable = true,
+					disable = function(lang, buf)
+							local max_filesize = 500 * 1024 -- 100 KB
+							local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
+							if ok and stats and stats.size > max_filesize then
+									return true
+							end
+					end,
+					-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
+					-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
+					-- Using this option may slow down your editor, and you may see some duplicate highlights.
+					-- Instead of true it can also be a list of languages
+					additional_vim_regex_highlighting = false,
+				},
+			})
+			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")
+	end
 	},
 	{
 		'nvim-treesitter/playground',
 	},
 	{
-		'nvim-treesitter/nvim-treesitter-context'
+		"nvim-treesitter/nvim-treesitter-context",
+		after = "nvim-treesitter",
+		config = function()
+			require'treesitter-context'.setup{
+				enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
+				multiwindow = false, -- Enable multiwindow support.
+				max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit.
+				min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit.
+				line_numbers = true,
+				multiline_threshold = 20, -- Maximum number of lines to show for a single context
+				trim_scope = 'outer', -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
+				mode = 'cursor',  -- Line used to calculate context. Choices: 'cursor', 'topline'
+				-- Separator between context and content. Should be a single character string, like '-'.
+				-- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
+				separator = nil,
+				zindex = 20, -- The Z-index of the context window
+				on_attach = nil, -- (fun(buf: integer): boolean) return false to disable attaching
+			}
+		end
 	},
 }