From 36602c91823b4f06162020a6a62a5e004a8a9972 Mon Sep 17 00:00:00 2001 From: Mikkel Svartveit Date: Tue, 25 Apr 2023 16:28:41 +0200 Subject: [PATCH] Improve Telescope --- fish/config.fish | 1 + nvim/lazy-lock.json | 20 ++++++++++---------- nvim/lua/plugins.lua | 11 ++++++++++- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/fish/config.fish b/fish/config.fish index 043471b..5682231 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -1,6 +1,7 @@ alias fixmouse="killall LogiMgrDaemon" alias icloud="cd ~/Library/Mobile\ Documents/com~apple~CloudDocs" alias pi="ssh pi@185.138.33.80 -p 1733" +alias ubuntu="ssh mikkelsvartveit@34.138.227.57" alias zshrc="nvim ~/.zshrc" alias fishconfig="cd ~/.config/fish && nvim config.fish && cd -" alias nvimconfig="cd ~/.config/nvim && nvim && cd -" diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index f129bf4..c4941c1 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,21 +1,21 @@ { - "Comment.nvim": { "branch": "master", "commit": "8d3aa5c22c2d45e788c7a5fe13ad77368b783c20" }, - "auto-session": { "branch": "main", "commit": "1d3dd70a2d48e0f3441128eb4fb0b437a0bf2cc4" }, - "catppuccin": { "branch": "main", "commit": "128af65c3a23c94b324dc8d7f02a34feee8722d4" }, + "Comment.nvim": { "branch": "master", "commit": "a89339ffbee677ab0521a483b6dac7e2e67c907e" }, + "auto-session": { "branch": "main", "commit": "f391aba10ee61927a1cceb9ea3a9dde501e87e9e" }, + "catppuccin": { "branch": "main", "commit": "dd176757cc745f71bd54c472a9f58d5f8a54661d" }, "coc.nvim": { "branch": "release", "commit": "bbaa1d5d1ff3cbd9d26bb37cfda1a990494c4043" }, - "code_runner.nvim": { "branch": "main", "commit": "a010649236fe245eaab2641a13228cd601499715" }, - "copilot.vim": { "branch": "release", "commit": "9e869d29e62e36b7eb6fb238a4ca6a6237e7d78b" }, + "code_runner.nvim": { "branch": "main", "commit": "825a0d5a450e269b450016b2a390026c68af3588" }, + "copilot.vim": { "branch": "release", "commit": "b6e5624351ba735e25eb8864d7d22819aad00606" }, "git-conflict.nvim": { "branch": "main", "commit": "80bc8931d4ed8c8c4d289a08e1838fcf4741408d" }, - "gitsigns.nvim": { "branch": "main", "commit": "b1f9cf7c5c5639c006c937fc1819e09f358210fc" }, - "lazy.nvim": { "branch": "main", "commit": "690f9e88e2a7dc92bcb0cca85f778a3e99fe1f7e" }, - "leap.nvim": { "branch": "main", "commit": "f74473d23ebf60957e0db3ff8172349a82e5a442" }, + "gitsigns.nvim": { "branch": "main", "commit": "7dfe4be94b4f84a9931098f0f0f618d055e50bd5" }, + "lazy.nvim": { "branch": "main", "commit": "903f0fe542fc35b74f3c09494f9c175346dfa76d" }, + "leap.nvim": { "branch": "main", "commit": "0eb3611593e135150e2f7880ec67568ccb51c17a" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, "nvim-scrollbar": { "branch": "main", "commit": "f85b29805cf917f9b1d5ff0c9a52c5b1bdca5943" }, "nvim-toggleterm.lua": { "branch": "main", "commit": "a5638b2206c3930a16a24e5c184dddd572f8cd34" }, "nvim-tree.lua": { "branch": "master", "commit": "e14989c0eaa6f9c299d48f7e45ce1ed04b21180f" }, - "nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" }, - "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, + "nvim-web-devicons": { "branch": "master", "commit": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e" }, + "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "vim-polyglot": { "branch": "master", "commit": "bc8a81d3592dab86334f27d1d43c080ebf680d42" }, diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 64b71e4..0e0ef41 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -92,6 +92,10 @@ require("lazy").setup({ config = function() vim.api.nvim_create_user_command("CPE", "Copilot enable", {}) vim.api.nvim_create_user_command("CPD", "Copilot disable", {}) + + vim.g.copilot_filetypes = { + TelescopePrompt = false, + } end }, @@ -140,7 +144,7 @@ require("lazy").setup({ {"nvim-telescope/telescope-fzf-native.nvim", build = "make"}, }, keys = { - {"p", "Telescope find_files hidden=true", noremap = true, silent = true}, + {"p", "Telescope find_files", noremap = true, silent = true}, {"f", "Telescope live_grep", noremap = true, silent = true}, {"b", "Telescope buffers", noremap = true, silent = true}, {"o", "Telescope oldfiles", noremap = true, silent = true}, @@ -152,6 +156,11 @@ require("lazy").setup({ config = function() require("telescope").setup({ defaults = { + mappings = { + i = { + [""] = require("telescope.actions").close, -- Disable normal mode + }, + }, vimgrep_arguments = { "rg", "--color=never",