diff --git a/nvim/lua/kanopo/lazy.lua b/nvim/lua/kanopo/lazy.lua index 0edc85a..69606c2 100644 --- a/nvim/lua/kanopo/lazy.lua +++ b/nvim/lua/kanopo/lazy.lua @@ -1,17 +1,17 @@ -- Bootstrap lazy.nvim local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not (vim.uv or vim.loop).fs_stat(lazypath) then - local lazyrepo = "https://github.com/folke/lazy.nvim.git" - local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) - if vim.v.shell_error ~= 0 then - vim.api.nvim_echo({ - { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, - { "\nPress any key to exit..." }, - }, true, {}) - vim.fn.getchar() - os.exit(1) - end + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end end vim.opt.rtp:prepend(lazypath) diff --git a/nvim/lua/kanopo/plugins/cmp.lua b/nvim/lua/kanopo/plugins/cmp.lua index 9b11a81..2499683 100644 --- a/nvim/lua/kanopo/plugins/cmp.lua +++ b/nvim/lua/kanopo/plugins/cmp.lua @@ -1,25 +1,26 @@ return { 'saghen/blink.cmp', -- optional: provides snippets for the snippet source - dependencies = { 'rafamadriz/friendly-snippets' }, + dependencies = { "L3MON4D3/LuaSnip", version = "v2.*" }, version = '1.*', opts = { - -- 'default' (recommended) for mappings similar to built-in completions (C-y to accept) - -- 'super-tab' for mappings similar to vscode (tab to accept) - -- 'enter' for enter to accept - -- 'none' for no mappings - -- - -- All presets have the following mappings: - -- C-space: Open menu or open docs if already open - -- C-n/C-p or Up/Down: Select next/previous item - -- C-e: Hide menu - -- C-k: Toggle signature help (if signature.enabled = true) - -- - -- See :h blink-cmp-config-keymap for defining your own keymap - keymap = { preset = 'default' }, + completion = { + list = { + selection = { preselect = false, auto_insert = false } + } + }, + signature = { enabled = true }, + snippets = { preset = "luasnip" }, + appearance = { nerd_font_variant = "mono" }, sources = { - default = { 'lsp', 'path', 'snippets', 'buffer' }, + default = { + "lsp", + "path", + "snippets", + "buffer", + }, }, }, opts_extend = { "sources.default" } + } diff --git a/nvim/lua/kanopo/plugins/lsp.lua b/nvim/lua/kanopo/plugins/lsp.lua index 3a7767a..6a83a2f 100644 --- a/nvim/lua/kanopo/plugins/lsp.lua +++ b/nvim/lua/kanopo/plugins/lsp.lua @@ -11,7 +11,6 @@ return { -- Optional tools installer (safe to keep) { "WhoIsSethDaniel/mason-tool-installer.nvim" }, }, - event = { "BufReadPre", "BufNewFile" }, -- Single place to edit servers/tools in the future lsp_servers = { @@ -25,7 +24,7 @@ return { "cssls", "clangd", "rust_analyzer", - "gopls", + -- "gopls", }, tools = { "luacheck", diff --git a/nvim/lua/kanopo/plugins/oil.lua b/nvim/lua/kanopo/plugins/oil.lua index ab865e6..6517aeb 100644 --- a/nvim/lua/kanopo/plugins/oil.lua +++ b/nvim/lua/kanopo/plugins/oil.lua @@ -1,9 +1,9 @@ return { - 'stevearc/oil.nvim', - opts = {}, - dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if prefer nvim-web-devicons - config = function() - require("oil").setup() - vim.keymap.set('n', 'ee', ":Oil") - end + 'stevearc/oil.nvim', + opts = {}, + dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if prefer nvim-web-devicons + config = function() + require("oil").setup() + vim.keymap.set('n', 'fe', ":Oil") + end } diff --git a/nvim/main.ts b/nvim/main.ts index d4556ee..7d7805c 100644 --- a/nvim/main.ts +++ b/nvim/main.ts @@ -5,3 +5,6 @@ const Page = () => { } + + +