diff options
| author | Hsieh Chin Fan <pham@topo.tw> | 2024-07-04 14:00:41 +0800 |
|---|---|---|
| committer | Hsieh Chin Fan <pham@topo.tw> | 2024-07-04 14:00:41 +0800 |
| commit | 7031bb7e1ac3c26c3e2837b10805c34d399de1fd (patch) | |
| tree | 7185f80c19f3636e041697ed5138aa49f86c932d /vim/lua | |
| parent | a31d8dbea212442e2ed132516e42b72258b2ccd7 (diff) | |
Update
Diffstat (limited to 'vim/lua')
| -rw-r--r-- | vim/lua/configs/telescope.lua | 11 | ||||
| -rw-r--r-- | vim/lua/mappings.lua | 8 | ||||
| -rw-r--r-- | vim/lua/plugins/init.lua | 47 |
3 files changed, 40 insertions, 26 deletions
diff --git a/vim/lua/configs/telescope.lua b/vim/lua/configs/telescope.lua index 6efa391..08c4d10 100644 --- a/vim/lua/configs/telescope.lua +++ b/vim/lua/configs/telescope.lua | |||
| @@ -20,6 +20,9 @@ return { | |||
| 20 | -- other layout configuration here | 20 | -- other layout configuration here |
| 21 | preview_cutoff = 0, | 21 | preview_cutoff = 0, |
| 22 | }, | 22 | }, |
| 23 | file_ignore_patterns = { | ||
| 24 | "node_modules" | ||
| 25 | }, | ||
| 23 | }, | 26 | }, |
| 24 | pickers = { | 27 | pickers = { |
| 25 | buffers = { | 28 | buffers = { |
| @@ -40,6 +43,13 @@ return { | |||
| 40 | }, | 43 | }, |
| 41 | extensions_list = {}, | 44 | extensions_list = {}, |
| 42 | extensions = { | 45 | extensions = { |
| 46 | fzf = { | ||
| 47 | fuzzy = true, -- false will only do exact matching | ||
| 48 | override_generic_sorter = true, -- override the generic sorter | ||
| 49 | override_file_sorter = true, -- override the file sorter | ||
| 50 | case_mode = "smart_case", -- or "ignore_case" or "respect_case" | ||
| 51 | -- the default case_mode is "smart_case" | ||
| 52 | }, | ||
| 43 | aerial = { | 53 | aerial = { |
| 44 | -- Display symbols as <root>.<parent>.<symbol> | 54 | -- Display symbols as <root>.<parent>.<symbol> |
| 45 | show_nesting = { | 55 | show_nesting = { |
| @@ -50,6 +60,7 @@ return { | |||
| 50 | }, | 60 | }, |
| 51 | }, | 61 | }, |
| 52 | on_attach = function() | 62 | on_attach = function() |
| 63 | require("telescope").load_extension("fzf") | ||
| 53 | require("telescope").load_extension("aerial") | 64 | require("telescope").load_extension("aerial") |
| 54 | end | 65 | end |
| 55 | } | 66 | } |
diff --git a/vim/lua/mappings.lua b/vim/lua/mappings.lua index ad4824b..e9a20f5 100644 --- a/vim/lua/mappings.lua +++ b/vim/lua/mappings.lua | |||
| @@ -181,8 +181,6 @@ vim.keymap.set('n', '<C-.>', ':HopChar1<CR>') | |||
| 181 | -- [ Configure vim-surround ] | 181 | -- [ Configure vim-surround ] |
| 182 | vim.cmd('vmap s S') | 182 | vim.cmd('vmap s S') |
| 183 | 183 | ||
| 184 | -- [ Aerial ] | 184 | -- [ Aerial ]"" "<cmd>AerialNext<CR>", {}) |
| 185 | vim.keymap.set("n", "{", "<cmd>AerialPrev<CR>", {}) | 185 | vim.keymap.set("n", "gL", "<cmd>Telescope aerial<CR>") |
| 186 | vim.keymap.set("n", "}", "<cmd>AerialNext<CR>", {}) | 186 | vim.keymap.set("n", "gl", function() require("aerial").toggle({ direction = "left" }) end) |
| 187 | vim.keymap.set("n", "<C-W>a", "<cmd>Telescope aerial<CR>") | ||
| 188 | vim.keymap.set("n", "<C-W><C-A>", function() require("aerial").toggle({ direction = "left" }) end) | ||
diff --git a/vim/lua/plugins/init.lua b/vim/lua/plugins/init.lua index a0a972c..8c7a049 100644 --- a/vim/lua/plugins/init.lua +++ b/vim/lua/plugins/init.lua | |||
| @@ -53,27 +53,27 @@ return { | |||
| 53 | 'lewis6991/gitsigns.nvim', | 53 | 'lewis6991/gitsigns.nvim', |
| 54 | opts = function() | 54 | opts = function() |
| 55 | return { | 55 | return { |
| 56 | -- See `:help gitsigns.txt` | 56 | -- See `:help gitsigns.txt` |
| 57 | signs = { | 57 | signs = { |
| 58 | add = { text = '+' }, | 58 | add = { text = '+' }, |
| 59 | change = { text = '~' }, | 59 | change = { text = '~' }, |
| 60 | delete = { text = '_' }, | 60 | delete = { text = '_' }, |
| 61 | topdelete = { text = '‾' }, | 61 | topdelete = { text = '‾' }, |
| 62 | changedelete = { text = '~' }, | 62 | changedelete = { text = '~' }, |
| 63 | }, | 63 | }, |
| 64 | on_attach = function(bufnr) | 64 | on_attach = function(bufnr) |
| 65 | local gs = require('gitsigns') | 65 | local gs = require('gitsigns') |
| 66 | vim.keymap.set('n', '<leader>gp', gs.prev_hunk, { buffer = bufnr, desc = '[G]o to [P]revious Hunk' }) | 66 | vim.keymap.set('n', '<leader>gp', gs.prev_hunk, { buffer = bufnr, desc = '[G]o to [P]revious Hunk' }) |
| 67 | vim.keymap.set('n', '<leader>gn', gs.next_hunk, { buffer = bufnr, desc = '[G]o to [N]ext Hunk' }) | 67 | vim.keymap.set('n', '<leader>gn', gs.next_hunk, { buffer = bufnr, desc = '[G]o to [N]ext Hunk' }) |
| 68 | vim.keymap.set('n', '<leader>hp', gs.preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' }) | 68 | vim.keymap.set('n', '<leader>hp', gs.preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' }) |
| 69 | vim.keymap.set('n', '<leader>hd', gs.diffthis, { buffer = bufnr, desc = '[h]unk [d]iff' }) | 69 | vim.keymap.set('n', '<leader>hd', gs.diffthis, { buffer = bufnr, desc = '[h]unk [d]iff' }) |
| 70 | vim.keymap.set('n', '<leader>hD', function() gs.diffthis('~') end, | 70 | vim.keymap.set('n', '<leader>hD', function() gs.diffthis('~') end, |
| 71 | { buffer = bufnr, desc = '[h]unk [d]iff for ~' }) | 71 | { buffer = bufnr, desc = '[h]unk [d]iff for ~' }) |
| 72 | -- vim.keymap.set("n", "<leader>gb", gs.blame_line{full=true}, { desc = "Git Blame" }) | 72 | -- vim.keymap.set("n", "<leader>gb", gs.blame_line{full=true}, { desc = "Git Blame" }) |
| 73 | vim.keymap.set("n", "<leader>gb", gs.toggle_current_line_blame, { desc = "Blame Line" }) | 73 | vim.keymap.set("n", "<leader>gb", gs.toggle_current_line_blame, { desc = "Blame Line" }) |
| 74 | vim.keymap.set('v', 'hr', gs.reset_hunk, { buffer = bufnr, desc = '[h]unk [r]eset' }) | 74 | vim.keymap.set('v', 'hr', gs.reset_hunk, { buffer = bufnr, desc = '[h]unk [r]eset' }) |
| 75 | end | 75 | end |
| 76 | } | 76 | } |
| 77 | end, | 77 | end, |
| 78 | }, | 78 | }, |
| 79 | 79 | ||
| @@ -174,6 +174,11 @@ return { | |||
| 174 | }, | 174 | }, |
| 175 | 175 | ||
| 176 | { | 176 | { |
| 177 | 'nvim-telescope/telescope-fzf-native.nvim', | ||
| 178 | build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release' | ||
| 179 | }, | ||
| 180 | |||
| 181 | { | ||
| 177 | "nvim-treesitter/nvim-treesitter", | 182 | "nvim-treesitter/nvim-treesitter", |
| 178 | dependencies = { | 183 | dependencies = { |
| 179 | 'nvim-treesitter/nvim-treesitter-textobjects', | 184 | 'nvim-treesitter/nvim-treesitter-textobjects', |