jana/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix nixvim
Some checks failed
/ lint (push) Failing after 30s
Details

Browse source
This commit is contained in:
Jana Dönszelmann 2026-01-25 09:41:29 +01:00
parent e3f3e75285
commit 84644d3675
No known key found for this signature in database
4 changed files with 164 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -188,7 +188,7 @@
shellHook = "exec $NIX_BUILD_SHELL"; shellHook = "exec $NIX_BUILD_SHELL";
}; };
formatter = pkgs.nixfmt-rfc-style; formatter = pkgs.nixfmt;
} }
); );

9
hosts/kili/configuration.nix
View file

@ -110,7 +110,14 @@
]; ];
hardware.graphics.enable = true; hardware.graphics.enable = true;
hardware.graphics.extraPackages = [ pkgs.libva-vdpau-driver ]; hardware.graphics.extraPackages = with pkgs; [
libva-vdpau-driver
intel-media-driver
];
environment.sessionVariables = {
LIBVA_DRIVER_NAME = "iHD";
};
hardware.nvidia = { hardware.nvidia = {
modesetting.enable = true; modesetting.enable = true;
powerManagement.enable = true; powerManagement.enable = true;

1
programs/default.nix
View file

@ -39,6 +39,7 @@
requirements = [ "cli" ]; requirements = [ "cli" ];
home-config = _: { home-config = _: {
home.packages = with pkgs; [ home.packages = with pkgs; [
rustup
sops sops
]; ];
}; };

300
programs/nvim/plugins.nix
View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, config, ... }:
let let
render-markdown = pkgs.vimUtils.buildVimPlugin { render-markdown = pkgs.vimUtils.buildVimPlugin {
name = "render-markdown"; name = "render-markdown";
@ -24,97 +24,98 @@ in
plugins = { plugins = {
treesitter-textobjects = { treesitter-textobjects = {
enable = false; enable = false;
lspInterop.enable = true; settings = {
lsp_interop.enable = true;
select = {
enable = true;
select = { keymaps = {
enable = true; "ai" = {
query = "@impl.outer";
};
"ii" = {
query = "@impl.inner";
};
"af" = {
query = "@function.outer";
};
"if" = {
query = "@function.inner";
};
keymaps = { "ac" = {
"ai" = { query = "@conditional.outer";
query = "@impl.outer"; };
}; "ic" = {
"ii" = { query = "@conditional.inner";
query = "@impl.inner"; };
}; "al" = {
"af" = { query = "@loop.outer";
query = "@function.outer"; };
}; "il" = {
"if" = { query = "@loop.inner";
query = "@function.inner"; };
};
"ac" = {
query = "@conditional.outer";
};
"ic" = {
query = "@conditional.inner";
};
"al" = {
query = "@loop.outer";
};
"il" = {
query = "@loop.inner";
}; };
}; };
};
move = { move = {
enable = true; enable = true;
setJumps = true; set_jumps = true;
gotoNextStart = { goto_next_start = {
"]f" = { "]f" = {
query = "@function.outer"; query = "@function.outer";
};
"]c" = {
query = "@conditional.outer";
};
"]l" = {
query = "@loop.outer";
};
"]i" = {
query = "@impl.outer";
};
}; };
"]c" = { goto_next_end = {
query = "@conditional.outer"; "]F" = {
query = "@function.outer";
};
"]C" = {
query = "@conditional.outer";
};
"]L" = {
query = "@loop.outer";
};
"]I" = {
query = "@impl.outer";
};
}; };
"]l" = { goto_previous_start = {
query = "@loop.outer"; "[f" = {
query = "@function.outer";
};
"[c" = {
query = "@conditional.outer";
};
"[l" = {
query = "@loop.outer";
};
"[i" = {
query = "@impl.outer";
};
}; };
"]i" = { goto_previous_end = {
query = "@impl.outer"; "[F" = {
}; query = "@function.outer";
}; };
gotoNextEnd = { "[C" = {
"]F" = { query = "@conditional.outer";
query = "@function.outer"; };
}; "[L" = {
"]C" = { query = "@loop.outer";
query = "@conditional.outer"; };
}; "[I" = {
"]L" = { query = "@impl.outer";
query = "@loop.outer"; };
};
"]I" = {
query = "@impl.outer";
};
};
gotoPreviousStart = {
"[f" = {
query = "@function.outer";
};
"[c" = {
query = "@conditional.outer";
};
"[l" = {
query = "@loop.outer";
};
"[i" = {
query = "@impl.outer";
};
};
gotoPreviousEnd = {
"[F" = {
query = "@function.outer";
};
"[C" = {
query = "@conditional.outer";
};
"[L" = {
query = "@loop.outer";
};
"[I" = {
query = "@impl.outer";
}; };
}; };
}; };
@ -377,11 +378,14 @@ in
lspsaga = { lspsaga = {
enable = true; enable = true;
lightbulb.enable = false; settings = {
codeAction.keys = { lightbulb.enable = false;
quit = "<Esc>"; code_action.keys = {
quit = "<Esc>";
};
symbol_in_winbar.enable = false;
implement.enable = true;
}; };
symbolInWinbar.enable = false;
}; };
typst-vim = { typst-vim = {
@ -479,7 +483,7 @@ in
nil_ls = { nil_ls = {
enable = true; enable = true;
settings = { settings = {
formatting.command = [ "${(pkgs.lib.getExe pkgs.nixfmt-rfc-style)}" ]; formatting.command = [ "${(pkgs.lib.getExe pkgs.nixfmt)}" ];
}; };
extraOptions = { extraOptions = {
nix = { nix = {
@ -562,22 +566,25 @@ in
wilder = { wilder = {
enable = true; enable = true;
modes = [
"/"
":"
"?"
];
enableCmdlineEnter = true;
beforeCursor = true;
useCmdlinechanged = true;
nextKey = "<Tab>"; settings = {
prevKey = "<S-Tab>"; modes = [
acceptKey = "<Down>"; "/"
rejectKey = "<Up>"; ":"
"?"
];
enable_cmdline_enter = true;
before_cursor = true;
use_cmdlinechanged = true;
pipeline = [ next_key = "<Tab>";
'' prev_key = "<S-Tab>";
accept_key = "<Down>";
reject_key = "<Up>";
};
options = {
pipeline = config.lib.nixvim.mkRaw ''
wilder.branch( wilder.branch(
wilder.cmdline_pipeline({ wilder.cmdline_pipeline({
language = 'python', language = 'python',
@ -606,55 +613,56 @@ in
filters = {'cpsm_filter'}, filters = {'cpsm_filter'},
}) })
) )
'' '';
];
renderer = ''
(function()
local highlighters = {
wilder.pcre2_highlighter(),
-- wilder.lua_fzy_highlighter(),
}
local popupmenu_renderer = wilder.popupmenu_renderer( renderer = config.lib.nixvim.mkRaw ''
wilder.popupmenu_border_theme({ (function()
border = 'rounded', local highlighters = {
empty_message = wilder.popupmenu_empty_message_with_spinner(), wilder.pcre2_highlighter(),
highlighter = highlighters, -- wilder.lua_fzy_highlighter(),
}
local popupmenu_renderer = wilder.popupmenu_renderer(
wilder.popupmenu_border_theme({
border = 'rounded',
empty_message = wilder.popupmenu_empty_message_with_spinner(),
highlighter = highlighters,
highlights = {
accent = wilder.make_hl('WilderAccent', 'Pmenu', {{a = 1}, {a = 1}, {foreground = '#f4468f'}}),
},
left = {
' ',
wilder.popupmenu_devicons(),
wilder.popupmenu_buffer_flags({
flags = ' a + ',
icons = {['+'] = '', a = '', h = ''},
}),
},
right = {
' ',
wilder.popupmenu_scrollbar(),
},
})
)
local wildmenu_renderer = wilder.wildmenu_renderer({
highlights = { highlights = {
accent = wilder.make_hl('WilderAccent', 'Pmenu', {{a = 1}, {a = 1}, {foreground = '#f4468f'}}), accent = wilder.make_hl('WilderAccent', 'Pmenu', {{a = 1}, {a = 1}, {foreground = '#f4468f'}}),
}, },
left = { highlighter = highlighters,
' ', separator = ' · ',
wilder.popupmenu_devicons(), left = {' ', wilder.wildmenu_spinner(), ' '},
wilder.popupmenu_buffer_flags({ right = {' ', wilder.wildmenu_index()},
flags = ' a + ',
icons = {['+'] = '', a = '', h = ''},
}),
},
right = {
' ',
wilder.popupmenu_scrollbar(),
},
}) })
)
local wildmenu_renderer = wilder.wildmenu_renderer({ return wilder.renderer_mux({
highlights = { [':'] = popupmenu_renderer,
accent = wilder.make_hl('WilderAccent', 'Pmenu', {{a = 1}, {a = 1}, {foreground = '#f4468f'}}), ['/'] = wildmenu_renderer,
}, substitute = wildmenu_renderer,
highlighter = highlighters, })
separator = ' · ', end)()
left = {' ', wilder.wildmenu_spinner(), ' '}, '';
right = {' ', wilder.wildmenu_index()}, };
})
return wilder.renderer_mux({
[':'] = popupmenu_renderer,
['/'] = wildmenu_renderer,
substitute = wildmenu_renderer,
})
end)()
'';
}; };
floaterm = { floaterm = {