albert/nix
albert/nix
1
0
Fork 0
Code Issues Pull requests Activity Actions

Update vim

Browse source
This commit is contained in:
albert 2025-02-21 19:44:32 -08:00
parent 46b42f9d88
commit d6b648b5d9
Signed by: albert
GPG key ID: 3895DD267CA11BA9
5 changed files with 29 additions and 63 deletions
home-manager/common/software/cli
nixvim.nix
nixvim
alpha.nixbase.nixcmp.nixkeymaps.nix

12
home-manager/common/software/cli/nixvim.nix
View file

@ -37,20 +37,8 @@
plugins = { plugins = {
todo-comments.enable = true; todo-comments.enable = true;
ollama = {
enable = true;
model = "qwen2.5-coder:7b";
url = "http://127.0.0.1:11434";
action = "display";
};
dressing.enable = true; dressing.enable = true;
lsp-lines.enable = true;
crates-nvim.enable = true; crates-nvim.enable = true;
lspsaga = {
enable = false;
lightbulb.enable = false;
ui.border = "rounded";
};
lsp = { lsp = {
enable = true; enable = true;
servers = { servers = {

10
home-manager/common/software/cli/nixvim/alpha.nix
View file

@ -12,11 +12,11 @@
mkPadding = size: { type = "padding"; val = size; }; mkPadding = size: { type = "padding"; val = size; };
mkText = text: { type = "text"; val = text; opts = centeredText; }; mkText = text: { type = "text"; val = text; opts = centeredText; };
# mkGroup = val: { inherit val; type = "group"; }; mkGroup = val: { inherit val; type = "group"; };
# mkGroupItem = desc: shortcut: { mkGroupItem = desc: shortcut: {
# inherit shortcut desc; inherit shortcut desc;
# command = ""; command = "";
# }; };
in in
[ [
(mkPadding 6) (mkPadding 6)

48
home-manager/common/software/cli/nixvim/base.nix
View file

@ -46,39 +46,6 @@
''; '';
plugins = { plugins = {
# Auto placement of windows
edgy = {
enable = true;
settings = {
animate.enabled = false;
wo = {
signcolumn = "no";
spell = false;
winbar = false;
winfixheight = false;
winfixwidth = false;
winhighlight = "";
};
left = [
{
title = "󰉓 Files";
ft = "neo-tree";
pinned = true;
filter = ''function(buf) return vim.b[buf].neo_tree_source == "filesystem" end'';
size = 0.7;
}
{
title = "󰊢 Git";
ft = "neo-tree";
filter = ''function(buf) return vim.b[buf].neo_tree_source == "git_status" end'';
size = 0.3;
pinned = true;
}
];
};
};
web-devicons.enable = true;
# Git related # Git related
# Gutter information for git modifications # Gutter information for git modifications
gitsigns.enable = true; gitsigns.enable = true;
@ -86,6 +53,9 @@
fugitive.enable = true; fugitive.enable = true;
# pretty stuff # pretty stuff
# Icons
web-devicons.enable = true;
# Relative numbering
numbertoggle.enable = true; numbertoggle.enable = true;
# Fancify markdown et al # Fancify markdown et al
render-markdown.enable = true; render-markdown.enable = true;
@ -104,7 +74,7 @@
inc_rename = false; inc_rename = false;
lsp_doc_border = true; lsp_doc_border = true;
}; };
lsp.hover.enabled = false; lsp.hover.enabled = true;
popupmenu.enabled = false; popupmenu.enabled = false;
}; };
}; };
@ -145,7 +115,7 @@
enable = true; enable = true;
settings = { settings = {
options = { options = {
# separatorStyle = "padded_slope"; separatorStyle = "padded_slope";
color_icons = true; color_icons = true;
diagnostics = "nvim_lsp"; diagnostics = "nvim_lsp";
always_show_bufferline = false; always_show_bufferline = false;
@ -173,10 +143,16 @@
hideRootNode = true; hideRootNode = true;
popupBorderStyle = "rounded"; popupBorderStyle = "rounded";
sourceSelector = { sourceSelector = {
winbar = false; winbar = true;
}; };
defaultComponentConfigs = { defaultComponentConfigs = {
name.trailingSlash = false; name.trailingSlash = false;
diagnostics.symbols = {
error = "󰅚 ";
warn = "󰀪 ";
hint = "󰌶 ";
info = " ";
};
}; };
sources = [ sources = [
"filesystem" "filesystem"

12
home-manager/common/software/cli/nixvim/cmp.nix
View file

@ -18,12 +18,12 @@
settings = { settings = {
mapping = { mapping = {
"<C-Space>" = "cmp.mapping.complete()"; "<C-Space>" = "cmp.mapping.complete()";
"<C-d>" = "cmp.mapping.scroll_docs(-4)"; "<C-d>" = "cmp.mapping.scroll_docs(-4)";
"<C-e>" = "cmp.mapping.close()"; "<C-e>" = "cmp.mapping.close()";
"<C-f>" = "cmp.mapping.scroll_docs(4)"; "<C-f>" = "cmp.mapping.scroll_docs(4)";
"<CR>" = "cmp.mapping.confirm({ select = true })"; "<CR>" = "cmp.mapping.confirm({ select = true })";
"<S-Tab>" = "cmp.mapping.select_prev_item()"; "<S-Tab>" = "cmp.mapping.select_prev_item()";
"<Tab>" = "cmp.mapping.select_next_item()"; "<Tab>" = "cmp.mapping.select_next_item()";
}; };
window = { window = {
completion.border = "rounded"; completion.border = "rounded";

10
home-manager/common/software/cli/nixvim/keymaps.nix
View file

@ -50,7 +50,7 @@
(nmap "<leader>gd" ":Git diff<CR>" // desc "[D]iff") (nmap "<leader>gd" ":Git diff<CR>" // desc "[D]iff")
# Trouble # Trouble
(nmap "<leader>tf" ":Trouble<CR>" // desc "[F]ocus") (nmap "<leader>tf" ":Trouble<CR>" // desc "[F]ocus")
(nmap "<leader>tt" ":TroubleToggle<CR>" // desc "[T]oggle") (nmap "<leader>tt" ":Trouble diagnostics<CR>" // desc "[T]oggle")
(nmap "<leader>tc" ":TroubleClose<CR>" // desc "[C]lose") (nmap "<leader>tc" ":TroubleClose<CR>" // desc "[C]lose")
# ToDo # ToDo
(nmap "<leader>td" ":Trouble todo<CR>" // desc "To[D]o") (nmap "<leader>td" ":Trouble todo<CR>" // desc "To[D]o")
@ -74,6 +74,8 @@
(nmap "<leader>bN" ":bNext<CR>" // desc "Previous buffer") (nmap "<leader>bN" ":bNext<CR>" // desc "Previous buffer")
(nmap "<leader>bc" ":bdelete<CR>" // desc "[c]lose buffer") (nmap "<leader>bc" ":bdelete<CR>" // desc "[c]lose buffer")
(nmap "<leader>bt" ":enew<CR>" // desc "New [T]ab") (nmap "<leader>bt" ":enew<CR>" // desc "New [T]ab")
(nmap "<Tab>" ":bnext<CR>" // desc "Next buffer")
(nmap "<S-Tab>" ":bNext<CR>" // desc "Previous buffer")
# Multicursors # Multicursors
(nmap "<leader>ms" ":MCstart<CR>" // desc "[S]tart Multicorsor") (nmap "<leader>ms" ":MCstart<CR>" // desc "[S]tart Multicorsor")
(nmap "<leader>mv" ":MCvisual<CR>" // desc "[V]isual Multicorsor") (nmap "<leader>mv" ":MCvisual<CR>" // desc "[V]isual Multicorsor")
@ -81,8 +83,8 @@
(nmap "<leader>mu" ":MCunderCursor<CR>" // desc "Select [U]nder Corsor") (nmap "<leader>mu" ":MCunderCursor<CR>" // desc "Select [U]nder Corsor")
(nmap "<leader>mp" ":MCpattern<CR>" // desc "Select [P]attern") (nmap "<leader>mp" ":MCpattern<CR>" // desc "Select [P]attern")
# Ollama # Ollama
# (nmap "<leader>os" ":OllamaServe<CR>" // desc "Ollama [S]erve") (nmap "<leader>os" ":OllamaServe<CR>" // desc "Ollama [S]erve")
# (nmap "<leader>op" ":Ollama<CR>" // desc "Ollama [P]rompt") (nmap "<leader>op" ":Ollama<CR>" // desc "Ollama [P]rompt")
# (nmap "<leader>om" ":OllamaModel<CR>" // desc "Ollama [M]odel") (nmap "<leader>om" ":OllamaModel<CR>" // desc "Ollama [M]odel")
]; ];
} }