From 7e56b36a467d44507a61c4fad0968c97fa34bb11 Mon Sep 17 00:00:00 2001 From: Cody Hiar Date: Tue, 7 Sep 2021 19:22:58 -0600 Subject: add ctags and telescope-fzf-native --- init.lua | 30 ++++++++++++++++++++++++++---- plugin/packer_compiled.lua | 30 +++++++++++++++++++----------- 2 files changed, 45 insertions(+), 15 deletions(-) diff --git a/init.lua b/init.lua index 374aecc..b8992af 100644 --- a/init.lua +++ b/init.lua @@ -73,11 +73,18 @@ end -- Along with the highlight definition for ColorColumn above, these options -- will set colored marks at certain line lengths -cmd([[au BufEnter *.py let w:m1=matchadd('ColorColumn', '\%81v', 100)]]) -cmd([[au BufEnter *.py let w:m2=matchadd('Error', '\%121v', 100)]]) -cmd([[au BufLeave *.py call clearmatches()"]]) +cmd [[ +au BufEnter *.py let w:m1=matchadd('ColorColumn', '\%81v', 100) +au BufEnter *.py let w:m2=matchadd('Error', '\%121v', 100) +au BufLeave *.py call clearmatches() +]] +-- Custom commands +cmd [[ +command! MakeTagsPython !ctags --exclude=venv --languages=python --python-kinds=-i -R . +]] + options = { noremap = true } @@ -93,6 +100,7 @@ map('n', 'fj', 'Telescope jumplist', options) map('n', 'f/', 'Telescope live_grep', options) map('n', 'fa', 'Telescope grep_string', options) map('n', 'fg', "lua require('telescope.builtin').git_status()", options) +map('n', 'ft', "lua require('telescope.builtin').tags({layout_strategy='center', only_sort_tags=true, show_line=true})", options) map('n', 'du', 'diffupdate', options) map('n', 'dd', 'diffget', options) @@ -286,10 +294,23 @@ return require('packer').startup(function() use 'tpope/vim-repeat' use { 'nvim-telescope/telescope.nvim', - requires = { {'nvim-lua/plenary.nvim'} }, + requires = { + {'nvim-lua/plenary.nvim'}, + {'glepnir/lspsaga.nvim'}, + {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }, + }, config = function() actions = require("telescope.actions") require("telescope").setup{ + extensions = { + fzf = { + fuzzy = false, -- false will only do exact matching + override_generic_sorter = true, -- override the generic sorter + override_file_sorter = true, -- override the file sorter + case_mode = "smart_case", -- or "ignore_case" or "respect_case" + -- the default case_mode is "smart_case" + } + }, defaults = { mappings = { i = { @@ -339,6 +360,7 @@ return require('packer').startup(function() buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker } } + require('telescope').load_extension('fzf') end, } use 'FooSoft/vim-argwrap' diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index f058d6c..b6c4786 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -83,10 +83,14 @@ _G.packer_plugins = { path = "/home/thorny/.local/share/nvim/site/pack/packer/start/hop" }, ["indent-blankline.nvim"] = { - config = { "\27LJ\2\nº\1\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\1K\0\1\0\24char_highlight_list\1\3\0\0\27IndentBlanklineIndent1\27IndentBlanklineIndent2\1\0\2\tchar\6 #show_trailing_blankline_indent\1\nsetup\21indent_blankline\frequire\0" }, + config = { "\27LJ\2\nº\1\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\1K\0\1\0\24char_highlight_list\1\3\0\0\27IndentBlanklineIndent1\27IndentBlanklineIndent2\1\0\2#show_trailing_blankline_indent\1\tchar\6 \nsetup\21indent_blankline\frequire\0" }, loaded = true, path = "/home/thorny/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim" }, + ["lspsaga.nvim"] = { + loaded = true, + path = "/home/thorny/.local/share/nvim/site/pack/packer/start/lspsaga.nvim" + }, ["nord-vim"] = { loaded = true, path = "/home/thorny/.local/share/nvim/site/pack/packer/start/nord-vim" @@ -125,8 +129,12 @@ _G.packer_plugins = { loaded = true, path = "/home/thorny/.local/share/nvim/site/pack/packer/start/supertab" }, + ["telescope-fzf-native.nvim"] = { + loaded = true, + path = "/home/thorny/.local/share/nvim/site/pack/packer/start/telescope-fzf-native.nvim" + }, ["telescope.nvim"] = { - config = { "\27LJ\2\nÈ\b\0\0\a\0+\0G6\0\0\0'\2\1\0B\0\2\0027\0\2\0006\0\0\0'\2\3\0B\0\2\0029\0\4\0005\2)\0005\3\n\0005\4\b\0005\5\6\0006\6\2\0009\6\5\6=\6\a\5=\5\t\4=\4\v\0035\4\f\0=\4\r\0035\4\15\0005\5\14\0=\5\16\0045\5\17\0=\5\18\4=\4\19\0036\4\0\0'\6\20\0B\4\2\0029\4\21\4=\4\22\0034\4\0\0=\4\23\0036\4\0\0'\6\20\0B\4\2\0029\4\24\4=\4\25\0034\4\0\0=\4\26\0035\4\27\0=\4\28\0034\4\0\0=\4\29\0035\4\30\0=\4\31\0036\4\0\0'\6 \0B\4\2\0029\4!\0049\4\"\4=\4#\0036\4\0\0'\6 \0B\4\2\0029\4$\0049\4\"\4=\4%\0036\4\0\0'\6 \0B\4\2\0029\4&\0049\4\"\4=\4'\0036\4\0\0'\6 \0B\4\2\0029\4(\4=\4(\3=\3*\2B\0\2\1K\0\1\0\rdefaults\1\0\0\27buffer_previewer_maker\21qflist_previewer\22vim_buffer_qflist\19grep_previewer\23vim_buffer_vimgrep\19file_previewer\bnew\19vim_buffer_cat\25telescope.previewers\fset_env\1\0\1\14COLORTERM\14truecolor\17path_display\16borderchars\1\t\0\0\b─\b│\b─\b│\bâ•­\bâ•®\b╯\bâ•°\vborder\19generic_sorter\29get_generic_fuzzy_sorter\25file_ignore_patterns\16file_sorter\19get_fuzzy_file\22telescope.sorters\18layout_config\rvertical\1\0\1\vmirror\1\15horizontal\1\0\0\1\0\1\vmirror\1\22vimgrep_arguments\1\b\0\0\arg\18--color=never\17--no-heading\20--with-filename\18--line-number\r--column\17--smart-case\rmappings\1\0\n\19color_devicons\2\rwinblend\3\0\20layout_strategy\15horizontal\21sorting_strategy\15descending\23selection_strategy\nreset\17initial_mode\vinsert\17entry_prefix\a \20selection_caret\a> \18prompt_prefix\a> \ruse_less\2\6i\1\0\0\n\1\0\1\n\1\nclose\nsetup\14telescope\factions\22telescope.actions\frequire\0" }, + config = { "\27LJ\2\ná\t\0\0\a\0000\0Q6\0\0\0'\2\1\0B\0\2\0027\0\2\0006\0\0\0'\2\3\0B\0\2\0029\0\4\0005\2\b\0005\3\6\0005\4\5\0=\4\a\3=\3\t\0025\3\15\0005\4\r\0005\5\v\0006\6\2\0009\6\n\6=\6\f\5=\5\14\4=\4\16\0035\4\17\0=\4\18\0035\4\20\0005\5\19\0=\5\21\0045\5\22\0=\5\23\4=\4\24\0036\4\0\0'\6\25\0B\4\2\0029\4\26\4=\4\27\0034\4\0\0=\4\28\0036\4\0\0'\6\25\0B\4\2\0029\4\29\4=\4\30\0034\4\0\0=\4\31\0035\4 \0=\4!\0034\4\0\0=\4\"\0035\4#\0=\4$\0036\4\0\0'\6%\0B\4\2\0029\4&\0049\4'\4=\4(\0036\4\0\0'\6%\0B\4\2\0029\4)\0049\4'\4=\4*\0036\4\0\0'\6%\0B\4\2\0029\4+\0049\4'\4=\4,\0036\4\0\0'\6%\0B\4\2\0029\4-\4=\4-\3=\3.\2B\0\2\0016\0\0\0'\2\3\0B\0\2\0029\0/\0'\2\a\0B\0\2\1K\0\1\0\19load_extension\rdefaults\27buffer_previewer_maker\21qflist_previewer\22vim_buffer_qflist\19grep_previewer\23vim_buffer_vimgrep\19file_previewer\bnew\19vim_buffer_cat\25telescope.previewers\fset_env\1\0\1\14COLORTERM\14truecolor\17path_display\16borderchars\1\t\0\0\b─\b│\b─\b│\bâ•­\bâ•®\b╯\bâ•°\vborder\19generic_sorter\29get_generic_fuzzy_sorter\25file_ignore_patterns\16file_sorter\19get_fuzzy_file\22telescope.sorters\18layout_config\rvertical\1\0\1\vmirror\1\15horizontal\1\0\0\1\0\1\vmirror\1\22vimgrep_arguments\1\b\0\0\arg\18--color=never\17--no-heading\20--with-filename\18--line-number\r--column\17--smart-case\rmappings\1\0\n\18prompt_prefix\a> \ruse_less\2\19color_devicons\2\rwinblend\3\0\20layout_strategy\15horizontal\21sorting_strategy\15descending\23selection_strategy\nreset\17initial_mode\vinsert\17entry_prefix\a \20selection_caret\a> \6i\1\0\0\n\1\0\1\n\1\nclose\15extensions\1\0\0\bfzf\1\0\0\1\0\4\nfuzzy\1\14case_mode\17respect_case\25override_file_sorter\2\28override_generic_sorter\2\nsetup\14telescope\factions\22telescope.actions\frequire\0" }, loaded = true, path = "/home/thorny/.local/share/nvim/site/pack/packer/start/telescope.nvim" }, @@ -153,26 +161,26 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: hop -time([[Config for hop]], true) -try_loadstring("\27LJ\2\nU\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\tkeys\28etovxqpdygfblzhckisuran\nsetup\bhop\frequire\0", "config", "hop") -time([[Config for hop]], false) -- Config for: nvim-lspconfig time([[Config for nvim-lspconfig]], true) try_loadstring("\27LJ\2\nA\2\0\4\1\3\0\a6\0\0\0009\0\1\0009\0\2\0-\2\0\0G\3\0\0A\0\1\1K\0\1\0\1À\24nvim_buf_set_keymap\bapi\bvimA\2\0\4\1\3\0\a6\0\0\0009\0\1\0009\0\2\0-\2\0\0G\3\0\0A\0\1\1K\0\1\0\1À\24nvim_buf_set_option\bapi\bvimÔ\n\1\2\v\0(\0o3\2\0\0003\3\1\0\18\4\3\0'\6\2\0'\a\3\0B\4\3\0015\4\4\0\18\5\2\0'\a\5\0'\b\6\0'\t\a\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\b\0'\t\t\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\n\0'\t\v\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\f\0'\t\r\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\14\0'\t\15\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\16\0'\t\17\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\18\0'\t\19\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\20\0'\t\21\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\22\0'\t\23\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\24\0'\t\25\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\26\0'\t\27\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\28\0'\t\29\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\30\0'\t\31\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b \0'\t!\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\"\0'\t#\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b$\0'\t%\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b&\0'\t'\0\18\n\4\0B\5\5\0012\0\0€K\0\1\0*lua vim.lsp.buf.formatting()\rf2lua vim.lsp.diagnostic.set_loclist()\rq0lua vim.lsp.diagnostic.goto_next()\a]d0lua vim.lsp.diagnostic.goto_prev()\a[d<lua vim.lsp.diagnostic.show_line_diagnostics()\re*lua vim.lsp.buf.references()\agr+lua vim.lsp.buf.code_action()\14ca&lua vim.lsp.buf.rename()\14rn/lua vim.lsp.buf.type_definition()\rDJlua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))\14wl7lua vim.lsp.buf.remove_workspace_folder()\14wr4lua vim.lsp.buf.add_workspace_folder()\14wa.lua vim.lsp.buf.signature_help()\n.lua vim.lsp.buf.implementation()\agi%lua vim.lsp.buf.hover()\6K*lua vim.lsp.buf.definition()\agd+lua vim.lsp.buf.declaration()\agD\6n\1\0\2\vsilent\2\fnoremap\2\27v:lua.vim.lsp.omnifunc\romnifunc\0\0¿\1\1\0\v\0\v\0\0216\0\0\0'\2\1\0B\0\2\0027\0\2\0003\0\3\0005\1\4\0006\2\5\0\18\4\1\0B\2\2\4X\5\b€6\a\2\0008\a\6\a9\a\6\a5\t\a\0=\0\b\t5\n\t\0=\n\n\tB\a\2\1E\5\3\3R\5öK\0\1\0\nflags\1\0\1\26debounce_text_changes\3–\1\14on_attach\1\0\0\nsetup\vipairs\1\2\0\0\fpyright\0\rnvim_lsp\14lspconfig\frequire\0", "config", "nvim-lspconfig") time([[Config for nvim-lspconfig]], false) --- Config for: telescope.nvim -time([[Config for telescope.nvim]], true) -try_loadstring("\27LJ\2\nÈ\b\0\0\a\0+\0G6\0\0\0'\2\1\0B\0\2\0027\0\2\0006\0\0\0'\2\3\0B\0\2\0029\0\4\0005\2)\0005\3\n\0005\4\b\0005\5\6\0006\6\2\0009\6\5\6=\6\a\5=\5\t\4=\4\v\0035\4\f\0=\4\r\0035\4\15\0005\5\14\0=\5\16\0045\5\17\0=\5\18\4=\4\19\0036\4\0\0'\6\20\0B\4\2\0029\4\21\4=\4\22\0034\4\0\0=\4\23\0036\4\0\0'\6\20\0B\4\2\0029\4\24\4=\4\25\0034\4\0\0=\4\26\0035\4\27\0=\4\28\0034\4\0\0=\4\29\0035\4\30\0=\4\31\0036\4\0\0'\6 \0B\4\2\0029\4!\0049\4\"\4=\4#\0036\4\0\0'\6 \0B\4\2\0029\4$\0049\4\"\4=\4%\0036\4\0\0'\6 \0B\4\2\0029\4&\0049\4\"\4=\4'\0036\4\0\0'\6 \0B\4\2\0029\4(\4=\4(\3=\3*\2B\0\2\1K\0\1\0\rdefaults\1\0\0\27buffer_previewer_maker\21qflist_previewer\22vim_buffer_qflist\19grep_previewer\23vim_buffer_vimgrep\19file_previewer\bnew\19vim_buffer_cat\25telescope.previewers\fset_env\1\0\1\14COLORTERM\14truecolor\17path_display\16borderchars\1\t\0\0\b─\b│\b─\b│\bâ•­\bâ•®\b╯\bâ•°\vborder\19generic_sorter\29get_generic_fuzzy_sorter\25file_ignore_patterns\16file_sorter\19get_fuzzy_file\22telescope.sorters\18layout_config\rvertical\1\0\1\vmirror\1\15horizontal\1\0\0\1\0\1\vmirror\1\22vimgrep_arguments\1\b\0\0\arg\18--color=never\17--no-heading\20--with-filename\18--line-number\r--column\17--smart-case\rmappings\1\0\n\19color_devicons\2\rwinblend\3\0\20layout_strategy\15horizontal\21sorting_strategy\15descending\23selection_strategy\nreset\17initial_mode\vinsert\17entry_prefix\a \20selection_caret\a> \18prompt_prefix\a> \ruse_less\2\6i\1\0\0\n\1\0\1\n\1\nclose\nsetup\14telescope\factions\22telescope.actions\frequire\0", "config", "telescope.nvim") -time([[Config for telescope.nvim]], false) -- Config for: indent-blankline.nvim time([[Config for indent-blankline.nvim]], true) -try_loadstring("\27LJ\2\nº\1\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\1K\0\1\0\24char_highlight_list\1\3\0\0\27IndentBlanklineIndent1\27IndentBlanklineIndent2\1\0\2\tchar\6 #show_trailing_blankline_indent\1\nsetup\21indent_blankline\frequire\0", "config", "indent-blankline.nvim") +try_loadstring("\27LJ\2\nº\1\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\1K\0\1\0\24char_highlight_list\1\3\0\0\27IndentBlanklineIndent1\27IndentBlanklineIndent2\1\0\2#show_trailing_blankline_indent\1\tchar\6 \nsetup\21indent_blankline\frequire\0", "config", "indent-blankline.nvim") time([[Config for indent-blankline.nvim]], false) -- Config for: nvim-treesitter time([[Config for nvim-treesitter]], true) try_loadstring("\27LJ\2\nÄ\2\0\0\5\0\16\0\0196\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\0025\3\6\0=\3\a\0025\3\b\0=\3\t\0025\3\n\0005\4\v\0=\4\f\0035\4\r\0=\4\14\3=\3\15\2B\0\2\1K\0\1\0\frainbow\15termcolors\1\5\0\0\rdarkblue\fmagenta\vyellow\rdarkcyan\vcolors\1\5\0\0\f#000000\f#000000\f#000000\f#000000\1\0\1\venable\2\vindent\1\0\1\venable\2\14highlight\1\0\1\venable\2\21ensure_installed\1\0\0\1\a\0\0\vpython\blua\bnix\tjson\tbash\thtml\nsetup\28nvim-treesitter.configs\frequire\0", "config", "nvim-treesitter") time([[Config for nvim-treesitter]], false) +-- Config for: hop +time([[Config for hop]], true) +try_loadstring("\27LJ\2\nU\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\tkeys\28etovxqpdygfblzhckisuran\nsetup\bhop\frequire\0", "config", "hop") +time([[Config for hop]], false) +-- Config for: telescope.nvim +time([[Config for telescope.nvim]], true) +try_loadstring("\27LJ\2\ná\t\0\0\a\0000\0Q6\0\0\0'\2\1\0B\0\2\0027\0\2\0006\0\0\0'\2\3\0B\0\2\0029\0\4\0005\2\b\0005\3\6\0005\4\5\0=\4\a\3=\3\t\0025\3\15\0005\4\r\0005\5\v\0006\6\2\0009\6\n\6=\6\f\5=\5\14\4=\4\16\0035\4\17\0=\4\18\0035\4\20\0005\5\19\0=\5\21\0045\5\22\0=\5\23\4=\4\24\0036\4\0\0'\6\25\0B\4\2\0029\4\26\4=\4\27\0034\4\0\0=\4\28\0036\4\0\0'\6\25\0B\4\2\0029\4\29\4=\4\30\0034\4\0\0=\4\31\0035\4 \0=\4!\0034\4\0\0=\4\"\0035\4#\0=\4$\0036\4\0\0'\6%\0B\4\2\0029\4&\0049\4'\4=\4(\0036\4\0\0'\6%\0B\4\2\0029\4)\0049\4'\4=\4*\0036\4\0\0'\6%\0B\4\2\0029\4+\0049\4'\4=\4,\0036\4\0\0'\6%\0B\4\2\0029\4-\4=\4-\3=\3.\2B\0\2\0016\0\0\0'\2\3\0B\0\2\0029\0/\0'\2\a\0B\0\2\1K\0\1\0\19load_extension\rdefaults\27buffer_previewer_maker\21qflist_previewer\22vim_buffer_qflist\19grep_previewer\23vim_buffer_vimgrep\19file_previewer\bnew\19vim_buffer_cat\25telescope.previewers\fset_env\1\0\1\14COLORTERM\14truecolor\17path_display\16borderchars\1\t\0\0\b─\b│\b─\b│\bâ•­\bâ•®\b╯\bâ•°\vborder\19generic_sorter\29get_generic_fuzzy_sorter\25file_ignore_patterns\16file_sorter\19get_fuzzy_file\22telescope.sorters\18layout_config\rvertical\1\0\1\vmirror\1\15horizontal\1\0\0\1\0\1\vmirror\1\22vimgrep_arguments\1\b\0\0\arg\18--color=never\17--no-heading\20--with-filename\18--line-number\r--column\17--smart-case\rmappings\1\0\n\18prompt_prefix\a> \ruse_less\2\19color_devicons\2\rwinblend\3\0\20layout_strategy\15horizontal\21sorting_strategy\15descending\23selection_strategy\nreset\17initial_mode\vinsert\17entry_prefix\a \20selection_caret\a> \6i\1\0\0\n\1\0\1\n\1\nclose\15extensions\1\0\0\bfzf\1\0\0\1\0\4\nfuzzy\1\14case_mode\17respect_case\25override_file_sorter\2\28override_generic_sorter\2\nsetup\14telescope\factions\22telescope.actions\frequire\0", "config", "telescope.nvim") +time([[Config for telescope.nvim]], false) if should_profile then save_profiles() end end) -- cgit v1.2.3