diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/config/hop.lua | 2 | ||||
| -rw-r--r-- | lua/config/lsp/handlers.lua | 2 | ||||
| -rw-r--r-- | lua/config/quick-scope.lua | 4 | ||||
| -rw-r--r-- | lua/config/spectre.lua | 262 | ||||
| -rw-r--r-- | lua/config/zen.lua | 72 | ||||
| -rw-r--r-- | lua/plugins.lua | 27 |
6 files changed, 185 insertions, 184 deletions
diff --git a/lua/config/hop.lua b/lua/config/hop.lua index 9fd6422..1d8c20c 100644 --- a/lua/config/hop.lua +++ b/lua/config/hop.lua @@ -1,6 +1,6 @@ local status_ok, hop = pcall(require, "hop") if not status_ok then - return + return end hop.setup() diff --git a/lua/config/lsp/handlers.lua b/lua/config/lsp/handlers.lua index 61b7905..3dcf0dc 100644 --- a/lua/config/lsp/handlers.lua +++ b/lua/config/lsp/handlers.lua @@ -98,7 +98,7 @@ local capabilities = vim.lsp.protocol.make_client_capabilities() local status_ok, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp") if not status_ok then - return + return end M.capabilities = cmp_nvim_lsp.update_capabilities(capabilities) diff --git a/lua/config/quick-scope.lua b/lua/config/quick-scope.lua index 99b4196..4e598c7 100644 --- a/lua/config/quick-scope.lua +++ b/lua/config/quick-scope.lua @@ -1,3 +1,3 @@ -vim.cmd [[ +vim.cmd([[ let g:qs_highlight_on_keys = ['f', 'F', 't', 'T'] - ]] + ]]) diff --git a/lua/config/spectre.lua b/lua/config/spectre.lua index 899a322..f535210 100644 --- a/lua/config/spectre.lua +++ b/lua/config/spectre.lua @@ -1,136 +1,136 @@ local status_ok, spectre = pcall(require, "spectre") if not status_ok then -return + return end -spectre.setup { +spectre.setup({ -color_devicons = true, -highlight = { - ui = "String", - search = "DiffChange", - replace = "DiffDelete", -}, -mapping = { - ["toggle_line"] = { - map = "t", - cmd = "<cmd>lua require('spectre').toggle_line()<CR>", - desc = "toggle current item", - }, - ["enter_file"] = { - map = "<cr>", - cmd = "<cmd>lua require('spectre.actions').select_entry()<CR>", - desc = "goto current file", - }, - ["send_to_qf"] = { - map = "Q", - cmd = "<cmd>lua require('spectre.actions').send_to_qf()<CR>", - desc = "send all item to quickfix", - }, - ["replace_cmd"] = { - map = "c", - cmd = "<cmd>lua require('spectre.actions').replace_cmd()<CR>", - desc = "input replace vim command", - }, - ["show_option_menu"] = { - map = "o", - cmd = "<cmd>lua require('spectre').show_options()<CR>", - desc = "show option", - }, - ["run_replace"] = { - map = "R", - cmd = "<cmd>lua require('spectre.actions').run_replace()<CR>", - desc = "replace all", - }, - ["change_view_mode"] = { - map = "m", - cmd = "<cmd>lua require('spectre').change_view()<CR>", - desc = "change result view mode", - }, - ["toggle_ignore_case"] = { - map = "I", - cmd = "<cmd>lua require('spectre').change_options('ignore-case')<CR>", - desc = "toggle ignore case", - }, - ["toggle_ignore_hidden"] = { - map = "H", - cmd = "<cmd>lua require('spectre').change_options('hidden')<CR>", - desc = "toggle search hidden", - }, - -- you can put your mapping here it only use normal mode -}, -find_engine = { - -- rg is map with finder_cmd - ["rg"] = { - cmd = "rg", - -- default args - args = { - "--color=never", - "--no-heading", - "--with-filename", - "--line-number", - "--column", - }, - options = { - ["ignore-case"] = { - value = "--ignore-case", - icon = "[I]", - desc = "ignore case", - }, - ["hidden"] = { - value = "--hidden", - desc = "hidden file", - icon = "[H]", - }, - -- you can put any option you want here it can toggle with - -- show_option function - }, - }, - ["ag"] = { - cmd = "ag", - args = { - "--vimgrep", - "-s", - }, - options = { - ["ignore-case"] = { - value = "-i", - icon = "[I]", - desc = "ignore case", - }, - ["hidden"] = { - value = "--hidden", - desc = "hidden file", - icon = "[H]", - }, - }, - }, -}, -replace_engine = { - ["sed"] = { - cmd = "sed", - args = nil, - }, - options = { - ["ignore-case"] = { - value = "--ignore-case", - icon = "[I]", - desc = "ignore case", - }, - }, -}, -default = { - find = { - --pick one of item in find_engine - cmd = "rg", - options = { "ignore-case" }, - }, - replace = { - --pick one of item in replace_engine - cmd = "sed", - }, -}, -replace_vim_cmd = "cdo", -is_open_target_win = true, --open file on opener window -is_insert_mode = false, -- start open panel on is_insert_mode -} + color_devicons = true, + highlight = { + ui = "String", + search = "DiffChange", + replace = "DiffDelete", + }, + mapping = { + ["toggle_line"] = { + map = "t", + cmd = "<cmd>lua require('spectre').toggle_line()<CR>", + desc = "toggle current item", + }, + ["enter_file"] = { + map = "<cr>", + cmd = "<cmd>lua require('spectre.actions').select_entry()<CR>", + desc = "goto current file", + }, + ["send_to_qf"] = { + map = "Q", + cmd = "<cmd>lua require('spectre.actions').send_to_qf()<CR>", + desc = "send all item to quickfix", + }, + ["replace_cmd"] = { + map = "c", + cmd = "<cmd>lua require('spectre.actions').replace_cmd()<CR>", + desc = "input replace vim command", + }, + ["show_option_menu"] = { + map = "o", + cmd = "<cmd>lua require('spectre').show_options()<CR>", + desc = "show option", + }, + ["run_replace"] = { + map = "R", + cmd = "<cmd>lua require('spectre.actions').run_replace()<CR>", + desc = "replace all", + }, + ["change_view_mode"] = { + map = "m", + cmd = "<cmd>lua require('spectre').change_view()<CR>", + desc = "change result view mode", + }, + ["toggle_ignore_case"] = { + map = "I", + cmd = "<cmd>lua require('spectre').change_options('ignore-case')<CR>", + desc = "toggle ignore case", + }, + ["toggle_ignore_hidden"] = { + map = "H", + cmd = "<cmd>lua require('spectre').change_options('hidden')<CR>", + desc = "toggle search hidden", + }, + -- you can put your mapping here it only use normal mode + }, + find_engine = { + -- rg is map with finder_cmd + ["rg"] = { + cmd = "rg", + -- default args + args = { + "--color=never", + "--no-heading", + "--with-filename", + "--line-number", + "--column", + }, + options = { + ["ignore-case"] = { + value = "--ignore-case", + icon = "[I]", + desc = "ignore case", + }, + ["hidden"] = { + value = "--hidden", + desc = "hidden file", + icon = "[H]", + }, + -- you can put any option you want here it can toggle with + -- show_option function + }, + }, + ["ag"] = { + cmd = "ag", + args = { + "--vimgrep", + "-s", + }, + options = { + ["ignore-case"] = { + value = "-i", + icon = "[I]", + desc = "ignore case", + }, + ["hidden"] = { + value = "--hidden", + desc = "hidden file", + icon = "[H]", + }, + }, + }, + }, + replace_engine = { + ["sed"] = { + cmd = "sed", + args = nil, + }, + options = { + ["ignore-case"] = { + value = "--ignore-case", + icon = "[I]", + desc = "ignore case", + }, + }, + }, + default = { + find = { + --pick one of item in find_engine + cmd = "rg", + options = { "ignore-case" }, + }, + replace = { + --pick one of item in replace_engine + cmd = "sed", + }, + }, + replace_vim_cmd = "cdo", + is_open_target_win = true, --open file on opener window + is_insert_mode = false, -- start open panel on is_insert_mode +}) diff --git a/lua/config/zen.lua b/lua/config/zen.lua index 2a1086d..dbc6b06 100644 --- a/lua/config/zen.lua +++ b/lua/config/zen.lua @@ -2,41 +2,41 @@ local status_ok, zen_mode = pcall(require, "zen-mode") if not status_ok then -return + return end -zen_mode.setup { -window = { - backdrop = 1, - height = 0.9, -- height of the Zen window - width = 0.65, - options = { - signcolumn = "no", -- disable signcolumn - number = false, -- disable number column - relativenumber = false, -- disable relative numbers - -- cursorline = false, -- disable cursorline - -- cursorcolumn = false, -- disable cursor column - -- foldcolumn = "0", -- disable fold column - -- list = false, -- disable whitespace characters - }, -}, -plugins = { - gitsigns = { enabled = false }, -- disables git signs - tmux = { enabled = true }, - twilight = { enabled = true }, -}, --- on_open = function() --- vim.lsp.diagnostic.disable() --- vim.cmd [[ --- set foldlevel=10 --- IndentBlanklineDisable --- ]] --- end, --- on_close = function() --- vim.lsp.diagnostic.enable() --- vim.cmd [[ --- set foldlevel=5 --- IndentBlanklineEnable --- ]] --- end, -} +zen_mode.setup({ + window = { + backdrop = 1, + height = 0.9, -- height of the Zen window + width = 0.65, + options = { + signcolumn = "no", -- disable signcolumn + number = false, -- disable number column + relativenumber = false, -- disable relative numbers + -- cursorline = false, -- disable cursorline + -- cursorcolumn = false, -- disable cursor column + -- foldcolumn = "0", -- disable fold column + -- list = false, -- disable whitespace characters + }, + }, + plugins = { + gitsigns = { enabled = false }, -- disables git signs + tmux = { enabled = true }, + twilight = { enabled = true }, + }, + -- on_open = function() + -- vim.lsp.diagnostic.disable() + -- vim.cmd [[ + -- set foldlevel=10 + -- IndentBlanklineDisable + -- ]] + -- end, + -- on_close = function() + -- vim.lsp.diagnostic.enable() + -- vim.cmd [[ + -- set foldlevel=5 + -- IndentBlanklineEnable + -- ]] + -- end, +}) diff --git a/lua/plugins.lua b/lua/plugins.lua index 74de69c..c8532ea 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -18,7 +18,7 @@ return { { "neovim/nvim-lspconfig" }, { "williamboman/nvim-lsp-installer" }, - { "tamago324/nlsp-settings.nvim" }, + { "tamago324/nlsp-settings.nvim" }, { "jose-elias-alvarez/null-ls.nvim" }, { "nvim-telescope/telescope.nvim" }, @@ -43,16 +43,17 @@ return { { "goolord/alpha-nvim" }, { "antoinemadec/FixCursorHold.nvim" }, -- This is needed to fix lsp doc highlight { "folke/which-key.nvim" }, - { "folke/zen-mode.nvim", - config = function() - require("zen-mode").setup { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - } - end - }, - { "windwp/nvim-spectre" }, - { "phaazon/hop.nvim" }, - { "unblevable/quick-scope" }, + { + "folke/zen-mode.nvim", + config = function() + require("zen-mode").setup({ + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + }) + end, + }, + { "windwp/nvim-spectre" }, + { "phaazon/hop.nvim" }, + { "unblevable/quick-scope" }, } |