1
0
Fork 0

fix kitty, restructure nvf

This commit is contained in:
Philipp 2025-02-28 21:41:24 +01:00
parent 0e0f29d425
commit 5493ef8a57
Signed by: Philipp
GPG key ID: 9EBD8439AFBAB750
11 changed files with 101 additions and 70 deletions

View file

@ -0,0 +1,3 @@
{
programs.nvf.settings.vim.autocomplete.nvim-cmp.enable = true;
}

View file

@ -1,5 +1,53 @@
{
imports = [
./vim-config.nix
];
config,
lib,
namespace,
...
}:
with lib;
with lib.${namespace};
let
cfg = config.${namespace}.cli.neovim;
in
{
options.${namespace}.cli.neovim = with types; {
enable = mkBoolOpt false "Whether or not to enable neovim.";
};
config = mkIf cfg.enable {
programs.nvf = {
enable = true;
settings = {
vim = {
viAlias = true;
vimAlias = true;
lineNumberMode = "relNumber";
options = {
tabstop = 2;
shiftwidth = 2;
cursorlineopt = "screenline";
};
undoFile.enable = true;
keymaps = [
{
key = "<C-n>";
mode = [ "n" ];
action = "<CMD>Neotree toggle<CR>";
desc = "Toggles neo-tree";
}
{
key = "g=";
mode = [ "n" ];
action = "m'ggVG=''";
desc = "Reindent code";
}
];
};
};
};
};
}

View file

@ -0,0 +1,17 @@
{
programs.nvf.settings.vim = {
lsp.enable = true;
languages = {
enableLSP = true;
enableTreesitter = true;
nix.enable = true;
nix.format.type = "nixfmt";
bash.enable = true;
go.enable = true;
rust.enable = true;
python.enable = true;
enableFormat = true;
};
};
}

View file

@ -0,0 +1,3 @@
{
programs.nvf.settings.vim.statusline.lualine.enable = true;
}

View file

@ -0,0 +1,7 @@
{
programs.nvf.settings.vim.filetree.neo-tree = {
enable = true;
setupOpts = {
};
};
}

View file

@ -0,0 +1,3 @@
{
programs.nvf.settings.vim.visuals.rainbow-delimiters.enable = true;
}

View file

@ -0,0 +1,3 @@
{
programs.nvf.settings.vim.mini.surround.enable = true;
}

View file

@ -0,0 +1,3 @@
{
programs.nvf.settings.vim.telescope.enable = true;
}

View file

@ -0,0 +1,8 @@
{
programs.nvf.settings.vim.theme = {
enable = true;
name = "tokyonight";
style = "night";
};
}

View file

@ -1,64 +0,0 @@
{
config,
lib,
namespace,
...
}:
with lib;
with lib.${namespace};
let
cfg = config.${namespace}.cli.neovim;
in
{
options.${namespace}.cli.neovim = with types; {
enable = mkBoolOpt false "Whether or not to enable neovim.";
};
config = mkIf cfg.enable {
programs.nvf = {
enable = true;
settings = {
vim = {
viAlias = true;
vimAlias = true;
options = {
tabstop = 2;
shiftwidth = 2;
};
undoFile.enable = true;
theme = {
enable = true;
name = "tokyonight";
style = "night";
};
lsp.enable = true;
statusline.lualine.enable = true;
telescope.enable = true;
autocomplete.nvim-cmp.enable = true;
languages = {
enableLSP = true;
enableTreesitter = true;
nix.enable = true;
};
filetree.neo-tree = {
enable = true;
setupOpts = {
};
};
keymaps = [
{
key = "<C-n>";
mode = [ "n" ];
action = "<CMD>Neotree toggle<CR>";
desc = "Toggles neo-tree";
}
];
};
};
};
};
}