From 8a8176ba2c05a09cb1fbc869a6b9679eb44efc3a Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Mon, 27 May 2024 19:42:59 +0200 Subject: [PATCH] onward --- .config/broot/verbs.hjson | 2 +- .config/nvim/lazy-lock.json | 37 +++++++++++++++-------------- .config/nvim/lua/config/keymaps.lua | 8 +++---- .config/nvim/lua/config/options.lua | 4 ++-- .config/nvim/lua/plugins/editor.lua | 26 ++++++++++++-------- .config/nvim/lua/plugins/extras.lua | 7 ------ 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/.config/broot/verbs.hjson b/.config/broot/verbs.hjson index 6279ee5..abf186a 100644 --- a/.config/broot/verbs.hjson +++ b/.config/broot/verbs.hjson @@ -12,7 +12,7 @@ verbs: [ invocation: nvim key: enter apply_to: text_file - execution: "tmux-edit-helper {file}" + execution: "wezterm-edit-helper {file}" leave_broot: true } diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 91beb33..dbdecf7 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,9 +1,8 @@ { - "LazyVim": { "branch": "main", "commit": "0f6ff53ce336082869314db11e9dfa487cf83292" }, + "LazyVim": { "branch": "main", "commit": "59204df1cb4a1d0176005dd7dc901ddbae9d23bd" }, "SchemaStore.nvim": { "branch": "main", "commit": "9a5992a881583d886bfbb46631a09f736f0fae50" }, "alabaster.nvim": { "branch": "main", "commit": "5bb485d630d50796d4c8c7edc0f0fb9001fccde3" }, - "broot.nvim": { "branch": "main", "commit": "c4365d34e5751832206fd6fd0a4f325b742dea0a" }, - "catppuccin": { "branch": "main", "commit": "d97387aea8264f484bb5d5e74f2182a06c83e0d8" }, + "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, @@ -16,30 +15,30 @@ "dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" }, "edgy.nvim": { "branch": "main", "commit": "de79b7d92a5979cd71a9a1d8b6282515345e5055" }, "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, - "fzf": { "branch": "master", "commit": "daa602422dc272cbec6b99bc7520262672ad7230" }, + "fzf": { "branch": "master", "commit": "99bd6de5415dccec4b1b21121224116bbfbc462f" }, "fzfx.nvim": { "branch": "main", "commit": "be147216edf164a1739430c7fda210f9876cc430" }, "gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" }, "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" }, "incline.nvim": { "branch": "main", "commit": "16fc9c073e3ea4175b66ad94375df6d73fc114c0" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "8f19915175395680808de529e4220da8dafc0759" }, + "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" }, "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, - "mini.ai": { "branch": "main", "commit": "a0262e61f79dfc7bb940d1719c00b0ede042ddd7" }, - "mini.colors": { "branch": "main", "commit": "be18d56eeaae810e34334c0e9230608f59f71c28" }, - "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" }, + "mini.ai": { "branch": "main", "commit": "7859b6344f5cee567a94f173859d25e20ba1a77e" }, + "mini.colors": { "branch": "main", "commit": "11b3b7056343d324abb69910e3cdec53bbf2a7c9" }, + "mini.indentscope": { "branch": "main", "commit": "f0d7faa064c892b96997810afcddfadc3f2a15b3" }, "modes.nvim": { "branch": "main", "commit": "4035a46aaabe43faf1b54740575af9dd5bb03809" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "neocodeium": { "branch": "main", "commit": "666d4f57e8bf0789c58957a9483dd671bc038123" }, - "neoconf.nvim": { "branch": "main", "commit": "9092129e9a42ae26375001bd2e6118f8d57c7f2a" }, + "neocodeium": { "branch": "main", "commit": "4a46f6438bcdb21c562f83036bce75c719834072" }, + "neoconf.nvim": { "branch": "main", "commit": "4e204e0d423e70293b81ba1655ed17e1f3c97986" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "noice.nvim": { "branch": "main", "commit": "f119045f38792ad5311e5f9be7a879e4c1a95fe0" }, "none-ls.nvim": { "branch": "main", "commit": "60f5f80686f5a272ed3281a7d4962cb54dc5348e" }, "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, - "nvim-dap": { "branch": "master", "commit": "c65c163daa47e0623dd85d2303fce0c22e52ad01" }, + "nvim-dap": { "branch": "master", "commit": "922ebc75c2fa9305e36402fbd8c984c8638770a0" }, "nvim-dap-go": { "branch": "main", "commit": "5faf165f5062187320eaf9d177c3c1f647adc22e" }, "nvim-dap-ui": { "branch": "master", "commit": "334cf3038c4756e6ab999cbac67c847fb654c190" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" }, @@ -49,22 +48,24 @@ "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" }, "nvim-noirbuddy": { "branch": "master", "commit": "f3e35f42cf3f08b7351a69bf3a92b7e80a564f30" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-snippets": { "branch": "main", "commit": "5669b8d4eb6bbc5ebadf522f0e30a4cfb5a308f6" }, + "nvim-snippets": { "branch": "main", "commit": "67f44a552f03b5de23af1900d01af3256a3da2bc" }, "nvim-spectre": { "branch": "master", "commit": "5690ea46baf08bbc1623980012e14b6239ce582e" }, - "nvim-treesitter": { "branch": "master", "commit": "6d56c5f404d3b116bab167bc03993cfb0a83f8aa" }, + "nvim-treesitter": { "branch": "master", "commit": "245da4eb2e52d14b034bbbedec9671e997ede764" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" }, "nvim-ts-autotag": { "branch": "main", "commit": "8ae54b90e36ef1fc5267214b30c2cbff71525fe4" }, - "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" }, + "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, "persistence.nvim": { "branch": "main", "commit": "5fe077056c821aab41f87650bd6e1c48cd7dd047" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "rustaceanvim": { "branch": "master", "commit": "e306c742bd7f7183e371cd91268b72d9db1bbae0" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "1a05e580147f7a06d24ae88ee3787b3fc0676fbe" }, + "smart-open.nvim": { "branch": "0.2.x", "commit": "87626ee8748b9bba22093adec7bb58c63e7214f0" }, + "sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, - "telescope.nvim": { "branch": "master", "commit": "5665d93988acfbb0747bdbf4f4cb583bcebc8930" }, + "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" }, + "telescope.nvim": { "branch": "master", "commit": "349660c0d35da06459ee8589af77de2086b652ce" }, "todo-comments.nvim": { "branch": "main", "commit": "e1549807066947818113a7d7ed48f637e49620d3" }, - "tokyonight.nvim": { "branch": "main", "commit": "b9b494fa7f7bbf2fe0747b47fa290fb7a4eddcc7" }, + "tokyonight.nvim": { "branch": "main", "commit": "0fae425aaab04a5f97666bd431b96f2f19c36935" }, "trouble.nvim": { "branch": "dev", "commit": "e2185bf6e63ef9bd75f1819f43846e2b0f10953b" }, - "ts-comments.nvim": { "branch": "main", "commit": "8ea22850c40b4aef481a6ebdd74c928ed2b20427" }, + "ts-comments.nvim": { "branch": "main", "commit": "f7ded340b4c6b317593b867838bf7ace354a67d4" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, "yanky.nvim": { "branch": "main", "commit": "8756d19923ad871eb95f543a8a98c026b4a8494f" } } \ No newline at end of file diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua index 3a627cb..cc87217 100644 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim/lua/config/keymaps.lua @@ -3,9 +3,9 @@ -- Add any additional keymaps here -- C-/ should be comment instead of lazyterm -vim.api.nvim_del_keymap("n", "") -vim.api.nvim_set_keymap("n", "", "gcc", {}) -vim.api.nvim_set_keymap("v", "", "gc", {}) -vim.api.nvim_set_keymap("n", "", "gcgc", {}) +vim.api.nvim_del_keymap("n", "") +vim.api.nvim_set_keymap("n", "", "gcc", {}) +vim.api.nvim_set_keymap("v", "", "gc", {}) +vim.api.nvim_set_keymap("n", "", "gcgc", {}) vim.api.nvim_set_keymap("n", "", ",", {}) vim.api.nvim_set_keymap("n", "zz", "zt", {}) diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua index 5a4776b..6914364 100644 --- a/.config/nvim/lua/config/options.lua +++ b/.config/nvim/lua/config/options.lua @@ -13,9 +13,9 @@ vim.o.autochdir = true vim.o.fillchars = "stl: ,stlnc: ,eob:🮙" vim.o.scrolloff = 7 vim.o.splitkeep = "screen" -vim.o.updatetime = 1500 +vim.o.updatetime = 2500 vim.o.timeout = true -vim.o.timeoutlen = 15 +vim.o.timeoutlen = 0 -- additional filetypes vim.filetype.add({ diff --git a/.config/nvim/lua/plugins/editor.lua b/.config/nvim/lua/plugins/editor.lua index a2e2368..691d9a1 100644 --- a/.config/nvim/lua/plugins/editor.lua +++ b/.config/nvim/lua/plugins/editor.lua @@ -12,13 +12,6 @@ return { { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, { "nvim-telescope/telescope-fzy-native.nvim" }, }, - keys = { - { - "", - ":lua require('telescope').extensions.smart_open.smart_open {filename_first = false }", - desc = "Telescope smart open", - }, - }, config = function() local util = require("lazyvim.util") util.on_load("telescope.nvim", function() @@ -30,6 +23,17 @@ return { { "telescope.nvim", + keys = { + { + "", + function() + require("telescope").extensions.smart_open.smart_open({ + filename_first = false, + }) + end, + desc = "Telescope smart open", + }, + }, opts = function(_, opts) local actions = require("telescope.actions") opts.defaults = { @@ -50,15 +54,17 @@ return { i = { [""] = actions.close, -- close popup [""] = false, -- clear prompt + [""] = false, -- clear prompt }, }, - sorting_strategy = "ascending", - winblend = 0, - wrap_results = true, + path_display = { "filename_first" }, previewer = false, preview = { hide_on_startup = true, }, + sorting_strategy = "ascending", + winblend = 0, + wrap_results = true, } end, }, diff --git a/.config/nvim/lua/plugins/extras.lua b/.config/nvim/lua/plugins/extras.lua index 6c54725..89fc6aa 100644 --- a/.config/nvim/lua/plugins/extras.lua +++ b/.config/nvim/lua/plugins/extras.lua @@ -1,11 +1,4 @@ return { - { - "nvim-telescope/telescope-frecency.nvim", - config = function() - require("telescope").load_extension("frecency") - end, - }, - { "nvimtools/none-ls.nvim", opts = function(_, opts)