1
0
Fork 0

Fix vale management for nix flake check

This commit is contained in:
Ethan Reece 2025-07-10 06:25:41 -05:00
parent ff3ef64898
commit 15c9a4a6a1
Signed by: me
GPG key ID: 198E9EB433DB1B28
4 changed files with 69 additions and 24 deletions

1
.envrc
View file

@ -1,3 +1,4 @@
watch_file ./home watch_file ./home
watch_file ./languages watch_file ./languages
watch_file ./.vale/styles
use flake use flake

2
.gitignore vendored
View file

@ -1,4 +1,4 @@
.direnv .direnv
.helix .helix
.pre-commit-config.yaml .pre-commit-config.yaml
.vale/styles/config/vocabularies/General/ .vale/.vale.ini

View file

@ -77,6 +77,7 @@
else else
rValue rValue
) rhs); ) rhs);
tomlFormatter = pkgs.formats.toml { };
pkgs = import inputs.nixpkgs { pkgs = import inputs.nixpkgs {
inherit system; inherit system;
overlays = [ overlays = [
@ -116,8 +117,7 @@
acc: cfg: acc // (cfg.devshell.devshellStartup or { }) acc: cfg: acc // (cfg.devshell.devshellStartup or { })
) { } configs; ) { } configs;
}; };
helixLanguagesFormat = pkgs.formats.toml { }; helixLanguagesFile = tomlFormatter.generate "languages.toml" helixLanguages;
helixLanguagesFile = helixLanguagesFormat.generate "languages.toml" helixLanguages;
in in
{ {
_module.args.pkgs = pkgs; _module.args.pkgs = pkgs;

View file

@ -7,13 +7,51 @@ let
"NixOS" "NixOS"
]; ];
tomlFormatter = pkgs.formats.toml { }; tomlFormatter = pkgs.formats.toml { };
valeDictionary = { vale = {
directory = "./.vale/styles/config/vocabularies/General"; valeDirectory = ".vale";
stylesDirectory = "styles";
dictionary = {
directory = "config/vocabularies/General";
filename = "accept.txt"; filename = "accept.txt";
content = builtins.concatStringsSep "\n" dictionary; content = builtins.concatStringsSep "\n" dictionary;
file = builtins.toFile valeDictionary.filename valeDictionary.content; file = pkgs.writeTextFile {
name = vale.dictionary.filename;
text = vale.dictionary.content;
}; };
typosConfig = { };
config = {
filename = ".vale.ini";
content = ''
StylesPath = styles
MinAlertLevel = suggestion
Vocab = General
# https://vale.sh/explorer
Packages = RedHat, proselint, write-good, alex
[*.{md}]
BasedOnStyles = Vale, RedHat, proselint, write-good, alex
'';
file = pkgs.writeTextFile {
name = vale.config.filename;
text = vale.config.content;
};
};
directory = {
base = ../.vale/styles;
full = pkgs.runCommand vale.valeDirectory { } ''
${pkgs.uutils-coreutils-noprefix}/bin/mkdir -p $out/${vale.stylesDirectory}/${vale.dictionary.directory}
${pkgs.uutils-coreutils-noprefix}/bin/cp -r ${vale.directory.base}/* $out/${vale.stylesDirectory}
${pkgs.uutils-coreutils-noprefix}/bin/ln -fs ${vale.dictionary.file} $out/${vale.stylesDirectory}/${vale.dictionary.directory}/${vale.dictionary.filename}
${pkgs.uutils-coreutils-noprefix}/bin/ln -fs ${vale.config.file} $out/${vale.config.filename};
'';
configFile = "${vale.directory.full}/${vale.config.filename}";
};
};
typos = {
content = {
default.extendWords = builtins.listToAttrs ( default.extendWords = builtins.listToAttrs (
builtins.map (x: { builtins.map (x: {
name = x; name = x;
@ -21,7 +59,8 @@ let
}) dictionary }) dictionary
); );
}; };
typosConfigFile = tomlFormatter.generate "typos.toml" typosConfig; file = tomlFormatter.generate "typos.toml" typos.content;
};
in in
{ {
helix.language-server = { helix.language-server = {
@ -31,27 +70,33 @@ in
config.ltex.dictionary.en-US = dictionary; config.ltex.dictionary.en-US = dictionary;
}; };
# https://vale.sh/docs/formats/code # https://vale.sh/docs/formats/code
vale-ls.command = "${pkgs.vale-ls}/bin/vale-ls"; vale-ls = {
command = "${pkgs.vale-ls}/bin/vale-ls";
config.configPath = vale.directory.configFile;
};
# https://writewithharper.com/docs/integrations/language-server#Supported-Languages # https://writewithharper.com/docs/integrations/language-server#Supported-Languages
harper-ls.command = "${pkgs.harper}/bin/harper-ls"; harper-ls.command = "${pkgs.harper}/bin/harper-ls";
typos = { typos = {
command = "${pkgs.typos-lsp}/bin/typos-lsp"; command = "${pkgs.typos-lsp}/bin/typos-lsp";
config.config = typosConfigFile.outPath; config.config = typos.file.outPath;
}; };
}; };
pre-commit = { pre-commit = {
typos = { typos = {
enable = true; enable = true;
settings = { settings = {
configPath = typosConfigFile.outPath; configPath = typos.file.outPath;
locale = "en-us"; locale = "en-us";
}; };
}; };
vale.enable = true; vale = {
enable = true;
config.configPath = vale.directory.configFile;
};
}; };
treefmt.programs.typos = { treefmt.programs.typos = {
enable = true; enable = true;
configFile = typosConfigFile.outPath; configFile = typos.file.outPath;
locale = "en-us"; locale = "en-us";
}; };
devshell = { devshell = {
@ -59,14 +104,13 @@ in
{ {
help = "sync vale configuration"; help = "sync vale configuration";
name = "vale-sync"; name = "vale-sync";
command = "${pkgs.vale}/bin/vale sync"; command = "${pkgs.vale}/bin/vale sync --config ${vale.valeDirectory}/${vale.config.filename}";
} }
]; ];
packages = [ pkgs.vale ]; packages = [ pkgs.vale ];
devshellStartup = { devshellStartup = {
vale_config.text = '' vale_config.text = ''
mkdir -p ${valeDictionary.directory} ${pkgs.uutils-coreutils-noprefix}/bin/ln -fs ${vale.config.file} ${vale.valeDirectory}/${vale.config.filename}
${pkgs.uutils-coreutils-noprefix}/bin/ln -fs ${valeDictionary.file} ${valeDictionary.directory}/${valeDictionary.filename}
''; '';
}; };
}; };