From d3f737380158cf05f5fac713f003074e194aef3b Mon Sep 17 00:00:00 2001 From: S4NKALP Date: Sat, 4 Jan 2025 21:09:50 +0545 Subject: [PATCH] updates --- lua/core/autocmd.lua | 27 +++++++++++++++++++++++++-- lua/core/keys.lua | 17 +++++++++++------ lua/plugins/lang/null-ls.lua | 2 ++ lua/plugins/list.lua | 1 + lua/plugins/lock.json | 22 +++++++++++----------- lua/plugins/mason-lock.json | 19 +++++++++++++++---- lua/plugins/ui/snacks.lua | 2 +- 7 files changed, 66 insertions(+), 24 deletions(-) diff --git a/lua/core/autocmd.lua b/lua/core/autocmd.lua index 7752deb..b6d05bc 100644 --- a/lua/core/autocmd.lua +++ b/lua/core/autocmd.lua @@ -1,5 +1,5 @@ local function augroup(name) - return vim.api.nvim_create_augroup('nvim2k_' .. name, { clear = true }) + return vim.api.nvim_create_augroup('nvim' .. name, { clear = true }) end -- Strip trailing spaces before write @@ -119,8 +119,31 @@ enable_autoformat() vim.api.nvim_create_user_command('WriteNoFormat', function() -- Temporarily disable the autoformat autocmd - vim.api.nvim_del_augroup_by_name('nvim2k_autoformat') + vim.api.nvim_del_augroup_by_name('nvim_autoformat') vim.cmd('write') -- Re-enable the autoformat autocmd enable_autoformat() end, {}) + +-- Toggle between relative/absolute line numbers +local numbertoggle = augroup('numbertoggle') +vim.api.nvim_create_autocmd({ 'BufEnter', 'FocusGained', 'InsertLeave', 'CmdlineLeave', 'WinEnter' }, { + pattern = '*', + group = numbertoggle, + callback = function() + if vim.o.nu and vim.api.nvim_get_mode().mode ~= 'i' then + vim.opt.relativenumber = true + end + end, +}) + +vim.api.nvim_create_autocmd({ 'BufLeave', 'FocusLost', 'InsertEnter', 'CmdlineEnter', 'WinLeave' }, { + pattern = '*', + group = numbertoggle, + callback = function() + if vim.o.nu then + vim.opt.relativenumber = false + vim.cmd.redraw() + end + end, +}) diff --git a/lua/core/keys.lua b/lua/core/keys.lua index a45545a..8398264 100644 --- a/lua/core/keys.lua +++ b/lua/core/keys.lua @@ -91,9 +91,14 @@ map('i', '.', '.u') map('i', ';', ';u') -- Move Lines -vim.keymap.set('n', '', ':m .+1==', { desc = 'Move lines', silent = true }) -vim.keymap.set('v', '', ":m '>+1gv=gv", { desc = 'Move lines', silent = true }) -vim.keymap.set('i', '', ':m .+1==gi', { desc = 'Move lines', silent = true }) -vim.keymap.set('n', '', ':m .-2==', { desc = 'Move lines', silent = true }) -vim.keymap.set('v', '', ":m '<-2gv=gv", { desc = 'Move lines', silent = true }) -vim.keymap.set('i', '', ':m .-2==gi', { desc = 'Move lines', silent = true }) +map('n', '', ':m .+1==', { desc = 'Move lines', silent = true }) +map('v', '', ":m '>+1gv=gv", { desc = 'Move lines', silent = true }) +map('i', '', ':m .+1==gi', { desc = 'Move lines', silent = true }) +map('n', '', ':m .-2==', { desc = 'Move lines', silent = true }) +map('v', '', ":m '<-2gv=gv", { desc = 'Move lines', silent = true }) +map('i', '', ':m .-2==gi', { desc = 'Move lines', silent = true }) + +map('n', 'd', '"_d', { desc = 'Delete without replacing clipboard' }) +map('n', 'x', '"_x', { desc = 'Cut without replacing clipboard' }) +map('n', 'c', '"_c', { desc = 'Change without replacing clipboard' }) +map('v', 'p', '"_dP', { desc = 'Paste without replacing clipboard' }) diff --git a/lua/plugins/lang/null-ls.lua b/lua/plugins/lang/null-ls.lua index abb85d3..fabcd84 100644 --- a/lua/plugins/lang/null-ls.lua +++ b/lua/plugins/lang/null-ls.lua @@ -31,6 +31,8 @@ null_ls.setup({ diag.write_good, -- english writing style format.mix, -- elixir formatter format.prettier, -- js, md, css, etc formatter + format.prettierd, + format.djlint, -- django, jinja formatter -- format.rubocop, -- ruby formatter format.shfmt, -- shell formatter format.stylua, -- lua formatter diff --git a/lua/plugins/list.lua b/lua/plugins/list.lua index 7777628..d3c8d45 100644 --- a/lua/plugins/list.lua +++ b/lua/plugins/list.lua @@ -478,6 +478,7 @@ local lsp_servers = { 'lua_ls', 'typos_lsp', -- check typos 'vimls', + 'jinja_lsp', 'tailwindcss', } diff --git a/lua/plugins/lock.json b/lua/plugins/lock.json index b722709..8559822 100644 --- a/lua/plugins/lock.json +++ b/lua/plugins/lock.json @@ -2,8 +2,8 @@ "CopilotChat.nvim": { "branch": "main", "commit": "2ebe591cff06018e265263e71e1dbc4c5aa8281e" }, "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" }, "blink-cmp-copilot": { "branch": "main", "commit": "c5c5cbce5748d21073f1d5348a92ebe6ce63f387" }, - "blink.cmp": { "branch": "main", "commit": "5f442681df24fe705d1ee7ce5b4d435aa4b4dee4" }, - "ccc.nvim": { "branch": "main", "commit": "7c639042583c7bdc7ce2e37e5a0e0aa6d0659c6a" }, + "blink.cmp": { "branch": "main", "commit": "e3b7cb4a1094377c3093a021300de123d9fc60d3" }, + "ccc.nvim": { "branch": "main", "commit": "b57cbaf8db3ac43c56c9e2c7f3812944638260ed" }, "codeium.vim": { "branch": "main", "commit": "d152e6cd3d814a44f36447bb0d21d51f6787fe9c" }, "codesnap.nvim": { "branch": "main", "commit": "6400480aa6cc366cbd931146c429aaa64680dab9" }, "comment-box.nvim": { "branch": "main", "commit": "06bb771690bc9df0763d14769b779062d8f12bc5" }, @@ -29,23 +29,23 @@ "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.ai": { "branch": "main", "commit": "40e380a589d07ec2c856940c6422aafe5d949a0d" }, "mini.surround": { "branch": "main", "commit": "0e67c4bc147f2a15cee94e7c94dcc0e115b9f55e" }, - "neo-tree.nvim": { "branch": "main", "commit": "a9f8943b4c31f8460d25c71e0f463d65e9775f1c" }, - "neotest": { "branch": "master", "commit": "0dccb5ebcf00de245e2060fa17822a9464f5c41a" }, + "neo-tree.nvim": { "branch": "main", "commit": "e6645ecfcba3e064446a6def1c10d788c9873f51" }, + "neotest": { "branch": "master", "commit": "d66cf4e05a116957f0d3a7755a24291c7d1e1f72" }, "neotest-jest": { "branch": "main", "commit": "514fd4eae7da15fd409133086bb8e029b65ac43f" }, "neotest-python": { "branch": "master", "commit": "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e" }, "neotest-rspec": { "branch": "main", "commit": "f8c91edc5dd87ca467a624652f365ac217d7cc1c" }, "nerdy.nvim": { "branch": "main", "commit": "719ed52244b34ea9de08f074e0d22fd67d615640" }, - "none-ls.nvim": { "branch": "main", "commit": "02144ef2b86a816b5dec69783e311bb6feff7d82" }, + "none-ls.nvim": { "branch": "main", "commit": "00421b9dc7a4d132ca74cfb4c7e8030d05d6fd0b" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-dap": { "branch": "master", "commit": "ffb077e65259f13be096ea6d603e3575a76b214a" }, + "nvim-dap": { "branch": "master", "commit": "0e673accbb512e1e191dfb4fecea89cc38c1bcdd" }, "nvim-dap-ui": { "branch": "master", "commit": "e94d98649dccb6a3884b66aabc2e07beb279e535" }, - "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" }, + "nvim-lspconfig": { "branch": "master", "commit": "f4ed656e876e45cf914d7beb972830561178e232" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-notify": { "branch": "master", "commit": "c3797193536711b5d8983975791c4b11dc35ab3a" }, + "nvim-notify": { "branch": "master", "commit": "bd9cd51f9ef2f6326fc2bc9931d0718c1794e247" }, "nvim-spectre": { "branch": "master", "commit": "08be31c104df3b4b049607694ebb2b6ced4f928b" }, "nvim-spider": { "branch": "main", "commit": "2b38e3e95e143313d78ca098eeecda7aebfce925" }, - "nvim-treesitter": { "branch": "master", "commit": "4b222913486ec0a5983efa82b0649a2ab87cf1f0" }, + "nvim-treesitter": { "branch": "master", "commit": "57713d079c3c2afcc31f3e0650bf8594a2a296ba" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" }, "nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, @@ -56,8 +56,8 @@ "pomo.nvim": { "branch": "main", "commit": "aa8decc421d89be0f10b1fc6a602cdd269f350ff" }, "refactoring.nvim": { "branch": "master", "commit": "2db6d378e873de31d18ade549c2edba64ff1c2e3" }, "ror.nvim": { "branch": "main", "commit": "9d31ad3953be83ac8dd542725ca4881c861f64a5" }, - "showkeys": { "branch": "main", "commit": "3c62fd88e685fd08f0f2724e1c0856d77dd0d552" }, - "snacks.nvim": { "branch": "main", "commit": "98df370703b3c47a297988f3e55ce99628639590" }, + "showkeys": { "branch": "main", "commit": "891f95ef94ac80bc7690a0df09c6112b4b822cac" }, + "snacks.nvim": { "branch": "main", "commit": "d312053f78b4fb55523def179ac502438dd93193" }, "sniprun": { "branch": "master", "commit": "67ac2d84d03f3b857d59571ff5fefb6080dffa2d" }, "tabout.nvim": { "branch": "master", "commit": "9a3499480a8e53dcaa665e2836f287e3b7764009" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" }, diff --git a/lua/plugins/mason-lock.json b/lua/plugins/mason-lock.json index eb82d6b..adaca40 100644 --- a/lua/plugins/mason-lock.json +++ b/lua/plugins/mason-lock.json @@ -1,26 +1,37 @@ { "actionlint": "v1.7.5", - "bash-language-server": "5.4.2", + "bash-language-server": "5.4.3", + "clang-format": "19.1.6", + "clangd": "19.1.2", + "css-lsp": "4.10.0", + "curlylint": "0.13.1", + "django-template-lsp": "0.9.5", + "djlint": "1.36.4", "eslint-lsp": "4.10.0", - "golangci-lint": "v1.62.2", + "golangci-lint": "v1.63.4", "gopls": "v0.17.1", "hadolint": "v2.12.0", + "html-lsp": "4.10.0", "jdtls": "v1.43.0", + "jinja-lsp": "0.1.84", "json-lsp": "4.10.0", "lua-language-server": "3.13.5", "prettier": "3.4.2", + "prettierd": "0.26.0", "proselint": "0.14.0", "pyright": "1.1.391", "rubocop": "1.69.2", - "ruff": "0.8.4", + "ruff": "0.8.6", "rust-analyzer": "2024-12-30", + "selene": "0.27.1", "shellcheck": "v0.10.0", "shfmt": "v3.10.0", "solargraph": "0.50.0", "stylua": "v2.0.2", "tailwindcss-language-server": "0.0.27", + "trivy": "v0.58.1", "typescript-language-server": "4.3.3", - "typos-lsp": "v0.1.32", + "typos-lsp": "v0.1.33", "vim-language-server": "2.3.1", "vint": "0.3.21", "write-good": "1.0.8" diff --git a/lua/plugins/ui/snacks.lua b/lua/plugins/ui/snacks.lua index 3da9621..13124ae 100644 --- a/lua/plugins/ui/snacks.lua +++ b/lua/plugins/ui/snacks.lua @@ -11,7 +11,7 @@ Snacks.setup({ bigfile = { enabled = true, notify = true, - size = 100 * 1024, -- 100 KB + size = 1.5 * 1024 * 1024, -- 1.5MB }, bufdelete = { enabled = true }, dashboard = {