.config/nixpkgs: Download vale styles directly

Use subversion and remove nix environment dependency.

6 files changed, 23 insertions, 46 deletions

diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix
index 3245d52..05e10ba 100644
--- a/.config/nixpkgs/config.nix
+++ b/.config/nixpkgs/config.nix
@@ -56,7 +56,6 @@ in
         (callPackage ./packages/gmni/default.nix {})
         (callPackage ./packages/literate/default.nix {})
         (callPackage ./packages/systemd2nix/default.nix {})
-        (callPackage ./packages/vale-styles/default.nix {})
         (callPackage ./packages/youtube-dl/default.nix {})
         (pass.withExtensions (ext: with ext; [ (callPackage ./packages/pass-import/default.nix {}) pass-audit pass-otp ]))
         unstable.emacs
@@ -83,6 +82,7 @@ in
         fortune
         gettext
         gifsicle
+        git
         groff
         highlight
         ideviceinstaller
@@ -114,6 +114,7 @@ in
         sbcl
         silver-searcher
         sshfs
+        subversion
         surfraw
         tcl
         tmux
diff --git a/.config/nixpkgs/packages/vale-styles/default.nix b/.config/nixpkgs/packages/vale-styles/default.nix
deleted file mode 100644
index ade7b87..0000000
--- a/.config/nixpkgs/packages/vale-styles/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchgit }:
-
-stdenv.mkDerivation rec {
-
-  pname = "vale-styles";
-  version = "master";
-
-  write-good = fetchgit {
-    url = "https://github.com/errata-ai/write-good";
-    rev = "2d116619b7662d9d59201e8808254e715fc83cc8";
-    sha256 = "0nzs6wp7xsbcm481rwrijvpm5ks9z4hwcc2ydz16dfjxh1bywjq3";
-  };
-
-  microsoft = fetchgit {
-    url = "https://github.com/errata-ai/Microsoft";
-    rev = "f0628659ecbc4bbbe0a7f89a01d5045d8f1b563f";
-    sha256 = "1nqv67pr6a5nfksl8ppc2ybips3ksnpgk18bsf0038vm72y7sbvp";
-  };
-
-  google = fetchgit {
-    url = "https://github.com/errata-ai/Google";
-    rev = "17d372e40df8a797f4745da1efe8a73640483718";
-    sha256 = "090773ppb1ngl5xpl2nvrrsgjmlk8zcs2cfj4m77my28v5yfh1gn";
-  };
-
-  phases = [ "installPhase" ];
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/vale-styles
-    cp -r ${google}/Google $out/share/vale-styles/google
-    cp -r ${microsoft}/Microsoft $out/share/vale-styles/microsoft
-    cp -r ${write-good}/write-good $out/share/vale-styles/write-good
-    runHook postInstall
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Styles for a syntax-aware linter for prose built with speed and extensibility in mind.";
-  };
-}
diff --git a/.config/vale/vale.ini b/.config/vale/vale.ini
index 87abfc3..2eb8def 100644
--- a/.config/vale/vale.ini
+++ b/.config/vale/vale.ini
@@ -1,7 +1,9 @@
-StylesPath = /home/thedro/.nix-profile/share/vale-styles
-MinAlertLevel = warning
+StylesPath = /home/thedro/.config/vale/styles
+MinAlertLevel = suggestion
 
 [*.{md,txt}]
 #BasedOnStyles = google
+#BasedOnStyles = joblint
 #BasedOnStyles = microsoft
+#BasedOnStyles = proselint
 BasedOnStyles = write-good
diff --git a/.local/bin/vale b/.local/bin/vale
new file mode 100755
index 0000000..fb86fde
--- /dev/null
+++ b/.local/bin/vale
@@ -0,0 +1,16 @@
+#!/bin/sh -eu
+
+directory="$XDG_CONFIG_HOME/vale"
+styles="$directory/styles"
+mkdir -p "$directory" "$styles";
+
+if [ "${1:-}" = "--update" ]; then
+  svn export --force https://github.com/errata-ai/Google/trunk/Google         "$styles/google";
+  svn export --force https://github.com/errata-ai/joblint/trunk/Joblint       "$styles/joblint";
+  svn export --force https://github.com/errata-ai/Microsoft/trunk/Microsoft   "$styles/microsoft";
+  svn export --force https://github.com/errata-ai/proselint/trunk/proselint   "$styles/proselint";
+  svn export --force https://github.com/errata-ai/write-good/trunk/write-good "$styles/write-good";
+  exit;
+fi
+
+$(which vale --all | grep -v "local/bin" | head -n 1) --config "$directory/vale.ini" "$@";
diff --git a/.local/bin/vale-wrapper b/.local/bin/vale-wrapper
deleted file mode 100755
index 5efabd4..0000000
--- a/.local/bin/vale-wrapper
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh -eu
-vale --config "$XDG_CONFIG_HOME/vale/vale.ini" "$@"
diff --git a/.vimrc b/.vimrc
index f33bfbe..447d9ce 100644
--- a/.vimrc
+++ b/.vimrc
@@ -287,7 +287,7 @@ augroup AutoCommands
   " Linting extension post write commands.
   autocmd BufWritePost *.php      :call PHPFix()
   autocmd BufWritePost *.js       :call ESLintFix()
-  autocmd BufWritePost *.txt,*.md :only | :term ++rows=10 vale-wrapper %
+  autocmd BufWritePost *.txt,*.md :only | :term ++rows=10 vale %
   autocmd BufWritePost *.lit      silent exe '!' . expand(g:notify) . ' ' . '"$(lit % 2>&1 && printf ''Literate OK: %'')"'
 
   " Linting file type post write commands.