From a58c111ddd4b392e2d954e05dcac1c96ad674012 Mon Sep 17 00:00:00 2001 From: Aram Markarov Date: Thu, 11 Dec 2025 19:27:50 +0100 Subject: [PATCH] 11/12 --- init.lua | 1 + lua/autocmd.lua | 7 ------- lua/config/dap.lua | 2 +- lua/config/neoformat.vim | 1 - lua/config/treesitter.lua | 2 +- lua/mappings.lua | 2 ++ lua/options.lua | 4 +++- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/init.lua b/init.lua index ccba47a..a9b636e 100644 --- a/init.lua +++ b/init.lua @@ -2,6 +2,7 @@ require("globals") require("options") require("config.lazy") require("mappings") +require("autocmd") vim.cmd("source ~/.config/nvim/suda.vim") local time = tonumber(os.date "%H") diff --git a/lua/autocmd.lua b/lua/autocmd.lua index b024a51..4948bb1 100644 --- a/lua/autocmd.lua +++ b/lua/autocmd.lua @@ -1,8 +1 @@ local autocmd = vim.api.nvim_create_autocmd - -autocmd("BufWritePre", { - callback = function() - local ok = pcall(function() vim.cmd "undojoin" end) - vim.cmd "Neoformat" - end -}) diff --git a/lua/config/dap.lua b/lua/config/dap.lua index e3b054f..cb2b211 100644 --- a/lua/config/dap.lua +++ b/lua/config/dap.lua @@ -90,7 +90,7 @@ dap.adapters["pwa-node"] = { command = "node", -- 💀 Make sure to update this path to point to your installation args = { - "/home/zach/.config/nvim/java-dap/js-debug/src/dapDebugServer.js", + "%HOME/.config/nvim/java-dap/js-debug/src/dapDebugServer.js", "${port}" } } diff --git a/lua/config/neoformat.vim b/lua/config/neoformat.vim index 171480a..e69de29 100644 --- a/lua/config/neoformat.vim +++ b/lua/config/neoformat.vim @@ -1 +0,0 @@ -let g:neoformat_verbose = 1 diff --git a/lua/config/treesitter.lua b/lua/config/treesitter.lua index 7e5937b..cd70c85 100644 --- a/lua/config/treesitter.lua +++ b/lua/config/treesitter.lua @@ -4,6 +4,6 @@ require'nvim-treesitter.configs'.setup { auto_install = true, highlight = {enable = true, additional_vim_regex_highlighting = false}, indent = {enable = true, disable = {}}, - ensure_installed = {"jsx", "toml", "json", "yaml", "css", "html", "lua"}, + ensure_installed = {"toml", "json", "yaml", "css", "html", "lua"}, autotag = {enable = true} } diff --git a/lua/mappings.lua b/lua/mappings.lua index 0088750..1fb2662 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -1,6 +1,8 @@ local map = vim.keymap.set local default_opts = {noremap = true} +map("n", "n", function() Snacks.notifier.show_history() end) + map('n', 'ff', "lua require'telescope.builtin'.find_files({ find_command = {'rg', '--files', '--hidden', '-g', '!.git' }})", default_opts) diff --git a/lua/options.lua b/lua/options.lua index c71d6a4..1d5dd35 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -18,7 +18,7 @@ vim.opt.signcolumn = "yes:1" vim.opt.isfname:append("@-@") vim.opt.updatetime = 50 vim.opt.textwidth = 0 -vim.opt.colorcolumn = "80" +vim.opt.colorcolumn = "100" vim.opt.formatoptions = "rqnj" vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions" @@ -48,3 +48,5 @@ local sep = is_windows and "\\" or "/" local delim = is_windows and ";" or ":" vim.env.PATH = table.concat({vim.fn.stdpath "data", "mason", "bin"}, sep) .. delim .. vim.env.PATH + +vim.api.nvim_create_user_command('Nf', function() vim.cmd('Neoformat') end, {})