NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-02-05 03:15:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge 5dff56daab into 92854bd0ea

Browse source
This commit is contained in:
mewoocat 2026-02-03 17:46:18 -05:00 • committed by GitHub
commit dd491fc82c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 63 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/plugins/languages/markdown.nix
View file

@ -13,6 +13,7 @@
inherit (lib.nvim.types) diagnostics mkGrammarOption mkPluginSetupOption deprecatedSingleOrListOf;
inherit (lib.nvim.dag) entryAnywhere;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.nvim.languages) setLanguageIndent;
inherit (lib.trivial) warn;
cfg = config.vim.languages.markdown;
@ -218,5 +219,8 @@ in {
cfg.extraDiagnostics.types);
};
})
# todo
]);
}

31
modules/plugins/languages/nix.nix
View file

@ -4,14 +4,15 @@
lib,
...
}: let
inherit (builtins) attrNames;
inherit (builtins) attrNames toString;
inherit (lib) concatStringsSep;
inherit (lib.meta) getExe;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum;
inherit (lib.types) enum int nullOr;
inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.nvim.languages) setLanguageIndent;
cfg = config.vim.languages.nix;
@ -106,6 +107,24 @@ in {
inherit defaultDiagnosticsProvider;
};
};
tabstop = mkOption {
description = "Sets the tabstop size in spaces for .nix files";
type = nullOr int;
default = null;
};
softtabstop = mkOption {
description = "Sets the softtabstop size in spaces for .nix files";
type = nullOr int;
default = null;
};
shiftwidth = mkOption {
description = "Sets the shiftwidth in spaces for .nix files";
type = nullOr int;
default = null;
};
};
config = mkIf cfg.enable (mkMerge [
@ -160,5 +179,13 @@ in {
cfg.extraDiagnostics.types);
};
})
(setLanguageIndent {
language = "nix";
tabstop = cfg.tabstop;
softtabstop = cfg.softtabstop;
shiftwidth = cfg.shiftwidth;
})
]);
}