commit 2e3f298993a86322eff86a3248256f3f7fce5b49
parent 42ef026a1b29fdf0cb00f398d924d9b3bf1051dd
Author: Alex Balgavy <alexander.balgavy@spaceapplications.com>
Date: Mon, 17 Nov 2025 18:16:09 +0100
nvim: config updates
Diffstat:
6 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
@@ -1,22 +1,23 @@
{
- "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
- "aerial.nvim": { "branch": "master", "commit": "5c0df1679bf7c814c924dc6646cc5291daca8363" },
+ "aerial.nvim": { "branch": "master", "commit": "5e687b5a14004fa2dd9eccbee042b96869fe1557" },
"baleia.nvim": { "branch": "main", "commit": "880e97c02edf3148ba2bdc6305ac03eb3c3711e0" },
- "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
+ "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
"cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" },
"colortils.nvim": { "branch": "main", "commit": "948d4eddbd20c3e9eac79368dc50c7929d4fb823" },
- "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" },
- "gitsigns.nvim": { "branch": "main", "commit": "736f51d2bb684c06f39a2032f064d7244f549981" },
- "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
- "mini.ai": { "branch": "main", "commit": "1cd4f021a05c29acd4ab511c0981da14217daf38" },
- "mini.align": { "branch": "main", "commit": "0202e1662a7a03a95cefd6851795ceae5e87b9b3" },
- "nvim-lint": { "branch": "master", "commit": "7ef127aaede2a4d5ad8df8321e2eb4e567f29594" },
- "nvim-lspconfig": { "branch": "master", "commit": "9141be4c1332afc83bdf1b0278dbb030f75ff8e3" },
+ "conform.nvim": { "branch": "master", "commit": "9fd3d5e0b689ec1bf400c53cbbec72c6fdf24081" },
+ "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" },
+ "lazy.nvim": { "branch": "main", "commit": "f0f5bbb9e5bfae5e6468f9359ffea3d151418176" },
+ "mini.ai": { "branch": "main", "commit": "11c57180bc9084089206e211ac7aa598bedc9673" },
+ "mini.align": { "branch": "main", "commit": "f42eeb70232fbc4761f2d895a173b117bfd11541" },
+ "mini.operators": { "branch": "main", "commit": "1d0d1e1570e5bd22e6df3bcb068d0a2ac0d30710" },
+ "mini.surround": { "branch": "main", "commit": "3c73e2a4d20f46f8bcb610020db2be5fde8319fb" },
+ "nvim-lint": { "branch": "master", "commit": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb" },
+ "nvim-lspconfig": { "branch": "master", "commit": "e25994a1c2373784364852cd904cb39b6d75f227" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
- "nvim-treesitter-context": { "branch": "master", "commit": "dca8726fea2c14e1ce6adbaa76a04816fbfaff61" },
- "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
- "nvim-web-devicons": { "branch": "master", "commit": "3362099de3368aa620a8105b19ed04c2053e38c0" },
- "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
- "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
- "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
+ "nvim-treesitter-context": { "branch": "master", "commit": "ec308c7827b5f8cb2dd0ad303a059c945dd21969" },
+ "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
+ "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },
+ "snacks.nvim": { "branch": "main", "commit": "76160be5d38cd67e46557cb5d0b3e36ececdfa3c" },
+ "trouble.nvim": { "branch": "main", "commit": "d7494d8bc563f8ae8b3f35d78c7478cf842b0ab9" },
+ "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
}
diff --git a/nvim/lua/plugins/completion.lua b/nvim/lua/plugins/completion.lua
@@ -21,7 +21,7 @@ return {
-- C-k: Toggle signature help (if signature.enabled = true)
--
-- See :h blink-cmp-config-keymap for defining your own keymap
- keymap = { preset = 'enter' },
+ keymap = { preset = 'super-tab' },
appearance = {
-- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua
@@ -1,6 +1,4 @@
return {
- 'numToStr/Comment.nvim', -- "gc" to comment visual regions/lines
-
{
"folke/which-key.nvim",
config = function()
@@ -34,10 +32,15 @@ return {
{
"nvim-mini/mini.surround",
config = function()
+ -- Mappings similar to tpope/vim-surround
require('mini.surround').setup({
mappings = {
add = 'ys',
delete = 'ds',
+ find = '',
+ find_left = '',
+ highlight = '',
+ replace = 'cs',
}
})
@@ -50,6 +53,7 @@ return {
end,
event = "VeryLazy",
},
+ { "nvim-mini/mini.operators", opts = {} },
{
"m00qek/baleia.nvim",
version = "*",
diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
@@ -169,7 +169,7 @@ local config = function()
vim.lsp.config("nixd", { on_attach = on_attach })
vim.lsp.enable("nixd", {
- opts = {
+ opts = {
root_markers = { "flake.nix", ".git", "darwin-configuration.nix" },
},
})
@@ -207,11 +207,11 @@ local config = function()
vim.lsp.enable("basedpyright")
- vim.lsp.config("vue_ls", {
- -- add filetypes for typescript, javascript and vue
- filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" },
- })
- vim.lsp.enable("vue_ls")
+ -- vim.lsp.config("vue_ls", {
+ -- -- add filetypes for typescript, javascript and vue
+ -- filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" },
+ -- })
+ -- vim.lsp.enable("vue_ls")
vim.lsp.enable("terraformls")
diff --git a/nvim/lua/plugins/snacks.lua b/nvim/lua/plugins/snacks.lua
@@ -120,6 +120,14 @@ return {
---@type snacks.Config
opts = {
picker = {
+ win = {
+ preview = {
+ wo = {
+ foldlevel = 99,
+ foldenable = false,
+ },
+ },
+ },
sources =
{
---@class snacks.picker.Explorer.Config
diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua
@@ -6,7 +6,7 @@ local config = function()
'python', 'java', 'sql', 'markdown_inline', 'html' },
highlight = { enable = true },
- indent = { enable = true, disable = { 'python' } },
+ indent = { enable = true }, --, disable = { 'python' } },
incremental_selection = {
enable = true,
keymaps = {