Compare commits

...

2 Commits

Author SHA1 Message Date
9faf6cdfe4 feat(nvim/blink.cmp): always use lua implementation 2026-02-08 01:52:43 +08:00
3d116fe3a7 chore: fmt 2026-02-08 01:51:27 +08:00
4 changed files with 50 additions and 27 deletions

View File

@@ -19,18 +19,36 @@ in
add_newline = false; add_newline = false;
command_timeout = 2000; command_timeout = 2000;
nix_shell.disabled = true; nix_shell.disabled = true;
format = let format =
dedupDollar = list: let let
result = builtins.foldl' (acc: elem: dedupDollar =
list:
let
result =
builtins.foldl'
(
acc: elem:
if lib.hasPrefix "$" elem then if lib.hasPrefix "$" elem then
if builtins.elem elem acc.seen if builtins.elem elem acc.seen then
then acc acc
else acc // { result = acc.result ++ [elem]; seen = acc.seen ++ [elem]; } else
acc
// {
result = acc.result ++ [ elem ];
seen = acc.seen ++ [ elem ];
}
else else
acc // { result = acc.result ++ [ elem ]; } acc // { result = acc.result ++ [ elem ]; }
) { result = []; seen = []; } (lib.reverseList list); )
in lib.reverseList result.result; {
in "$all" + lib.concatStrings (dedupDollar cfg.format); result = [ ];
seen = [ ];
}
(lib.reverseList list);
in
lib.reverseList result.result;
in
"$all" + lib.concatStrings (dedupDollar cfg.format);
}; };
}; };
}; };

View File

@@ -35,6 +35,9 @@ in
}; };
}; };
}; };
my.cli.shell.starship.format = [ "\${custom.shpool}" "$character" ]; my.cli.shell.starship.format = [
"\${custom.shpool}"
"$character"
];
}; };
} }

View File

@@ -47,6 +47,9 @@ in
}; };
}; };
}; };
my.cli.shell.starship.format = [ "\${custom.tmux}" "$character" ]; my.cli.shell.starship.format = [
"\${custom.tmux}"
"$character"
];
}; };
} }

View File

@@ -27,7 +27,7 @@ local plugins = {
end, end,
}, },
{ {
'echasnovski/mini.nvim', "echasnovski/mini.nvim",
config = function() config = function()
-- Better Around/Inside textobjects -- Better Around/Inside textobjects
-- --
@@ -35,31 +35,31 @@ local plugins = {
-- - va) - [V]isually select [A]round [)]paren -- - va) - [V]isually select [A]round [)]paren
-- - yinq - [Y]ank [I]nside [N]ext [Q]uote -- - yinq - [Y]ank [I]nside [N]ext [Q]uote
-- - ci' - [C]hange [I]nside [']quote -- - ci' - [C]hange [I]nside [']quote
require('mini.ai').setup { n_lines = 500 } require("mini.ai").setup({ n_lines = 500 })
-- Add/delete/replace surroundings (brackets, quotes, etc.) -- Add/delete/replace surroundings (brackets, quotes, etc.)
-- --
-- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
-- - sd' - [S]urround [D]elete [']quotes -- - sd' - [S]urround [D]elete [']quotes
-- - sr)' - [S]urround [R]eplace [)] ['] -- - sr)' - [S]urround [R]eplace [)] [']
require('mini.surround').setup() require("mini.surround").setup()
-- ... and there is more! -- ... and there is more!
-- Check out: https://github.com/echasnovski/mini.nvim -- Check out: https://github.com/echasnovski/mini.nvim
end, end,
}, },
{ {
'nvim-neo-tree/neo-tree.nvim', "nvim-neo-tree/neo-tree.nvim",
version = '*', version = "*",
dependencies = { dependencies = {
'nvim-lua/plenary.nvim', "nvim-lua/plenary.nvim",
'nvim-tree/nvim-web-devicons', "nvim-tree/nvim-web-devicons",
'MunifTanjim/nui.nvim', "MunifTanjim/nui.nvim",
}, },
cmd = 'Neotree', cmd = "Neotree",
keys = { keys = {
{ '\\', ':Neotree reveal toggle<CR>', desc = 'Toggle NeoTree', silent = true }, { "\\", ":Neotree reveal toggle<CR>", desc = "Toggle NeoTree", silent = true },
{ '<leader>e', ':Neotree reveal toggle<CR>', desc = 'Toggle NeoTree', silent = true }, { "<leader>e", ":Neotree reveal toggle<CR>", desc = "Toggle NeoTree", silent = true },
}, },
--- @type neotree.Config --- @type neotree.Config
opts = { opts = {
@@ -71,7 +71,7 @@ local plugins = {
window = { window = {
width = 30, width = 30,
mappings = { mappings = {
['\\'] = 'close_window', ["\\"] = "close_window",
["<leader>e"] = "close_window", ["<leader>e"] = "close_window",
["<c-]>"] = "set_root", ["<c-]>"] = "set_root",
}, },
@@ -176,7 +176,6 @@ local plugins = {
{ {
"saghen/blink.cmp", "saghen/blink.cmp",
event = "VeryLazy", event = "VeryLazy",
build = "cargo build --release",
dependencies = { dependencies = {
{ {
"L3MON4D3/LuaSnip", "L3MON4D3/LuaSnip",