diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 260a029c..09afbbe4 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,6 +1,6 @@ { "CopilotChat.nvim": { "branch": "main", "commit": "e0d6a5793a1faa0b88a97232bdbb09ea34744c7e" }, - "LazyVim": { "branch": "main", "commit": "9a0d14dcf5a6e91a54f1afc1378a85f09dec9ae8" }, + "LazyVim": { "branch": "main", "commit": "d30e9e31ebfbb3d079e7e17a948ab1ccb086d618" }, "SchemaStore.nvim": { "branch": "main", "commit": "f8c2a0f5d51b800ea4625808e243d9e8f7c5e1df" }, "blink-cmp-copilot": { "branch": "main", "commit": "e3eedf36ceda1932e296ec894de4ceea8ddeacb6" }, "blink.cmp": { "branch": "main", "commit": "ae5a4ce8f7e519e49de7ae6fcadd74547f820a52" }, @@ -22,7 +22,7 @@ "grug-far.nvim": { "branch": "main", "commit": "eadd3c4d7d3edc9d6b1ddc15e3c661d830dbf2b6" }, "image.nvim": { "branch": "master", "commit": "5f8fceca2d1be96a45b81de21c2f98bf6084fb34" }, "inc-rename.nvim": { "branch": "main", "commit": "1871ca49ae6ee3e9ebee37955ba10c7b1425974f" }, - "lazy.nvim": { "branch": "main", "commit": "7c493713bc2cb392706866eeba53aaef6c8e9fc6" }, + "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" }, "ltex_extra.nvim": { "branch": "master", "commit": "24acd044ce7a26b3cdb537cbd094de37c3e1ac45" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, @@ -57,7 +57,7 @@ "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" }, "nvim-jdtls": { "branch": "master", "commit": "ece818f909c6414cbad4e1fb240d87e003e10fda" }, "nvim-lint": { "branch": "master", "commit": "6b46370d02cd001509a765591a3ffc481b538794" }, - "nvim-lspconfig": { "branch": "master", "commit": "ffe543e171792e4e7c42f1e73c4ab5c6fe71b861" }, + "nvim-lspconfig": { "branch": "master", "commit": "4761665b4be82c46612cdfb4ea9c90de25875c4f" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, "nvim-spider": { "branch": "main", "commit": "8b9dc30243336655699179fd095841adb29434cd" }, @@ -94,7 +94,7 @@ "vim-systemd-syntax": { "branch": "master", "commit": "2f788c627efa7a50baa5766cfacf1852528eca28" }, "vim-tmux-navigator": { "branch": "master", "commit": "424b5caa154bff34dc258ee53cec5a8e36cf7ea8" }, "vim-tridactyl": { "branch": "master", "commit": "fdd069bde3a34c786abed4601b6d59a065590ad9" }, - "vimtex": { "branch": "master", "commit": "3401dc81a14b7251bd813e2411eaf0d3b65bd2af" }, + "vimtex": { "branch": "master", "commit": "2b7784f8983187a9aa0210f93311f0e1ab1578e7" }, "which-key.nvim": { "branch": "main", "commit": "4ab3bbe976e63b5390d3fca74a52a092a041cd30" }, "yanky.nvim": { "branch": "main", "commit": "f9b905994cccf3c55f41af3a0a1f4c76c844e411" }, "yazi.nvim": { "branch": "main", "commit": "89e011ee7df170e681a112bb293c2599b3b97853" } diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua index 6754f2d1..df8d7099 100644 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim/lua/config/keymaps.lua @@ -5,11 +5,14 @@ local wk = require("which-key") local map = vim.keymap.set --- Tmux won't forward to Neovim. --- So, I've mapped ctrl+enter to \u2190 in kitty, --- which is the "←" unicode symbol. -KITTY_SPECIAL = "←" -map({ "n", "i", "x" }, KITTY_SPECIAL, "", { remap = true }) +-- required to remap special sequence +-- when inside tmux :) +require("tmux-remap").setup({ + special = "←", + remap = "", + autoset = true, +}) + map({ "n" }, "", function() vim.notify("Special!") end) diff --git a/.config/nvim/lua/plugins/blink.lua b/.config/nvim/lua/plugins/blink.lua index a32cad3b..08d1cea0 100644 --- a/.config/nvim/lua/plugins/blink.lua +++ b/.config/nvim/lua/plugins/blink.lua @@ -9,12 +9,6 @@ return { ---@type blink.cmp.Config opts = { appearance = { - -- sets the fallback highlight groups to nvim-cmp's highlight groups - -- useful for when your theme doesn't support blink.cmp - -- will be removed in a future release, assuming themes add support - use_nvim_cmp_as_default = false, - -- set to 'mono' for 'Nerd Font Mono' or 'normal' for 'Nerd Font' - -- adjusts spacing to ensure icons are aligned nerd_font_variant = "mono", }, completion = { @@ -38,22 +32,17 @@ return { }, }, - -- experimental signature help support - -- signature = { enabled = true }, - - sources = { - -- adding any nvim-cmp sources here will enable them - -- with blink.compat - compat = {}, - default = { "lsp", "path", "snippets", "buffer" }, - cmdline = {}, - }, keymap = { preset = "default", - [""] = { - LazyVim.cmp.map({ "snippet_forward", "ai_accept" }), - "fallback", - }, + -- [""] = { + -- LazyVim.cmp.map({ "snippet_forward", "ai_accept" }), + -- "fallback", + -- }, + [""] = { "select_and_accept", "fallback" }, + [""] = { "select_prev" }, + [""] = { "select_next" }, + [""] = { "scroll_documentation_up" }, + [""] = { "scroll_documentation_down" }, }, }, } diff --git a/.config/nvim/lua/tmux-remap.lua b/.config/nvim/lua/tmux-remap.lua index e64f18fa..8108ee8e 100644 --- a/.config/nvim/lua/tmux-remap.lua +++ b/.config/nvim/lua/tmux-remap.lua @@ -1,12 +1,34 @@ +-- Tmux won't forward to Neovim. +-- So, I've mapped ctrl+enter to \u2190 in kitty, +-- which is the "←" unicode symbol. local M = {} M.config = { special = "←", remap = "", + autoset = true, } +M.set = function(opts) + if not opts then + opts = M.config + end + vim.keymap.set({ "n", "i", "x" }, opts.special, opts.remap, { remap = true }) +end + M.setup = function(opts) - M.config = vim.tbl_extend("force", M.config, opts) + M.config = vim.tbl_extend("force", M.config, opts or {}) + TMUX_SPECIAL = M.config.special + TMUX_REMAP = M.config.remap + if not vim.g.tmux_special then + vim.g.tmux_special = TMUX_SPECIAL + end + if not vim.g.tmux_remap then + vim.g.tmux_remap = TMUX_REMAP + end + if M.config.autoset then + M.set() + end end return M