From 5182cc4a01d969ae86527acfbc427d6e17651aac Mon Sep 17 00:00:00 2001 From: srdusr Date: Sat, 18 Feb 2023 23:58:10 +0200 Subject: Commented out Comment.nvim --- lua/user/pack.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/user/pack.lua b/lua/user/pack.lua index 65b475b..ec79d75 100644 --- a/lua/user/pack.lua +++ b/lua/user/pack.lua @@ -130,7 +130,7 @@ return packer.startup(function(use) vim.cmd("let g:numbers_exclude = ['dashboard']") }) use("windwp/nvim-autopairs") -- - use("numToStr/Comment.nvim") -- + --use("numToStr/Comment.nvim") -- use("akinsho/toggleterm.nvim") -- use("tweekmonster/startuptime.vim") -- use({ -- cgit v1.2.3 From 259bbbbd4eb7c6d800fff5913598159796d5f7ab Mon Sep 17 00:00:00 2001 From: srdusr Date: Sat, 18 Feb 2023 23:59:38 +0200 Subject: un-commented out Comment.nvim --- lua/user/pack.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/user/pack.lua b/lua/user/pack.lua index ec79d75..65b475b 100644 --- a/lua/user/pack.lua +++ b/lua/user/pack.lua @@ -130,7 +130,7 @@ return packer.startup(function(use) vim.cmd("let g:numbers_exclude = ['dashboard']") }) use("windwp/nvim-autopairs") -- - --use("numToStr/Comment.nvim") -- + use("numToStr/Comment.nvim") -- use("akinsho/toggleterm.nvim") -- use("tweekmonster/startuptime.vim") -- use({ -- cgit v1.2.3 From 2af63be76171296fcaefcc6b5acb0d428d9dab60 Mon Sep 17 00:00:00 2001 From: srdusr Date: Sun, 19 Feb 2023 14:02:51 +0200 Subject: Changed from using filetype.nvim (plugin) to new upstream feature plugin filetype.lua --- init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index 22ff27a..0c23b7b 100644 --- a/init.lua +++ b/init.lua @@ -72,10 +72,10 @@ local modules = { "plugins.navic", "plugins.zen-mode", "plugins.colorscheme", + "plugins.dashboard", "plugins.heirline", "plugins.toggleterm", "plugins.trouble", - "plugins.dashboard", --"plugins.modify-blend", --"plugins.dap", --"plugins.floatterm", @@ -136,5 +136,5 @@ local builtins = { for _, plugin in ipairs(builtins) do vim.g["loaded_" .. plugin] = 1 end -vim.g.do_filetype_nvim = 1 +vim.g.do_filetype_lua = 1 vim.g.did_load_filetypes = 0 -- cgit v1.2.3 From 25a65d346c4a32214ffad43b82d33952b78665b0 Mon Sep 17 00:00:00 2001 From: srdusr Date: Sun, 19 Feb 2023 14:12:14 +0200 Subject: Removed "nathom/filetype.nvim" since filetype.lua is used in upstream --- lua/user/pack.lua | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lua/user/pack.lua b/lua/user/pack.lua index 65b475b..3ae317e 100644 --- a/lua/user/pack.lua +++ b/lua/user/pack.lua @@ -73,9 +73,6 @@ return packer.startup(function(use) -- Linters/Formatters use({ "jose-elias-alvarez/null-ls.nvim", -- Provides LSP: linters, formatters, diagnostics, code actions and etc... - config = function() - require("null-ls").setup() - end, requires = { "nvim-lua/plenary.nvim" }, }) @@ -125,7 +122,7 @@ return packer.startup(function(use) --use("tpope/vim-obsession") -- --use("tpope/vim-unimpaired") -- --use("vimpostor/vim-tpipeline") -- - use("nathom/filetype.nvim") -- + --use("nathom/filetype.nvim") -- use({"myusuf3/numbers.vim", -- vim.cmd("let g:numbers_exclude = ['dashboard']") }) -- cgit v1.2.3 From 40ff39552b75612de7c644c47dcabae77e9b7cec Mon Sep 17 00:00:00 2001 From: srdusr Date: Sun, 19 Feb 2023 14:32:21 +0200 Subject: Add plugin Replacer.nvim keybinding --- lua/user/keys.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lua/user/keys.lua b/lua/user/keys.lua index 3f1157a..a70290f 100644 --- a/lua/user/keys.lua +++ b/lua/user/keys.lua @@ -293,3 +293,6 @@ map("n", "td", "TroubleToggle document_diagnostics") map("n", "tq", "TroubleToggle quickfix") map("n", "tl", "TroubleToggle loclist") map("n", "gR", "TroubleToggle lsp_references") + +-- Replacer +map('n', 'qr', ':lua require("replacer").run()') -- cgit v1.2.3 From a84ddad43a14c7e73477da73e77388c18001513d Mon Sep 17 00:00:00 2001 From: srdusr Date: Sun, 19 Feb 2023 14:33:41 +0200 Subject: Add keybinding to toggle quickfix list --- lua/user/keys.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lua/user/keys.lua b/lua/user/keys.lua index a70290f..0d275d2 100644 --- a/lua/user/keys.lua +++ b/lua/user/keys.lua @@ -296,3 +296,12 @@ map("n", "gR", "TroubleToggle lsp_references") -- Replacer map('n', 'qr', ':lua require("replacer").run()') + +map("n", "q", function() + if vim.fn.getqflist({ winid = 0 }).winid ~= 0 then + require('plugins.quickfix').close() + else + require('plugins.quickfix').open() + --require("quickfix").open() + end +end, { desc = "Toggle quickfix window" }) -- cgit v1.2.3 From 6ca95abdcad5f718587baddb55ecf19fce2851d5 Mon Sep 17 00:00:00 2001 From: srdusr Date: Sun, 19 Feb 2023 14:34:20 +0200 Subject: Add quickfix settings --- lua/plugins/quickfix.lua | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 lua/plugins/quickfix.lua diff --git a/lua/plugins/quickfix.lua b/lua/plugins/quickfix.lua new file mode 100644 index 0000000..4ea2374 --- /dev/null +++ b/lua/plugins/quickfix.lua @@ -0,0 +1,18 @@ +local M = {} + +M.close = function() + vim.cmd.cclose() +end + +M.open = function() + if vim.tbl_count(vim.fn.getqflist()) == 0 then + vim.notify( + "Nothing in quickfix list; not opening.", + vim.log.levels.WARN + ) + else + vim.cmd.copen() + end +end + +return M -- cgit v1.2.3 From bbad5d10f7a6c1fe985ed08df80def3eba3d7fa4 Mon Sep 17 00:00:00 2001 From: srdusr Date: Sun, 19 Feb 2023 14:34:47 +0200 Subject: Commented out quickfix keybindings --- lua/plugins/lsp.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 07c5c83..88e31e1 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -72,10 +72,10 @@ local on_attach = function(client, bufnr) map("n", "wl", function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end) - map("n", "q", function() - vim.diagnostic.setqflist({ open = true }) - end) - map("n", "q", "lua vim.diagnostic.setloclist()") + --map("n", "q", function() + -- vim.diagnostic.setqflist({ open = true }) + --end) + --map("n", "q", "lua vim.diagnostic.setloclist()") --map("n", "gk", "Lspsaga diagnostic_jump_prev") --map("n", "gj", "Lspsaga diagnostic_jump_next") -- cgit v1.2.3 From 227c10b155f2a6ec49f2e42dc1943eede88a6381 Mon Sep 17 00:00:00 2001 From: srdusr Date: Sun, 19 Feb 2023 14:35:16 +0200 Subject: Add "gabrielpoca/replacer" plugin to edit quickfix list --- lua/user/pack.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/user/pack.lua b/lua/user/pack.lua index 3ae317e..c2c4aef 100644 --- a/lua/user/pack.lua +++ b/lua/user/pack.lua @@ -69,6 +69,7 @@ return packer.startup(function(use) -- Debugger use("mfussenegger/nvim-dap") -- Debug Adapter Protocol client implementation for Neovim use("rcarriga/nvim-dap-ui") -- UI for nvim-dap + use("gabrielpoca/replacer.nvim") -- Linters/Formatters use({ -- cgit v1.2.3 From 4729fee2acd6b6f23a3aff15d59a71cf34d1213c Mon Sep 17 00:00:00 2001 From: srdusr Date: Sun, 19 Feb 2023 14:35:31 +0200 Subject: Add quickfix settings --- init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/init.lua b/init.lua index 0c23b7b..5b82295 100644 --- a/init.lua +++ b/init.lua @@ -58,6 +58,7 @@ local modules = { "plugins.treesitter", "plugins.telescope", "plugins.nvim-tree", + "plugins.quickfix", "plugins.cmp", "plugins.luasnip", "plugins.colorizer", -- cgit v1.2.3 From bd8c93b3dc389e5570d79b1a754d49839a02548a Mon Sep 17 00:00:00 2001 From: srdusr Date: Tue, 21 Feb 2023 07:44:58 +0200 Subject: Changed colorscheme to "doom-one" --- lua/plugins/colorscheme.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 346bc4a..6ea5cdb 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -1,7 +1,7 @@ -- Colorscheme -- Available colorschemes: -- [[ nightfly ayu onedark doom-one ]] -local colorscheme = "nightfly" +local colorscheme = "doom-one" local status_ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme) if not status_ok then vim.notify("colorscheme " .. colorscheme .. " not found!") -- cgit v1.2.3 From 1165543e0f30e81d0e244cc303d0de36c7889cd7 Mon Sep 17 00:00:00 2001 From: srdusr Date: Tue, 21 Feb 2023 07:45:31 +0200 Subject: Add diagnostics.zsh and formatting.shfmt --- lua/plugins/null-ls.lua | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/lua/plugins/null-ls.lua b/lua/plugins/null-ls.lua index 4573a54..e3c9b23 100644 --- a/lua/plugins/null-ls.lua +++ b/lua/plugins/null-ls.lua @@ -9,25 +9,36 @@ end null_ls.setup({ debug = true, + disabled_filetypes = { "PKGBUILD" }, sources = { require("null-ls").builtins.formatting.stylua, -- lua formatting require("null-ls").builtins.formatting.prettier.with({ -- markdown, html/js formatting filetypes = { "html", "css", "javascript", "javascriptreact", "markdown", "json", "yaml" }, }), require("null-ls").builtins.formatting.shfmt.with({ -- shell script formatting - filetypes = { "bash", "zsh", "sh" }, + filetypes = { ".bash", ".zsh", ".sh", "bash", "zsh", "sh" }, + --filetypes = { "bash", "zsh", "sh" }, }), require("null-ls").builtins.diagnostics.shellcheck, -- shell script diagnostics require("null-ls").builtins.code_actions.shellcheck, -- shell script code actions - --require("null-ls").builtins.formatting.black, - --require("null-ls").builtins.formatting.prettierd, + require("null-ls").builtins.diagnostics.zsh, -- shell script diagnostics + require("null-ls").builtins.formatting.shfmt, + require("null-ls").builtins.formatting.black, + require("null-ls").builtins.formatting.prettierd, --require("null-ls").builtins.diagnostics.luacheck, --require("null-ls").builtins.diagnostics.eslint, --require("null-ls").builtins.diagnostics.eslint_d, - --require("null-ls").builtins.diagnostics.mdl, - --require("null-ls").builtins.diagnostics.vint, - --require("null-ls").builtins.codeactions.eslint_d, - --require("null-ls").builtins.completion.spell, + require("null-ls").builtins.diagnostics.mdl, + require("null-ls").builtins.diagnostics.vint, + --require("null-ls").builtins.code_actions.eslint_d, + require("null-ls").builtins.completion.spell, + require("null-ls").builtins.formatting.clang_format, + require("null-ls").builtins.formatting.rustfmt, + require("null-ls").builtins.formatting.sql_formatter, + require("null-ls").builtins.formatting.stylua, + --require("null-ls").builtins.formatting.google_java_format, + require("null-ls").builtins.formatting.shellharden, + require("null-ls").builtins.diagnostics.cppcheck, }, on_attach = function(client, bufnr) if client.server_capabilities.document_formatting then -- cgit v1.2.3 From 6ee5889a434ad20b7f0183725d17b952af0d44dc Mon Sep 17 00:00:00 2001 From: srdusr Date: Tue, 21 Feb 2023 07:53:13 +0200 Subject: Add diagnostics.cspell --- lua/plugins/null-ls.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lua/plugins/null-ls.lua b/lua/plugins/null-ls.lua index e3c9b23..41fba1a 100644 --- a/lua/plugins/null-ls.lua +++ b/lua/plugins/null-ls.lua @@ -25,6 +25,9 @@ null_ls.setup({ require("null-ls").builtins.formatting.shfmt, require("null-ls").builtins.formatting.black, require("null-ls").builtins.formatting.prettierd, + require("null-ls").builtins.diagnostics.cspell.with { + filetypes = { "python", "rust", "typescript" }, + }, --require("null-ls").builtins.diagnostics.luacheck, --require("null-ls").builtins.diagnostics.eslint, --require("null-ls").builtins.diagnostics.eslint_d, -- cgit v1.2.3