update "${services}"

This commit is contained in:
2025-10-13 16:25:33 -05:00
parent 3b2460f97a
commit 2f627902f3
21 changed files with 321 additions and 492 deletions

View File

@@ -1,8 +1,13 @@
{ pkgs, config, lib, inputs, ... }:
{
pkgs,
config,
lib,
inputs,
...
}:
{
imports = [
inputs.nvf.homeManagerModules.default
inputs.nvf.homeManagerModules.default
];
programs.nvf = {
@@ -16,59 +21,114 @@
vimAlias = true;
lsp = {
enable = true;
servers.nix = {
enable = true;
format = {
enable = true;
command = "alejandra";
args = [];
};
};
};
lsp.enable = true;
statusline.lualine.enable = true;
telescope.enable = true;
autocomplete.nvim-cmp.enable = true;
keymaps = [
# visual line movement (insert mode)
{ key = "<Up>"; mode = [ "i" ]; action = "<C-o>gk"; desc = "Visual Line Up (Insert)"; }
{ key = "<Down>"; mode = [ "i" ]; action = "<C-o>gj"; desc = "Visual Line Down (Insert)"; }
{
key = "<Up>";
mode = [ "i" ];
action = "<C-o>gk";
desc = "Visual Line Up (Insert)";
}
{
key = "<Down>";
mode = [ "i" ];
action = "<C-o>gj";
desc = "Visual Line Down (Insert)";
}
# visual line movement (normal/visual)
{ key = "<Up>"; mode = [ "n" "v" ]; action = "g<Up>"; desc = "Visual Line Up"; }
{ key = "<Down>"; mode = [ "n" "v" ]; action = "g<Down>"; desc = "Visual Line Down"; }
{
key = "<Up>";
mode = [
"n"
"v"
];
action = "g<Up>";
desc = "Visual Line Up";
}
{
key = "<Down>";
mode = [
"n"
"v"
];
action = "g<Down>";
desc = "Visual Line Down";
}
# lsp
#{ key = "gd"; mode = [ "n" ]; action = "<cmd>lua vim.lsp.buf.definition()<CR>"; desc = "Go to definition"; }
#{ key = "K"; mode = [ "n" ]; action = "<cmd>lua vim.lsp.buf.hover()<CR>"; desc = "Hover info"; }
#{ key = "<leader>f"; mode = [ "n" ]; action = "<cmd>lua vim.lsp.buf.format({ async = true })<CR>"; desc = "Format buffer"; }
{ key = "gd"; mode = [ "n" ]; silent = true; action = "<cmd>lua vim.lsp.buf.definition()<CR>"; desc = "Go to definition"; }
{
key = "gd";
mode = [ "n" ];
silent = true;
action = "<cmd>lua vim.lsp.buf.definition()<CR>";
desc = "Go to definition";
}
# Hover info
{ key = "K"; mode = [ "n" ]; silent = true; action = "<cmd>lua vim.lsp.buf.hover()<CR>"; desc = "Hover info"; }
{
key = "K";
mode = [ "n" ];
silent = true;
action = "<cmd>lua vim.lsp.buf.hover()<CR>";
desc = "Hover info";
}
# Format buffer (Alejandra for Nix)
{ key = "<leader>F"; mode = [ "n" ]; silent = true; action = "<cmd>lua vim.lsp.buf.format({ async = true })<CR>"; desc = "Format buffer"; }
{
key = "<leader>F";
mode = [ "n" ];
silent = true;
action = "<cmd>lua vim.lsp.buf.format({ async = true })<CR>";
desc = "Format buffer";
}
# Code actions / quickfix
{ key = "<leader>a"; mode = [ "n" ]; silent = true; action = "<cmd>lua vim.lsp.buf.code_action()<CR>"; desc = "Code action"; }
{
key = "<leader>a";
mode = [ "n" ];
silent = true;
action = "<cmd>lua vim.lsp.buf.code_action()<CR>";
desc = "Code action";
}
# Rename symbol
{ key = "<leader>r"; mode = [ "n" ]; silent = true; action = "<cmd>lua vim.lsp.buf.rename()<CR>"; desc = "Rename symbol"; }
{
key = "<leader>r";
mode = [ "n" ];
silent = true;
action = "<cmd>lua vim.lsp.buf.rename()<CR>";
desc = "Rename symbol";
}
# Diagnostics
{ key = "<leader>e"; mode = [ "n" ]; silent = true; action = "<cmd>lua vim.diagnostic.open_float()<CR>"; desc = "Show diagnostic"; }
{ key = "[d"; mode = [ "n" ]; silent = true; action = "<cmd>lua vim.diagnostic.goto_prev()<CR>"; desc = "Previous diagnostic"; }
{ key = "]d"; mode = [ "n" ]; silent = true; action = "<cmd>lua vim.diagnostic.goto_next()<CR>"; desc = "Next diagnostic"; }
{
key = "<leader>e";
mode = [ "n" ];
silent = true;
action = "<cmd>lua vim.diagnostic.open_float()<CR>";
desc = "Show diagnostic";
}
{
key = "[d";
mode = [ "n" ];
silent = true;
action = "<cmd>lua vim.diagnostic.goto_prev()<CR>";
desc = "Previous diagnostic";
}
{
key = "]d";
mode = [ "n" ];
silent = true;
action = "<cmd>lua vim.diagnostic.goto_next()<CR>";
desc = "Next diagnostic";
}
];
options = {
clipboard = "unnamedplus";
@@ -99,7 +159,7 @@
wrap = true;
linebreak = true;
breakindent = true;
termguicolors = true;
autoread = true;
};
@@ -109,12 +169,18 @@
nix = {
enable = true;
format = {
enable = true;
#type = "alejandra";
type = "nixfmt";
};
};
markdown.enable = true;
rust.enable = true;
lua.enable = true;
};
};
};
};
};