diff --git a/machines/desktop/config/nvim/init.lua b/machines/desktop/config/nvim/init.lua index bd7f00e..4c4dcab 100644 --- a/machines/desktop/config/nvim/init.lua +++ b/machines/desktop/config/nvim/init.lua @@ -1,6 +1,4 @@ -if vim.fn.has("nvim-0.12") == 0 then - vim.notify("This config expects Neovim nightly / 0.12+", vim.log.levels.WARN) -end +-- phill Neovim config (nightly) vim.g.mapleader = " " vim.g.maplocalleader = " " @@ -43,6 +41,7 @@ opt.confirm = true opt.showmode = false opt.laststatus = 3 opt.pumheight = 12 +-- opt.cmdheight = 0 opt.expandtab = true opt.smartindent = true @@ -384,18 +383,6 @@ map({ "i", "s" }, "", function() end end, { desc = "LuaSnip previous choice" }) -map({ "i", "s" }, "", function() - if ls.expand_or_jumpable() then - ls.expand_or_jump() - end -end, { desc = "LuaSnip expand/jump" }) - -map({ "i", "s" }, "", function() - if ls.jumpable(-1) then - ls.jump(-1) - end -end, { desc = "LuaSnip jump back" }) - -- ============================================================================ -- blink.cmp -- ============================================================================ @@ -431,6 +418,10 @@ require("blink.cmp").setup({ [""] = { "select_next", "fallback" }, [""] = { "select_prev", "fallback" }, + [""] = { "snippet_forward", "fallback" }, + [""] = { "snippet_backward", "fallback" }, + + }, sources = { default = { "lsp", "path", "snippets", "buffer" }, @@ -501,7 +492,7 @@ require("tabout").setup({ tabkey = "", backwards_tabkey = "", act_as_tab = true, - act_as_shift_tab = false, + act_as_shift_tab = true, default_tab = "", default_shift_tab = "", enable_backwards = true, @@ -514,6 +505,7 @@ require("tabout").setup({ { open = "(", close = ")" }, { open = "[", close = "]" }, { open = "{", close = "}" }, + { open = "$", close = "$" }, }, }) @@ -589,7 +581,7 @@ map("n", "ptP", "TypstPreviewToggle", { silent = true, desc = " -- Markdown map("n", "pmp", "MarkdownPreview", { silent = true, desc = "Markdown preview" }) -map("n", "pmr", "RenderMarkdownToggle", { silent = true, desc = "Toggle render-markdown" }) +map("n", "pmr", "RenderMarkdown toggle", { silent = true, desc = "Toggle render-markdown" }) -- ============================================================================ -- fzf-lua