diff --git a/home-manager/common/software/cli/nixvim.nix b/home-manager/common/software/cli/nixvim.nix
index d5203c5f..4a2cd2c2 100644
--- a/home-manager/common/software/cli/nixvim.nix
+++ b/home-manager/common/software/cli/nixvim.nix
@@ -37,20 +37,8 @@
plugins = {
todo-comments.enable = true;
- ollama = {
- enable = true;
- model = "qwen2.5-coder:7b";
- url = "http://127.0.0.1:11434";
- action = "display";
- };
dressing.enable = true;
- lsp-lines.enable = true;
crates-nvim.enable = true;
- lspsaga = {
- enable = false;
- lightbulb.enable = false;
- ui.border = "rounded";
- };
lsp = {
enable = true;
servers = {
diff --git a/home-manager/common/software/cli/nixvim/alpha.nix b/home-manager/common/software/cli/nixvim/alpha.nix
index 84ff4f48..b07ec04c 100644
--- a/home-manager/common/software/cli/nixvim/alpha.nix
+++ b/home-manager/common/software/cli/nixvim/alpha.nix
@@ -12,11 +12,11 @@
mkPadding = size: { type = "padding"; val = size; };
mkText = text: { type = "text"; val = text; opts = centeredText; };
- # mkGroup = val: { inherit val; type = "group"; };
- # mkGroupItem = desc: shortcut: {
- # inherit shortcut desc;
- # command = "";
- # };
+ mkGroup = val: { inherit val; type = "group"; };
+ mkGroupItem = desc: shortcut: {
+ inherit shortcut desc;
+ command = "";
+ };
in
[
(mkPadding 6)
diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix
index 961508c0..818cb21e 100644
--- a/home-manager/common/software/cli/nixvim/base.nix
+++ b/home-manager/common/software/cli/nixvim/base.nix
@@ -46,39 +46,6 @@
'';
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
# Gutter information for git modifications
gitsigns.enable = true;
@@ -86,6 +53,9 @@
fugitive.enable = true;
# pretty stuff
+ # Icons
+ web-devicons.enable = true;
+ # Relative numbering
numbertoggle.enable = true;
# Fancify markdown et al
render-markdown.enable = true;
@@ -104,7 +74,7 @@
inc_rename = false;
lsp_doc_border = true;
};
- lsp.hover.enabled = false;
+ lsp.hover.enabled = true;
popupmenu.enabled = false;
};
};
@@ -145,7 +115,7 @@
enable = true;
settings = {
options = {
- # separatorStyle = "padded_slope";
+ separatorStyle = "padded_slope";
color_icons = true;
diagnostics = "nvim_lsp";
always_show_bufferline = false;
@@ -173,10 +143,16 @@
hideRootNode = true;
popupBorderStyle = "rounded";
sourceSelector = {
- winbar = false;
+ winbar = true;
};
defaultComponentConfigs = {
name.trailingSlash = false;
+ diagnostics.symbols = {
+ error = " ";
+ warn = " ";
+ hint = " ";
+ info = " ";
+ };
};
sources = [
"filesystem"
diff --git a/home-manager/common/software/cli/nixvim/cmp.nix b/home-manager/common/software/cli/nixvim/cmp.nix
index ebcd3b09..62d79c02 100644
--- a/home-manager/common/software/cli/nixvim/cmp.nix
+++ b/home-manager/common/software/cli/nixvim/cmp.nix
@@ -18,12 +18,12 @@
settings = {
mapping = {
"<C-Space>" = "cmp.mapping.complete()";
- "<C-d>" = "cmp.mapping.scroll_docs(-4)";
- "<C-e>" = "cmp.mapping.close()";
- "<C-f>" = "cmp.mapping.scroll_docs(4)";
- "<CR>" = "cmp.mapping.confirm({ select = true })";
- "<S-Tab>" = "cmp.mapping.select_prev_item()";
- "<Tab>" = "cmp.mapping.select_next_item()";
+ "<C-d>" = "cmp.mapping.scroll_docs(-4)";
+ "<C-e>" = "cmp.mapping.close()";
+ "<C-f>" = "cmp.mapping.scroll_docs(4)";
+ "<CR>" = "cmp.mapping.confirm({ select = true })";
+ "<S-Tab>" = "cmp.mapping.select_prev_item()";
+ "<Tab>" = "cmp.mapping.select_next_item()";
};
window = {
completion.border = "rounded";
diff --git a/home-manager/common/software/cli/nixvim/keymaps.nix b/home-manager/common/software/cli/nixvim/keymaps.nix
index 87909aa0..a82b2f1e 100644
--- a/home-manager/common/software/cli/nixvim/keymaps.nix
+++ b/home-manager/common/software/cli/nixvim/keymaps.nix
@@ -50,7 +50,7 @@
(nmap "<leader>gd" ":Git diff<CR>" // desc "[D]iff")
# Trouble
(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")
# ToDo
(nmap "<leader>td" ":Trouble todo<CR>" // desc "To[D]o")
@@ -74,6 +74,8 @@
(nmap "<leader>bN" ":bNext<CR>" // desc "Previous buffer")
(nmap "<leader>bc" ":bdelete<CR>" // desc "[c]lose buffer")
(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
(nmap "<leader>ms" ":MCstart<CR>" // desc "[S]tart 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>mp" ":MCpattern<CR>" // desc "Select [P]attern")
# Ollama
- # (nmap "<leader>os" ":OllamaServe<CR>" // desc "Ollama [S]erve")
- # (nmap "<leader>op" ":Ollama<CR>" // desc "Ollama [P]rompt")
- # (nmap "<leader>om" ":OllamaModel<CR>" // desc "Ollama [M]odel")
+ (nmap "<leader>os" ":OllamaServe<CR>" // desc "Ollama [S]erve")
+ (nmap "<leader>op" ":Ollama<CR>" // desc "Ollama [P]rompt")
+ (nmap "<leader>om" ":OllamaModel<CR>" // desc "Ollama [M]odel")
];
}