From 25c4bdf3483e354eed65852bfcf5744b72e25d1f Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Wed, 9 Nov 2022 16:48:39 -0500 Subject: [PATCH] Add Telescope Config --- init.lua | 1 + lua/keymaps.lua | 17 ++++++++----- lua/plugins/plugins.lua | 23 +++++++++++++++--- lua/plugins/telescope.lua | 43 +++++++++++++++++++++++++++++++++ plugin/packer_compiled.lua | 49 ++++++++++++++++++++++++++++---------- 5 files changed, 112 insertions(+), 21 deletions(-) create mode 100644 lua/plugins/telescope.lua diff --git a/init.lua b/init.lua index d9e07a9..91fb276 100755 --- a/init.lua +++ b/init.lua @@ -9,6 +9,7 @@ require('plugins/nvim-cmp') require('plugins/nvim-lspconfig') require('plugins/nvim-treesitter') require('plugins/alpha-nvim') +require('plugins/telescope') require('plugins/symbols-outline') require('plugins/mason-lspconfig') require('plugins/snippets') diff --git a/lua/keymaps.lua b/lua/keymaps.lua index 81b67e3..d743418 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -9,12 +9,8 @@ map('n', 's', ':w', default_opts) map('n', 'a', ':w|:luafile %', default_opts) map('n', 'aa', ':w|:luafile % |:PackerSync', default_opts) map('i', 's', ':w', default_opts) - --- Move around splits using Ctrl + {h,j,k,l} ---map('n', '', 'h', default_opts) ---map('n', '', 'j', default_opts) ---map('n', '', 'k', default_opts) ---map('n', '', 'l', default_opts) +-- Python Script that saves the file & moves Todos to my Todolist. +map('n', 'sd', ':w|:! python3 ~/Documents/Northpass/Scripts/TodoMD/todo.py %', default_opts) -- Neovim Tab Navgation via Vem-Tabline map('n', 't', ':tabnew', default_opts) @@ -41,3 +37,12 @@ map('n', '=', ':NvimTreeResize +1', default_opts) map('n', '-', ':NvimTreeResize -1', default_opts) map('n', '==', ':NvimTreeResize +10', default_opts) map('n', '--', ':NvimTreeResize -10', default_opts) + + +----------------------------------------------------------- +-- Telescope Keymaps +----------------------------------------------------------- +map('n', 'ff', ':Telescope find_files', default_opts) +map('n', 'fg', ':Telescope live_grep', default_opts) +map('n', 'fb', ':Telescope buffers', default_opts) +map('n', 'fe', ':Telescope file_browser', default_opts) diff --git a/lua/plugins/plugins.lua b/lua/plugins/plugins.lua index 06c9f89..835858b 100755 --- a/lua/plugins/plugins.lua +++ b/lua/plugins/plugins.lua @@ -42,7 +42,7 @@ return require'packer'.startup(function() -- Treesitter interface use { 'nvim-treesitter/nvim-treesitter', - --run = function() require('nvim-treesitter.install').update({ with_sync = true }) end, + run = function() require('nvim-treesitter.install').update({ with_sync = true }) end, } -- Null-LS @@ -150,7 +150,7 @@ return require'packer'.startup(function() use 'karb94/neoscroll.nvim' -- Allow Popups for Telescope etc - --use 'nvim-lua/popup.nvim' + use 'nvim-lua/popup.nvim' use 'nvim-lua/plenary.nvim' -- Todo & Comments for Organization @@ -162,6 +162,18 @@ return require'packer'.startup(function() } end } + use { + 'nvim-telescope/telescope.nvim', tag = '0.1.0', + requires = 'nvim-lua/plenary.nvim', + config = function() + require("telescope").setup({ + }) + end +} + + use { + "nvim-telescope/telescope-file-browser.nvim" +} ----------------------------------------------------------- -- Various Color Schemes, Dashboard, etc @@ -173,7 +185,12 @@ return require'packer'.startup(function() use 'lunarvim/colorschemes' use { 'rose-pine/neovim', as = 'rose-pine' } use 'folke/tokyonight.nvim' - + use { + "catppuccin/nvim", as = "catppuccin", + require("catppuccin").setup({ + flavour = "mocha" + }) +} use { 'feline-nvim/feline.nvim', requires = { 'kyazdani42/nvim-web-devicons' }, diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua new file mode 100644 index 0000000..813f96e --- /dev/null +++ b/lua/plugins/telescope.lua @@ -0,0 +1,43 @@ +local g = vim.g + +local fb_actions = require "telescope".extensions.file_browser.actions + +local telescope_installer = require('telescope').setup({ + defaults = { + -- Default configuration for telescope goes here: + previewer = true, + file_previewer = require'telescope.previewers'.vim_buffer_cat.new, + -- config_key = value, + mappings = { + i = { + -- map actions.which_key to (default: ) + -- actions.which_key shows the mappings for your picker, + -- e.g. git_{create, delete, ...}_branch for the git_branches picker + [""] = "which_key" + } + } + }, + pickers = { + find_files = { + theme = "dropdown", + } + }, + extensions = { + file_browser = { + theme = "ivy", + -- disables netrw and use telescope-file-browser in its place + hijack_netrw = true, + mappings = { + ["i"] = { + [""] = fb_actions.goto_home_dir + }, + ["n"] = { + [""] = fb_actions.create + + }, + }, + }, + }, +}) + +require("telescope").load_extension "file_browser" diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index 00f9437..970fd88 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -84,6 +84,11 @@ _G.packer_plugins = { path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/alpha-nvim", url = "https://github.com/goolord/alpha-nvim" }, + catppuccin = { + loaded = true, + path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/catppuccin", + url = "https://github.com/catppuccin/nvim" + }, ["cmp-buffer"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-buffer", @@ -252,6 +257,11 @@ _G.packer_plugins = { path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/plenary.nvim", url = "https://github.com/nvim-lua/plenary.nvim" }, + ["popup.nvim"] = { + loaded = true, + path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/popup.nvim", + url = "https://github.com/nvim-lua/popup.nvim" + }, ["prettier.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/prettier.nvim", @@ -267,6 +277,17 @@ _G.packer_plugins = { path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/symbols-outline.nvim", url = "https://github.com/simrat39/symbols-outline.nvim" }, + ["telescope-file-browser.nvim"] = { + loaded = true, + path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/telescope-file-browser.nvim", + url = "https://github.com/nvim-telescope/telescope-file-browser.nvim" + }, + ["telescope.nvim"] = { + config = { "\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14telescope\frequire\0" }, + loaded = true, + path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/telescope.nvim", + url = "https://github.com/nvim-telescope/telescope.nvim" + }, ["tmux.nvim"] = { config = { "\27LJ\2\n2\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\ttmux\frequire\0" }, loaded = true, @@ -308,6 +329,10 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) +-- Config for: mkdnflow.nvim +time([[Config for mkdnflow.nvim]], true) +try_loadstring("\27LJ\2\nš\2\0\0\6\0\23\0\0316\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\21\0005\3\5\0005\4\4\0005\5\3\0>\5\1\4=\4\6\0035\4\b\0005\5\a\0>\5\1\4=\4\t\0035\4\v\0005\5\n\0>\5\1\4=\4\f\0035\4\14\0005\5\r\0>\5\1\4=\4\15\0035\4\17\0005\5\16\0>\5\1\4=\4\18\0035\4\19\0=\4\20\3=\3\22\2B\0\2\1K\0\1\0\rmappings\1\0\0\19MkdnFollowLink\1\3\0\0\6n\14p\rMkdnSTab\1\3\0\0\0\f\1\2\0\0\6i\fMkdnTab\1\3\0\0\0\n\1\2\0\0\6i\14MkdnEnter\1\3\0\0\0\t\1\2\0\0\6n\20MkdnNewListItem\1\3\0\0\0\t\1\2\0\0\6i\19MkdnToggleToDo\1\0\1\22MkdnTableNextCell\1\1\3\0\0\0\14\1\3\0\0\6i\6n\nsetup\rmkdnflow\frequire\0", "config", "mkdnflow.nvim") +time([[Config for mkdnflow.nvim]], false) -- Config for: trouble.nvim time([[Config for trouble.nvim]], true) try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\ftrouble\frequire\0", "config", "trouble.nvim") @@ -316,22 +341,22 @@ time([[Config for trouble.nvim]], false) time([[Config for todo-comments.nvim]], true) try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18todo-comments\frequire\0", "config", "todo-comments.nvim") time([[Config for todo-comments.nvim]], false) --- Config for: nvim-autopairs -time([[Config for nvim-autopairs]], true) -try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") -time([[Config for nvim-autopairs]], false) --- Config for: mkdnflow.nvim -time([[Config for mkdnflow.nvim]], true) -try_loadstring("\27LJ\2\nš\2\0\0\6\0\23\0\0316\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\21\0005\3\5\0005\4\4\0005\5\3\0>\5\1\4=\4\6\0035\4\b\0005\5\a\0>\5\1\4=\4\t\0035\4\v\0005\5\n\0>\5\1\4=\4\f\0035\4\14\0005\5\r\0>\5\1\4=\4\15\0035\4\17\0005\5\16\0>\5\1\4=\4\18\0035\4\19\0=\4\20\3=\3\22\2B\0\2\1K\0\1\0\rmappings\1\0\0\19MkdnFollowLink\1\3\0\0\6n\14p\rMkdnSTab\1\3\0\0\0\f\1\2\0\0\6i\fMkdnTab\1\3\0\0\0\n\1\2\0\0\6i\14MkdnEnter\1\3\0\0\0\t\1\2\0\0\6n\20MkdnNewListItem\1\3\0\0\0\t\1\2\0\0\6i\19MkdnToggleToDo\1\0\1\22MkdnTableNextCell\1\1\3\0\0\0\14\1\3\0\0\6i\6n\nsetup\rmkdnflow\frequire\0", "config", "mkdnflow.nvim") -time([[Config for mkdnflow.nvim]], false) --- Config for: tmux.nvim -time([[Config for tmux.nvim]], true) -try_loadstring("\27LJ\2\n2\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\ttmux\frequire\0", "config", "tmux.nvim") -time([[Config for tmux.nvim]], false) -- Config for: mind.nvim time([[Config for mind.nvim]], true) try_loadstring("\27LJ\2\n2\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\tmind\frequire\0", "config", "mind.nvim") time([[Config for mind.nvim]], false) +-- Config for: telescope.nvim +time([[Config for telescope.nvim]], true) +try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14telescope\frequire\0", "config", "telescope.nvim") +time([[Config for telescope.nvim]], false) +-- Config for: tmux.nvim +time([[Config for tmux.nvim]], true) +try_loadstring("\27LJ\2\n2\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\ttmux\frequire\0", "config", "tmux.nvim") +time([[Config for tmux.nvim]], false) +-- Config for: nvim-autopairs +time([[Config for nvim-autopairs]], true) +try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") +time([[Config for nvim-autopairs]], false) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then