This commit is contained in:
zegonix
2024-12-30 18:24:02 +01:00
parent 10cbfdd6df
commit d3584ba6c1
3 changed files with 122 additions and 114 deletions

View File

@@ -1,26 +1,26 @@
return { return {
'nvim-telescope/telescope.nvim', "nvim-telescope/telescope.nvim",
event = 'VimEnter', event = "VimEnter",
branch = '0.1.x', branch = "0.1.x",
dependencies = { dependencies = {
'nvim-lua/plenary.nvim', "nvim-lua/plenary.nvim",
{ -- If encountering errors, see telescope-fzf-native README for installation instructions { -- If encountering errors, see telescope-fzf-native README for installation instructions
'nvim-telescope/telescope-fzf-native.nvim', "nvim-telescope/telescope-fzf-native.nvim",
-- `build` is used to run some command when the plugin is installed/updated. -- `build` is used to run some command when the plugin is installed/updated.
-- This is only run then, not every time Neovim starts up. -- This is only run then, not every time Neovim starts up.
build = 'make', build = "make",
-- `cond` is a condition used to determine whether this plugin should be -- `cond` is a condition used to determine whether this plugin should be
-- installed and loaded. -- installed and loaded.
cond = function() cond = function()
return vim.fn.executable 'make' == 1 return vim.fn.executable("make") == 1
end, end,
}, },
{ 'nvim-telescope/telescope-ui-select.nvim' }, { "nvim-telescope/telescope-ui-select.nvim" },
-- Useful for getting pretty icons, but requires a Nerd Font. -- Useful for getting pretty icons, but requires a Nerd Font.
{ 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, { "nvim-tree/nvim-web-devicons", enabled = vim.g.have_nerd_font },
}, },
config = function() config = function()
-- Telescope is a fuzzy finder that comes with a lot of different things that -- Telescope is a fuzzy finder that comes with a lot of different things that
@@ -42,74 +42,78 @@ return {
-- Telescope picker. This is really useful to discover what Telescope can -- Telescope picker. This is really useful to discover what Telescope can
-- do as well as how to actually do it! -- do as well as how to actually do it!
local actions = require("telescope.actions")
-- [[ Configure Telescope ]] -- [[ Configure Telescope ]]
-- See `:help telescope` and `:help telescope.setup()` -- See `:help telescope` and `:help telescope.setup()`
require('telescope').setup { require("telescope").setup({
-- You can put your default mappings / updates / etc. in here -- You can put your default mappings / updates / etc. in here
-- All the info you're looking for is in `:help telescope.setup()` -- All the info you're looking for is in `:help telescope.setup()`
--
-- defaults = { defaults = {
-- mappings = { mappings = {
-- i = { ['<c-enter>'] = 'to_fuzzy_refine' }, i = {
-- }, ["<C-j>"] = actions.move_selection_next,
-- }, ["<C-k>"] = actions.move_selection_previous,
},
},
},
pickers = { pickers = {
find_files = { find_files = {
file_ignore_patterns = { '.git', '.venv' }, file_ignore_patterns = { ".git", ".venv" },
hidden = true, hidden = true,
}, },
}, },
live_grep = { live_grep = {
file_ignore_patterns = { '.git', '.venv' }, file_ignore_patterns = { ".git", ".venv" },
additional_args = function(_) additional_args = function(_)
return { '--hidden' } return { "--hidden" }
end, end,
}, },
extensions = { extensions = {
['ui-select'] = { ["ui-select"] = {
require('telescope.themes').get_dropdown(), require("telescope.themes").get_dropdown(),
}, },
}, },
} })
-- Enable Telescope extensions if they are installed -- Enable Telescope extensions if they are installed
pcall(require('telescope').load_extension, 'fzf') pcall(require("telescope").load_extension, "fzf")
pcall(require('telescope').load_extension, 'ui-select') pcall(require("telescope").load_extension, "ui-select")
-- See `:help telescope.builtin` -- See `:help telescope.builtin`
local builtin = require 'telescope.builtin' local builtin = require("telescope.builtin")
vim.keymap.set('n', '<leader>sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) vim.keymap.set("n", "<leader>sh", builtin.help_tags, { desc = "[S]earch [H]elp" })
vim.keymap.set('n', '<leader>sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) vim.keymap.set("n", "<leader>sk", builtin.keymaps, { desc = "[S]earch [K]eymaps" })
vim.keymap.set('n', '<leader>sf', builtin.find_files, { desc = '[S]earch [F]iles' }) vim.keymap.set("n", "<leader>sf", builtin.find_files, { desc = "[S]earch [F]iles" })
vim.keymap.set('n', '<leader>ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) vim.keymap.set("n", "<leader>ss", builtin.builtin, { desc = "[S]earch [S]elect Telescope" })
vim.keymap.set('n', '<leader>sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) vim.keymap.set("n", "<leader>sw", builtin.grep_string, { desc = "[S]earch current [W]ord" })
vim.keymap.set('n', '<leader>sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) vim.keymap.set("n", "<leader>sg", builtin.live_grep, { desc = "[S]earch by [G]rep" })
vim.keymap.set('n', '<leader>sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) vim.keymap.set("n", "<leader>sd", builtin.diagnostics, { desc = "[S]earch [D]iagnostics" })
vim.keymap.set('n', '<leader>sr', builtin.resume, { desc = '[S]earch [R]esume' }) vim.keymap.set("n", "<leader>sr", builtin.resume, { desc = "[S]earch [R]esume" })
vim.keymap.set('n', '<leader>s.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) vim.keymap.set("n", "<leader>s.", builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
vim.keymap.set('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' }) vim.keymap.set("n", "<leader><leader>", builtin.buffers, { desc = "[ ] Find existing buffers" })
-- Slightly advanced example of overriding default behavior and theme -- Slightly advanced example of overriding default behavior and theme
vim.keymap.set('n', '<leader>/', function() vim.keymap.set("n", "<leader>/", function()
-- You can pass additional configuration to Telescope to change the theme, layout, etc. -- You can pass additional configuration to Telescope to change the theme, layout, etc.
builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { builtin.current_buffer_fuzzy_find(require("telescope.themes").get_dropdown({
winblend = 10, winblend = 10,
previewer = false, previewer = false,
}) }))
end, { desc = '[/] Fuzzily search in current buffer' }) end, { desc = "[/] Fuzzily search in current buffer" })
-- It's also possible to pass additional configuration options. -- It's also possible to pass additional configuration options.
-- See `:help telescope.builtin.live_grep()` for information about particular keys -- See `:help telescope.builtin.live_grep()` for information about particular keys
vim.keymap.set('n', '<leader>s/', function() vim.keymap.set("n", "<leader>s/", function()
builtin.live_grep { builtin.live_grep({
grep_open_files = true, grep_open_files = true,
prompt_title = 'Live Grep in Open Files', prompt_title = "Live Grep in Open Files",
} })
end, { desc = '[S]earch [/] in Open Files' }) end, { desc = "[S]earch [/] in Open Files" })
-- Shortcut for searching your Neovim configuration files -- Shortcut for searching your Neovim configuration files
vim.keymap.set('n', '<leader>sn', function() vim.keymap.set("n", "<leader>sn", function()
builtin.find_files { cwd = vim.fn.stdpath 'config' } builtin.find_files({ cwd = vim.fn.stdpath("config") })
end, { desc = '[S]earch [N]eovim files' }) end, { desc = "[S]earch [N]eovim files" })
end, end,
} }

View File

@@ -33,10 +33,10 @@ vim.keymap.set("n", "n", "nzzzv", opts)
vim.keymap.set("n", "N", "Nzzzv", opts) vim.keymap.set("n", "N", "Nzzzv", opts)
-- Resize with arrows -- Resize with arrows
vim.keymap.set("n", "<Up>", ":resize -1<CR>", opts) vim.keymap.set("n", "<S-Up>", ":resize -1<CR>", opts)
vim.keymap.set("n", "<Down>", ":resize +1<CR>", opts) vim.keymap.set("n", "<S-Down>", ":resize +1<CR>", opts)
vim.keymap.set("n", "<Left>", ":vertical resize -1<CR>", opts) vim.keymap.set("n", "<S-Left>", ":vertical resize -1<CR>", opts)
vim.keymap.set("n", "<Right>", ":vertical resize +1<CR>", opts) vim.keymap.set("n", "<S-Right>", ":vertical resize +1<CR>", opts)
-- Buffers -- Buffers
vim.keymap.set("n", "<Tab>", ":bnext<CR>", opts) vim.keymap.set("n", "<Tab>", ":bnext<CR>", opts)

View File

@@ -14,13 +14,13 @@ bind-key -n M-S-Right swap-window -t +1 -d
#bind-key -n M-S-Right move-window -a -s +0 -t +1 #bind-key -n M-S-Right move-window -a -s +0 -t +1
# pane navigation # pane navigation
bind -n C-h select-pane -L bind -n M-h select-pane -L
bind -n C-j select-pane -D bind -n M-j select-pane -D
bind -n C-k select-pane -U bind -n M-k select-pane -U
bind -n C-l select-pane -R bind -n M-l select-pane -R
bind -n M-j swap-pane -D bind -n M-n swap-pane -D
bind -n M-k swap-pane -U bind -n M-p swap-pane -U
unbind x unbind x
bind x kill-pane -t +0 bind x kill-pane -t +0
@@ -32,6 +32,10 @@ bind b break-pane
unbind t unbind t
bind t command-prompt -p "move pane to window:" "join-pane -t '%%'" bind t command-prompt -p "move pane to window:" "join-pane -t '%%'"
bind -n M-F1 select-layout even-horizontal
bind -n M-F2 select-layout main-vertical
bind -n M-F3 select-layout tiled
# detach current session and close terminal # detach current session and close terminal
bind k run "tmux detach -P" bind k run "tmux detach -P"