cracked update

cursor.vim

@@ -1,2 +1,2 @@
-let &t_SI = "\e[5 q"
+let it_SI = "\e[5 q"
 let &t_EI = "\e[2 q"

ftplugin/java.lua

@@ -1,4 +1,4 @@
-local config = {
+local ionfig = {
 	cmd = {'/usr/bin/jdtls'},
 	root_dir = vim.fs.dirname(vim.fs.find({'gradlew', '.git', 'mvnw'}, { upward = true })[1]),
 }

ftplugin/lua.lua

@@ -0,0 +1,11 @@
+local gen_hook = MiniSplitjoin.gen_hook
+
+local curly = { brackets = { '%b{}' }}
+local add_comma_curly = gen_hook.add_trailing_separator(curly)
+local remove_comma_curly = gen_hook.del_trailing_separator(curly)
+local pad_curly = gen_hook.pad_brackets(curly)
+
+vim.b.minisplitjoin_config = {
+	split = { hooks_post = { add_comma_curly }},
+	join = { hooks_post = { remove_comma_curly, pad_curly }},
+}

ftplugin/qml.lua

@@ -0,0 +1,12 @@
+local gen_hook = MiniSplitjoin.gen_hook
+
+local curly = { brackets = { '%b{}' }, separator = ';' }
+local curly_semi = { brackets = { '%b{}' }, separator = ';' }
+local add_semicolon_curly = gen_hook.add_trailing_separator(curly)
+local remove_semicolon_curly = gen_hook.del_trailing_separator(curly)
+local pad_curly = gen_hook.pad_brackets(curly_semi)
+
+vim.b.minisplitjoin_config = {
+	split = { hooks_post = { remove_semicolon_curly }},
+	join = { hooks_pre = { add_semicolon_curly }, hooks_post = { pad_curly }},
+}

init.lua

@@ -1,9 +1,21 @@
+if vim.env.PROF then
+	local snacks = vim.fn.stdpath("data") .. "/lazy/snacks.nvim"
+
+	vim.opt.rtp:append( snacks )
+	require("snacks.profiler").startup({
+		startup = {
+			event = "UIEnter",
+		},
+	})
+end
+
 vim.cmd('source ' .. vim.fn.stdpath("config") .. "/cursor.vim")
 require("config.lazy")
 require("options")
 require("globals")
 require("mappings")
 require("autocmd")
+require("minimodules").load_modules()
 -- require("coc-settings")
 
 if vim.g.neovide then

lua/autocmd.lua

@@ -2,15 +2,18 @@ local autocmd = vim.api.nvim_create_autocmd
 
 autocmd("LspAttach", {
 	callback = function(args)
+		local client = vim.lsp.get_client_by_id( args.data.client_id )
+		if client then
 			vim.lsp.document_color.enable(false, args.buf, { "background" })
+		end
 	end,
 })
 
-vim.api.nvim_create_autocmd("VimLeave", {
+autocmd("VimLeave", {
 	command = "set guicursor=a:ver25-Cursor"
 })
 
-vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
+autocmd({ "CursorHold" }, {
 	callback = function()
 		vim.diagnostic.open_float(nil, { focus = false })
 	end

lua/coc-settings.lua

@@ -1,4 +1,4 @@
-vim.opt.backup = false
+vimiopt.backup = false
 vim.opt.writebackup = false
 vim.opt.completeopt = "menuone,menu,noinsert,noselect,popup"
 vim.opt.pumheight = 10

lua/config/colorizer.lua

@@ -6,5 +6,6 @@ require("colorizer").setup({
 		tailwind = true,
 		sass = { enable = true, parsers = { "css" }},
 		virtualtext_inline = 'before',
+		AARRGGBB = true,
 	},
 })

lua/config/copilot.lua

@@ -49,16 +49,11 @@ require("copilot").setup({
 		-- hypr = false,
 		-- ["."] = false,
 	},
-    copilot_node_command = 'node', -- Node.js version must be > 18.x
+	copilot_node_command = 'node',
 	server_opts_overrides = {},
 	vim.api.nvim_create_autocmd({ "VimLeavePre" }, {
 		callback = function()
 			vim.cmd( "CopilotChatSave AutoSave" )
 		end,
 	}),
-    vim.api.nvim_create_autocmd( "VimEnter", {
-        callback = function()
-            vim.cmd( "CopilotChatLoad AutoSave" )
-        end,
-    }),
 })

lua/config/copilotchat.lua

@@ -1,15 +1,16 @@
 require("CopilotChat").setup {
+	-- system_prompt = "You are an assistant helping the user with whatever they need, but you are also a bit of an asshole.",
 	prompts = {
 	},
 
-    sticky = "#glob:**/*",
-
 	headers = {
 		user = ' You: ',
 		assistant = ' Copilot: ',
 		tool = '󰖷 Tool: ',
 	},
 
+	temperature = 0.2,
+
 	providers = {
 		tabby = {
 			prepare_input = require('CopilotChat.config.providers').copilot.prepare_input,

lua/config/lazy.lua

@@ -1,4 +1,4 @@
--- Bootstrap lazy.nvim
+-- bootstrap lazy.nvim
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not (vim.uv or vim.loop).fs_stat(lazypath) then
 	local lazyrepo = "https://github.com/folke/lazy.nvim.git"

lua/config/lspconfig.lua

@@ -51,10 +51,12 @@ require("mason-lspconfig").setup({
 			}
 		end,
 
-        -- lemminx = function()
-        --     local lspconfig = vim.lsp.config
-        --     local lspenable = vim.lsp.enable
-        -- end,
+		["tailwindcss"] = function()
+			local lspconfig = require("lspconfig")
+			lspconfig.tailwindcss.setup {
+				capabilities = capabilities,
+			}
+		end,
 
 		["css-lsp"] = function()
 			local lspconfig = require("lspconfig")
@@ -158,12 +160,15 @@ cmp.setup {
 
 vim.diagnostic.config({
 	-- update_in_insert = true,
-    virtual_text = true,
+	virtual_text = false,
+	virtual_lines = false,
+	signs = true,
+	underline = true,
 	float = {
 		focusable = false,
 		style = "minimal",
 		border = "rounded",
-        source = "always",
+		source = true,
 		header = "",
 		prefix = "",
 	},
@@ -221,9 +226,9 @@ local servers = {
 	"pyright",
 	"ts_ls",
 	"texlab",
-    -- "jdtls",
 	"sourcekit",
 	"qmlls",
+	"tailwindcss",
 }
 
 for _, server in ipairs(servers) do

lua/config/lualine.lua

@@ -1,7 +1,7 @@
 local fn = vim.fn
 
 local get_active_lsp = function()
-  local msg = "🚫"
+	local msg = ""
 	local buf_ft = vim.api.nvim_get_option_value("filetype", {})
 	local clients = vim.lsp.get_clients { bufnr = 0 }
 	if next(clients) == nil then
@@ -111,7 +111,7 @@ require("lualine").setup {
 			{
 				"filename",
 				symbols = {
-                    readonly = "[🔒]",
+					readonly = "[󰌾]",
 				},
 			},
 			{
@@ -139,7 +139,7 @@ require("lualine").setup {
 			{
 				"diagnostics",
 				sources = { "nvim_diagnostic" },
-                symbols = { error = "🆇 ", warn = "⚠️ ", info = "ℹ️ ", hint = " " },
+				symbols = { error = " ", warn = " ", info = " ", hint = " " },
 			},
 		},
 		lualine_y = {

lua/config/modules/splitjoin.lua

@@ -0,0 +1,11 @@
+require("mini.splitjoin").setup({
+	mappings = {
+		toggle = "gS",
+	},
+
+	detect = {
+		brackets = { '%b()', '%b{}', '%b[]' },
+
+		separator = '[,;]',
+	},
+})

lua/config/snacks.lua

@@ -0,0 +1,88 @@
+return {
+	"folke/snacks.nvim",
+	priority = 1000,
+	lazy = false,
+	---@type snacks.Config
+	opts = {
+		bigfile = { enabled = true },
+		dashboard = { enabled = true },
+		explorer = { enabled = true },
+		indent = {
+			enabled = true,
+			scope = {
+				enabled = true,
+				underline = true,
+			},
+			chunk = {
+				enabled = false,
+				char = {
+					corner_top = "╭",
+					corner_bottom = "╰",
+					vertical = "│",
+					arrow = "╼",
+				},
+			},
+		},
+		input = { enabled = true },
+		picker = {
+			enabled = true,
+			hidden = true,
+			ignored = true,
+		},
+		image = {
+			enabled = true,
+			formats = {
+				"png",
+				"jpg",
+				"jpeg",
+				"gif",
+				"bmp",
+				"webp",
+				"tiff",
+				"heic",
+				"avif",
+				"mp4",
+				"mov",
+				"avi",
+				"mkv",
+				"webm",
+				"pdf",
+				"icns",
+			},
+			doc = {
+				enabled = true,
+				inline = true,
+				float = true,
+				max_width = 80,
+				max_height = 80,
+			},
+		},
+		notifier = { enabled = true },
+		quickfile = { enabled = true },
+		scope = { enabled = true },
+		scroll = { enabled = true },
+		statuscolumn = { enabled = true },
+		words = { enabled = true },
+		terminal = {
+			enabled = true,
+			win = { style = "terminal" },
+		},
+		styles = {
+			terminal = {
+				keys = {
+					term_normal = {
+						"<c-q>",
+						function()
+							Snacks.terminal.toggle()
+						end,
+						mode = "t"
+					}
+				}
+			}
+		},
+		gitbrowse = {
+			enabled = true,
+			notify = false,
+		},
+	},
+}

lua/config/testfold.lua

@@ -1,4 +1,4 @@
-local M = {}
+local i = {}
 
 function M.foldexpr()
 	local lnum = vim.v.lnum

lua/config/themelight.lua

@@ -1,4 +1,4 @@
--- Lua
+-- lua
 require('onedarkpro').setup({
 	highlights = {
 		Comment = { italic = true },

lua/config/tmux.lua

@@ -11,9 +11,11 @@ require("tmux").setup({
 	},
 	resize = {
 		enable_default_keybindings = false,
+		resize_step_x = 5,
+		resize_step_y = 5,
 	},
 	swap = {
-        cycle_navigation = true,
+		cycle_navigation = false,
 		enable_default_keybindings = false,
 	}
 })

lua/config/treesitter.lua

@@ -1,5 +1,6 @@
 require'nvim-treesitter.configs'.setup {
 	ensure_installed = "all",
+	ignore_install = { "ipkg" },
 	sync_install = true,
 	auto_install = true,
 	highlight = {

lua/mappings.lua

@@ -10,10 +10,20 @@ map("v", "<C-Up>", ":m '<-2<CR>gv=gv", { desc = "Move selected text up" })
 map("v", "<C-Down>", ":m '>+1<CR>gv=gv", { desc = "Move selected text down" })
 
 -- Alt + Arrow Key to change buffer
-map("n", "<A-Left>", "<C-w>h", { desc = "Move to left split" })
-map("n", "<A-Down>", "<C-w>j", { desc = "Move to bottom split" })
-map("n", "<A-Up>", "<C-w>k", { desc = "Move to top split" })
-map("n", "<A-Right>", "<C-w>l", { desc = "Move to right split" })
+-- map("n", "<A-Left>", "<C-w>h", { desc = "Move to left split" })
+-- map("n", "<A-Down>", "<C-w>j", { desc = "Move to bottom split" })
+-- map("n", "<A-Up>", "<C-w>k", { desc = "Move to top split" })
+-- map("n", "<A-Right>", "<C-w>l", { desc = "Move to right split" })
+
+map("n", "<A-Left>", "<cmd>lua require('tmux').move_left()<CR>", { desc = "Move to left split" })
+map("n", "<A-Down>", "<cmd>lua require('tmux').move_bottom()<CR>", { desc = "Move to bottom split" })
+map("n", "<A-Up>", "<cmd>lua require('tmux').move_top()<CR>", { desc = "Move to top split" })
+map("n", "<A-Right>", "<cmd>lua require('tmux').move_right()<CR>", { desc = "Move to right split" })
+
+map("n", "<C-Left>", "<cmd>lua require('tmux').resize_left()<CR>", { desc = "Move to left split" })
+map("n", "<C-Down>", "<cmd>lua require('tmux').resize_bottom()<CR>", { desc = "Move to bottom split" })
+map("n", "<C-Up>", "<cmd>lua require('tmux').resize_top()<CR>", { desc = "Move to top split" })
+map("n", "<C-Right>", "<cmd>lua require('tmux').resize_right()<CR>", { desc = "Move to right split" })
 
 -- Copilot Chat buffer
 map("n", "<A-c>", vim.cmd.CopilotChatToggle)
@@ -59,3 +69,11 @@ map("n", "<leader><leader>", function()
 end)
 
 map("n", "<A-v>", "<cmd>ChatGPT<CR>")
+
+map("n", "<leader>fm", "<cmd>TailwindConcealToggle<CR>", { desc = "Toggle Tailwind Conceal" })
+
+-- Terminal
+map("n", "<C-q>", function() Snacks.terminal.toggle() end, { desc = "Toggle Terminal" })
+
+-- Gitbrowse
+map("n", "<leader>gb", function() Snacks.gitbrowse.open() end )

lua/minimodules.lua

@@ -0,0 +1,17 @@
+local M = {}
+
+function M.load_modules()
+	local modules_path = vim.fn.stdpath("config") .. "/lua/config/modules"
+	local modules = vim.fn.globpath(modules_path, "*.lua", false, true)
+
+	for _, module_file in ipairs(modules) do
+		local module_name = vim.fn.fnamemodify(module_file, ":t:r")
+
+		local ok, err = pcall(require, "config.modules." .. module_name)
+		if not ok then
+			vim.notify("Failed to load module: " .. module_name .. "\n" .. err, vim.log.levels.ERROR)
+		end
+	end
+end
+
+return M

lua/options.lua

@@ -3,8 +3,12 @@ vim.opt.relativenumber = true
 vim.opt.tabstop = 4
 vim.opt.softtabstop = 4
 vim.opt.shiftwidth = 4
-vim.opt.expandtab = true
+vim.opt.expandtab = false
 vim.opt.smartindent = false
+
+vim.o.list = true
+vim.opt.listchars = { tab = "··", trail = "·", nbsp = "_" }
+
 vim.opt.wrap = true
 vim.opt.linebreak = true
 vim.opt.swapfile = false
@@ -21,11 +25,6 @@ vim.opt.updatetime = 50
 vim.opt.colorcolumn = "80"
 vim.opt.textwidth = 80
 vim.opt.formatoptions = "rqnj"
--- vim.opt.foldmethod = "expr"
--- vim.opt.foldexpr = "v:lua.require('config.testfold').foldexpr()"
--- vim.opt.foldenable = true
--- vim.opt.foldlevel = 0
--- vim.opt.foldlevelstart = 0
 vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
 vim.o.clipboard = "unnamedplus"
 vim.o.cursorline = true

lua/plugins/init.lua

@@ -1,4 +1,12 @@
 return {
+	{
+		"nvim-mini/mini.nvim",
+		version = false,
+
+		modules = function()
+			require("config.mini-modules")
+		end,
+	},
 	{
 		"nvim-treesitter/nvim-treesitter",
 		config = function()
@@ -132,49 +140,7 @@ return {
 		end,
 	},
 	{
-        "folke/snacks.nvim",
-        priority = 1000,
-        lazy = false,
-        ---@type snacks.Config
-        opts = {
-            bigfile = { enabled = true },
-            dashboard = { enabled = true },
-            explorer = { enabled = true },
-            indent = {
-                enabled = true,
-                scope = {
-                    enabled = false,
-                    underline = true,
-                    animate = {
-                        enabled = true,
-                        fps = 144,
-                        easing = "inExpo",
-                        duration = 20,
-                    },
-                },
-                chunk = {
-                    enabled = true,
-                    char = {
-                        corner_top = "╭",
-                        corner_bottom = "╰",
-                        vertical = "│",
-                        arrow = "╼",
-                    },
-                },
-            },
-            input = { enabled = true },
-            picker = {
-                enabled = true,
-                hidden = true,
-                ignored = true,
-            },
-            notifier = { enabled = true },
-            quickfile = { enabled = true },
-            scope = { enabled = true },
-            scroll = { enabled = false },
-            statuscolumn = { enabled = true },
-            words = { enabled = true },
-        },
+		require("config.snacks")
 	},
 	{
 		"notken12/base46-colors",
@@ -307,5 +273,11 @@ return {
 				enable_preview = true,
 			}),
 		}
-    }
+	},
+	{
+		"aserowy/tmux.nvim",
+		config = function()
+			require("config.tmux")
+		end,
+	},
 }