.envrc

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

.gitignore

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

.vale.ini

@@ -0,0 +1,11 @@
+StylesPath = .vale/styles
+
+MinAlertLevel = suggestion
+
+Vocab = General
+
+# https://vale.sh/explorer
+Packages = RedHat, proselint, write-good, alex
+
+[*.{md}]
+BasedOnStyles = Vale, RedHat, proselint, write-good, alex

flake.nix

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

languages/en-us.nix

@@ -7,51 +7,13 @@ let
     "NixOS"
   ];
   tomlFormatter = pkgs.formats.toml { };
-  vale = {
+  valeDictionary = {
-    valeDirectory = ".vale";
+    directory = "./.vale/styles/config/vocabularies/General";
-    stylesDirectory = "styles";
-    dictionary = {
-      directory = "config/vocabularies/General";
     filename = "accept.txt";
     content = builtins.concatStringsSep "\n" dictionary;
-      file = pkgs.writeTextFile {
+    file = builtins.toFile valeDictionary.filename valeDictionary.content;
-        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 (
       builtins.map (x: {
         name = x;
@@ -59,8 +21,7 @@ let
       }) dictionary
     );
   };
-    file = tomlFormatter.generate "typos.toml" typos.content;
+  typosConfigFile = tomlFormatter.generate "typos.toml" typosConfig;
-  };
 in
 {
   helix.language-server = {
@@ -70,33 +31,27 @@ in
       config.ltex.dictionary.en-US = dictionary;
     };
     # https://vale.sh/docs/formats/code
-    vale-ls = {
+    vale-ls.command = "${pkgs.vale-ls}/bin/vale-ls";
-      command = "${pkgs.vale-ls}/bin/vale-ls";
-      config.configPath = vale.directory.configFile;
-    };
     # https://writewithharper.com/docs/integrations/language-server#Supported-Languages
     harper-ls.command = "${pkgs.harper}/bin/harper-ls";
     typos = {
       command = "${pkgs.typos-lsp}/bin/typos-lsp";
-      config.config = typos.file.outPath;
+      config.config = typosConfigFile.outPath;
     };
   };
   pre-commit = {
     typos = {
       enable = true;
       settings = {
-        configPath = typos.file.outPath;
+        configPath = typosConfigFile.outPath;
         locale = "en-us";
       };
     };
-    vale = {
+    vale.enable = true;
-      enable = true;
-      settings.configPath = vale.directory.configFile;
-    };
   };
   treefmt.programs.typos = {
     enable = true;
-    configFile = typos.file.outPath;
+    configFile = typosConfigFile.outPath;
     locale = "en-us";
   };
   devshell = {
@@ -104,13 +59,14 @@ in
       {
         help = "sync vale configuration";
         name = "vale-sync";
-        command = "${pkgs.vale}/bin/vale sync --config ${vale.valeDirectory}/${vale.config.filename}";
+        command = "${pkgs.vale}/bin/vale sync";
       }
     ];
     packages = [ pkgs.vale ];
     devshellStartup = {
       vale_config.text = ''
-        ${pkgs.uutils-coreutils-noprefix}/bin/ln -fs ${vale.config.file} ${vale.valeDirectory}/${vale.config.filename}
+        mkdir -p ${valeDictionary.directory}
+        ${pkgs.uutils-coreutils-noprefix}/bin/ln -fs ${valeDictionary.file} ${valeDictionary.directory}/${valeDictionary.filename}
       '';
     };
   };

languages/markdown.nix

@@ -36,5 +36,6 @@
   };
   pre-commit = {
     markdownlint.enable = true;
+    vale.enable = true;
   };
 }