Merge commit '2248c352da7ad3bd6f45ec5bb4133ae20b4a1cc6'

7 files changed, 61 insertions, 18 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 22ff27a..5b82295 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -58,6 +58,7 @@ local modules = {
   "plugins.treesitter",
   "plugins.telescope",
   "plugins.nvim-tree",
+  "plugins.quickfix",
   "plugins.cmp",
   "plugins.luasnip",
   "plugins.colorizer",
@@ -72,10 +73,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 +137,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
diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua
index 346bc4a..6ea5cdb 100644
--- a/.config/nvim/lua/plugins/colorscheme.lua
+++ b/.config/nvim/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!")
diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index 07c5c83..88e31e1 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -72,10 +72,10 @@ local on_attach = function(client, bufnr)
 	map("n", "<leader>wl", function()
 		print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
 	end)
-	map("n", "<leader>q", function()
-		vim.diagnostic.setqflist({ open = true })
-	end)
-	map("n", "<space>q", "<Cmd>lua vim.diagnostic.setloclist()<CR>")
+	--map("n", "<leader>q", function()
+	--	vim.diagnostic.setqflist({ open = true })
+	--end)
+	--map("n", "<space>q", "<Cmd>lua vim.diagnostic.setloclist()<CR>")
   --map("n", "gk", "<Cmd>Lspsaga diagnostic_jump_prev<CR>")
   --map("n", "gj", "<Cmd>Lspsaga diagnostic_jump_next<CR>")
 
diff --git a/.config/nvim/lua/plugins/null-ls.lua b/.config/nvim/lua/plugins/null-ls.lua
index 4573a54..41fba1a 100644
--- a/.config/nvim/lua/plugins/null-ls.lua
+++ b/.config/nvim/lua/plugins/null-ls.lua
@@ -9,25 +9,39 @@ 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.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,
-		--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
diff --git a/.config/nvim/lua/plugins/quickfix.lua b/.config/nvim/lua/plugins/quickfix.lua
new file mode 100644
index 0000000..4ea2374
--- /dev/null
+++ b/.config/nvim/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
diff --git a/.config/nvim/lua/user/keys.lua b/.config/nvim/lua/user/keys.lua
index 3f1157a..0d275d2 100644
--- a/.config/nvim/lua/user/keys.lua
+++ b/.config/nvim/lua/user/keys.lua
@@ -293,3 +293,15 @@ map("n", "<leader>td", "<CMD>TroubleToggle document_diagnostics<CR>")
 map("n", "<leader>tq", "<CMD>TroubleToggle quickfix<CR>")
 map("n", "<leader>tl", "<CMD>TroubleToggle loclist<CR>")
 map("n", "gR", "<CMD>TroubleToggle lsp_references<CR>")
+
+-- Replacer
+map('n', '<Leader>qr', ':lua require("replacer").run()<CR>')
+
+map("n", "<leader>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" })
diff --git a/.config/nvim/lua/user/pack.lua b/.config/nvim/lua/user/pack.lua
index 65b475b..c2c4aef 100644
--- a/.config/nvim/lua/user/pack.lua
+++ b/.config/nvim/lua/user/pack.lua
@@ -69,13 +69,11 @@ 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({
 		"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 +123,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']")
   })