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

less

Browse source
This commit is contained in:
Jana Dönszelmann 2026-03-19 10:24:29 +01:00
parent 194cefe340
commit ac7e310e00
No known key found for this signature in database
9 changed files with 181 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

28
programs/nvim/default.nix
View file

@ -5,10 +5,12 @@ inputs@{ machine, ... }:
inherit inputs;
requirements = [ "cli" ];
home-config =
{ pkgs
, flakes
, lib
, ...
{
pkgs,
pkgs-unstable,
flakes,
lib,
...
}:
let
nvim_mime_types = [
@ -50,6 +52,10 @@ inputs@{ machine, ... }:
sessionVariables = {
EDITOR = "nvim";
};
packages = with pkgs-unstable; [
tree-sitter
];
};
home.file.".local/share/applications/${desktop-entry-name}.desktop" = {
@ -57,11 +63,9 @@ inputs@{ machine, ... }:
};
xdg.mimeApps.associations.added = lib.mergeAttrsList (
map
(mime: {
${mime} = [ "${desktop-entry-name}.desktop" ];
})
nvim_mime_types
map (mime: {
${mime} = [ "${desktop-entry-name}.desktop" ];
}) nvim_mime_types
);
imports = [
@ -90,11 +94,10 @@ inputs@{ machine, ... }:
performance = {
byteCompileLua.enable = true;
combinePlugins = {
enable = true;
enable = false;
standalonePlugins = [
# clashes with lualine
"onedark.nvim"
];
};
};
@ -103,7 +106,8 @@ inputs@{ machine, ... }:
extraPackages = [ pkgs.imagemagick ];
# package = (import inputs.unstable { inherit (pkgs) system; }).neovim-unwrapped;
package = pkgs.neovim-unwrapped;
# package = pkgs.neovim-unwrapped;
package = with pkgs-unstable; neovim-unwrapped;
colorschemes.onedark = {
enable = true;

86
programs/nvim/plugins.nix
View file

@ -1,4 +1,9 @@
{ pkgs, config, ... }:
{
pkgs,
pkgs-unstable,
config,
...
}:
let
render-markdown = pkgs.vimUtils.buildVimPlugin {
name = "render-markdown";
@ -127,17 +132,19 @@ in
treesitter = {
enable = true;
nixGrammars = false;
nixGrammars = true;
grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars;
nixvimInjections = false;
# package = with pkgs-unstable; tree-sitter;
settings = {
indent.enable = true;
ensure_installed = "all";
ignore_install = [
"wing"
"brightscript"
];
# ensure_installed = "all";
# ignore_install = [
# "wing"
# "brightscript"
# ];
highlight.enable = true;
@ -435,8 +442,8 @@ in
__unkeyed-1 = "filetype";
}
];
lualine_y = [{ __unkeyed-1 = "progress"; }];
lualine_z = [{ __unkeyed-1 = "location"; }];
lualine_y = [ { __unkeyed-1 = "progress"; } ];
lualine_z = [ { __unkeyed-1 = "location"; } ];
};
};
};
@ -623,36 +630,37 @@ in
};
options = {
pipeline = config.lib.nixvim.mkRaw ''
wilder.branch(
wilder.cmdline_pipeline({
language = 'python',
fuzzy = 2,
}),
wilder.python_search_pipeline({
pattern = wilder.python_fuzzy_pattern(),
sorter = wilder.python_difflib_sorter(),
engine = 're',
}),
wilder.substitute_pipeline({
pipeline = wilder.python_search_pipeline({
skip_cmdtype_check = 1,
pattern = wilder.python_fuzzy_pattern({
start_at_boundary = 0,
}),
}),
}),
{
wilder.check(function(ctx, x) return x == "" end),
wilder.history(),
},
wilder.python_file_finder_pipeline({
file_command = {'${pkgs.ripgrep}/bin/rg', '--files'},
dir_command = {'${pkgs.fd}/bin/fd', '-td'},
filters = {'cpsm_filter'},
})
)
'';
# pipeline = config.lib.nixvim.mkRaw "";
#''
# wilder.branch(
# wilder.cmdline_pipeline({
# language = 'python',
# fuzzy = 2,
# }),
# wilder.python_search_pipeline({
# pattern = wilder.python_fuzzy_pattern(),
# sorter = wilder.python_difflib_sorter(),
# engine = 're',
# }),
# wilder.substitute_pipeline({
# pipeline = wilder.python_search_pipeline({
# skip_cmdtype_check = 1,
# pattern = wilder.python_fuzzy_pattern({
# start_at_boundary = 0,
# }),
# }),
# }),
# {
# wilder.check(function(ctx, x) return x == "" end),
# wilder.history(),
# },
# wilder.python_file_finder_pipeline({
# file_command = {'${pkgs.ripgrep}/bin/rg', '--files'},
# dir_command = {'${pkgs.fd}/bin/fd', '-td'},
# filters = {'cpsm_filter'},
# })
# )
# '';
renderer = config.lib.nixvim.mkRaw ''
(function()