diff --git a/modules/wm/ags/tsconfig.json b/modules/wm/ags/tsconfig.json index f03f2d1..6860767 100644 --- a/modules/wm/ags/tsconfig.json +++ b/modules/wm/ags/tsconfig.json @@ -15,4 +15,4 @@ ], "skipLibCheck": true } -} \ No newline at end of file +} diff --git a/nvim/catppuccin.lua b/nvim/catppuccin.lua index 3ebe647..bc8c73f 100644 --- a/nvim/catppuccin.lua +++ b/nvim/catppuccin.lua @@ -12,5 +12,8 @@ require("catppuccin").setup({ navic = true, leap = true, noice = true, + snacks = { + enabled = true, + }, }, }) diff --git a/nvim/default.nix b/nvim/default.nix index 10cfe68..b3e6a3a 100644 --- a/nvim/default.nix +++ b/nvim/default.nix @@ -97,15 +97,16 @@ in noice-nvim statuscol-nvim - dressing-nvim + telescope-ui-select-nvim + (snacks-nvim.overrideAttrs { + postPatch = "rm -rf queries"; + }) mini-icons which-key-nvim quicker-nvim lualine-nvim nvim-navic virt-column-nvim - indent-blankline-nvim - zen-mode-nvim CopilotChat-nvim # enable this just to signin (used by the chat plugin above) diff --git a/nvim/lua/plugins/copilot.lua b/nvim/lua/plugins/copilot.lua index 2ea21ef..05a97a0 100644 --- a/nvim/lua/plugins/copilot.lua +++ b/nvim/lua/plugins/copilot.lua @@ -10,10 +10,12 @@ return { } }, opts = { + model = "gemini-2.5-pro", + chat_autocomplete = false, auto_insert_mode = true, mappings = { complete = { - insert = "", + insert = "", }, close = { normal = "q", @@ -22,10 +24,6 @@ return { } }, after = function(plug) - local select = require("CopilotChat.select") - plug.opts.selection = function(source) - return select.visual(source) or select.buffer(source) - end require("CopilotChat").setup(plug.opts) end, }, diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua index 6857338..ee718af 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/nvim/lua/plugins/telescope.lua @@ -136,6 +136,7 @@ return { telescope.load_extension("fzf") telescope.load_extension("ripgrep") telescope.load_extension("git_show") + telescope.load_extension("ui-select") end }, } diff --git a/nvim/lua/plugins/ui.lua b/nvim/lua/plugins/ui.lua index 653d9a3..653cf77 100644 --- a/nvim/lua/plugins/ui.lua +++ b/nvim/lua/plugins/ui.lua @@ -61,37 +61,59 @@ return { }, { - "indent-blankline.nvim", - event = { "BufReadPost", "BufWritePost", "BufNewFile" }, + "snacks-nvim", + event = "DeferredUIEnter", opts = { + input = { + enabled = true, + }, indent = { - char = "▏", - tab_char = "▏", + enabled = true, + indent = { + char = "▏", + }, + animate = { + enabled = false, + }, + scope = { + char = "▏", + }, + chunk = { + char = { + vertical = "▏", + }, + }, }, - exclude = { - filetypes = { - "help", - "checkhealth", - "help", - "man", - "qf", - "", - } + zen = { + toggles = { + dim = false, + }, + show = { + statusline = true, + }, + }, + styles = { + input = { + relative = "cursor", + row = -3, + col = 0, + keys = { + i_esc = { "", { "cmp_close", "cancel" }, mode = "i", expr = true }, + }, + }, + zen = { + width = 200, + backdrop = { + transparent = false, + blend = 0, + }, + }, }, - scope = { show_start = false, show_end = false, }, }, after = function(plug) - require("ibl").setup(plug.opts) - end, - }, + require("snacks").setup(plug.opts) - { - "zen-mode.nvim", - keys = { - { "zz", "ZenMode", desc = "Toogle zen mode" }, - }, - after = function() - require("zen-mode").setup() + vim.keymap.set("n", "zz", function() require("snacks").zen() end, { desc = "Toggle zen mode" }) end, }, }