diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index f677915b..46a7a4bf 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,20 +1,20 @@ { - "conform.nvim": { "branch": "master", "commit": "02fd64fb3d4b18ec029c0e0683c3dc3ec6d2c5b8" }, - "fzf-lua": { "branch": "main", "commit": "fca198e2abd2db6600b25443bc70ee7f342aa217" }, - "lazy.nvim": { "branch": "main", "commit": "014d1d6d78df4e58f962158e6e00261d8632612c" }, + "blink.cmp": { "branch": "main", "commit": "ae5a4ce8f7e519e49de7ae6fcadd74547f820a52" }, + "conform.nvim": { "branch": "master", "commit": "f4e8837878fc5712d053ba3091a73d27d96a09e2" }, + "fzf-lua": { "branch": "main", "commit": "8330321fa135f7fa9e4855099026c4ad622a0c85" }, + "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "mason-conform.nvim": { "branch": "main", "commit": "abce2be529f3b4b336c56d0ba6336a9144e0fee6" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.completion": { "branch": "main", "commit": "6eb9546685c4e1c4af2365b87166d4afa39d8a1b" }, - "mini.icons": { "branch": "main", "commit": "54686be7d58807906cb2c8c2216e0bf9c044f19a" }, + "mini.icons": { "branch": "main", "commit": "44c0160526f7ae17ca8e8eab9ab235d047fcf7a6" }, "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, "mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" }, "mini.trailspace": { "branch": "main", "commit": "3a328e62559c33014e422fb9ae97afc4208208b1" }, - "nvim-lspconfig": { "branch": "master", "commit": "fc16fd4f9c5d72b45db0f45ee275db3a9a30481a" }, - "nvim-treesitter": { "branch": "master", "commit": "3b8dee4293567b0b9a87360842af14669f60dd13" }, - "oil.nvim": { "branch": "master", "commit": "9a59256c8e88b29d2150e99b5960b2f111e51f75" }, - "tairiki.nvim": { "branch": "master", "commit": "c704955b447e88986a7a6b523f559d81e3e6c9d5" }, + "nvim-lspconfig": { "branch": "master", "commit": "ae8a01bb40848490548e5d07b97ed972ed43c2f9" }, + "nvim-treesitter": { "branch": "master", "commit": "5cf3434c694a94fccfca79588654e57053a68572" }, + "oil.nvim": { "branch": "master", "commit": "dba037598843973b8c54bc5ce0318db4a0da439d" }, + "tairiki.nvim": { "branch": "master", "commit": "a278d7ce634ee18dcf20e63cb245d1df4985980a" }, "toggleterm.nvim": { "branch": "main", "commit": "022ff5594acccc8d90d2e46dc43994f7722ebdf7" } } diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index ba3f7492..895b6e72 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -13,9 +13,27 @@ return { }) end, }, + { + "saghen/blink.cmp", + event = { "LspAttach" }, + version = "v0.*", + opts = { + keymap = { preset = "enter" }, + appearance = { + use_nvim_cmp_as_default = true, + nerd_font_variant = "mono", + }, + sources = { + default = { "lsp", "path", "snippets", "buffer" }, + }, + }, + opts_extend = { "sources.default" }, + }, { "neovim/nvim-lspconfig", + dependencies = { "saghen/blink.cmp" }, config = function() + local capabilities = require("blink.cmp").get_lsp_capabilities() local lspconfig = require("lspconfig") local on_attach = function(client, bufnr) @@ -24,6 +42,7 @@ return { end end lspconfig.pyright.setup({ + capabilities = capabilities, settings = { pyright = { disableOrganizeImports = true, @@ -36,6 +55,7 @@ return { }, }) lspconfig.ruff.setup({ + capabilities = capabilities, on_attach = on_attach, init_options = { settings = { @@ -44,6 +64,7 @@ return { }, }) lspconfig.lua_ls.setup({ + capabilities = capabilities, settings = { Lua = { diagnostics = { @@ -52,7 +73,9 @@ return { }, }, }) - lspconfig.gopls.setup({}) + lspconfig.gopls.setup({ + capabilities = capabilities, + }) end, }, } diff --git a/.config/nvim/lua/plugins/mini.lua b/.config/nvim/lua/plugins/mini.lua index d128e623..767e18bd 100644 --- a/.config/nvim/lua/plugins/mini.lua +++ b/.config/nvim/lua/plugins/mini.lua @@ -13,13 +13,6 @@ return { require("mini.surround").setup() end, }, - { - "echasnovski/mini.completion", - version = false, - config = function() - require("mini.completion").setup() - end, - }, { "echasnovski/mini.icons", version = false, diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua index 51896d8c..0e86b48e 100644 --- a/.config/wezterm/wezterm.lua +++ b/.config/wezterm/wezterm.lua @@ -11,12 +11,14 @@ local config = wezterm.config_builder() config.font = wezterm.font("MonoLisa Nerd Font", {}) config.font_size = 16 config.harfbuzz_features = { "calt=1", "clig=1", "liga=1" } -config.color_scheme = "Gruvbox dark, hard (base16)" +config.color_scheme = "Tomorrow Night" config.tab_max_width = 20 config.use_fancy_tab_bar = false -config.enable_tab_bar = true +config.enable_tab_bar = false config.enable_scroll_bar = false config.window_padding = { + top = 0, + left = 0, right = 0, bottom = 0, } diff --git a/zsh/eval.zsh b/zsh/eval.zsh index 030a96be..283d012d 100644 --- a/zsh/eval.zsh +++ b/zsh/eval.zsh @@ -5,3 +5,4 @@ _evalcache fzf --zsh _evalcache zoxide init zsh _evalcache starship init zsh +_evalcache uv generate-shell-completion zsh