From ee1a10564a734f72d99eb059e25b5d1a77a714cc Mon Sep 17 00:00:00 2001
From: Andre <andre@8bitbuddhism.com>
Date: Sat, 28 Sep 2024 17:22:11 -0400
Subject: [PATCH] Apps: remove LanguageTool (again) and use a self-hosted
 service instead

---
 bin/nixos-upgrade-script.sh |  2 +-
 hosts/Khanda/default.nix    |  8 +-------
 hosts/Shura/default.nix     |  6 +-----
 modules/apps/writing.nix    | 24 +-----------------------
 4 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/bin/nixos-upgrade-script.sh b/bin/nixos-upgrade-script.sh
index 179a86e..c7ae665 100755
--- a/bin/nixos-upgrade-script.sh
+++ b/bin/nixos-upgrade-script.sh
@@ -23,7 +23,7 @@ function usage() {
 
 function run_operation {
 	echo "Full operation: nixos-rebuild $1 --flake $flakeDir#$hostname $( [ "$buildHost" != "" ] && echo "--build-host $buildHost" ) $remainingArgs --use-remote-sudo"
-	nixos-rebuild $operation --flake .#$hostname $remainingArgs --use-remote-sudo
+	nixos-rebuild $operation --flake .#$hostname $remainingArgs --use-remote-sudo --log-format multiline-with-logs
 
 	# Only request super-user permission if we're switching
 	#if [[ "$1" =~ ^(switch|boot|test)$ ]]; then
diff --git a/hosts/Khanda/default.nix b/hosts/Khanda/default.nix
index e26fa71..d021fd0 100644
--- a/hosts/Khanda/default.nix
+++ b/hosts/Khanda/default.nix
@@ -25,13 +25,7 @@ in
       office.enable = true;
       recording.enable = true;
       social.enable = true;
-      writing = {
-        enable = true;
-        languagetool = {
-          enable = true;
-          ngrams.enable = true;
-        };
-      };
+      writing.enable = true;
     };
 
     # Enable Secure Boot support.
diff --git a/hosts/Shura/default.nix b/hosts/Shura/default.nix
index 1a841e3..b0e6840 100644
--- a/hosts/Shura/default.nix
+++ b/hosts/Shura/default.nix
@@ -52,11 +52,7 @@ in
     # Enable GPU support.
     gpu.amd.enable = true;
 
-    nixos-upgrade-script = {
-      enable = true;
-      configDir = config.secrets.nixConfigFolder;
-      user = config.users.users.aires.name;
-    };
+    nixos-upgrade-script.enable = true;
 
     packages = with pkgs; [
       boinc # Boinc client
diff --git a/modules/apps/writing.nix b/modules/apps/writing.nix
index 82c5f05..9e751be 100644
--- a/modules/apps/writing.nix
+++ b/modules/apps/writing.nix
@@ -10,17 +10,7 @@ let
 in
 {
   options = {
-    aux.system.apps.writing = {
-      enable = lib.mkEnableOption "Enables writing and editing tools";
-
-      languagetool = {
-        enable = lib.mkEnableOption (lib.mdDoc "Enables local Language Tool server.");
-        # WARNING: Ngrams package requires a lot of RAM
-        ngrams.enable = lib.mkEnableOption (
-          lib.mdDoc "Enables ngrams for improved grammar detection (warning: results in an 8GB+ download)."
-        );
-      };
-    };
+    aux.system.apps.writing.enable = lib.mkEnableOption "Enables writing and editing tools";
   };
 
   config = lib.mkIf cfg.enable {
@@ -31,17 +21,5 @@ in
       haskellPackages.pandoc-crossref
       texliveSmall
     ];
-
-    # Spelling and grammer checking: hosted on localhost:8081
-    services.languagetool = lib.mkIf cfg.languagetool.enable {
-      enable = true;
-      port = 8090;
-      public = false;
-      allowOrigin = "*";
-      # Enable Ngrams
-      settings.languageModel = lib.mkIf cfg.languagetool.ngrams.enable "${
-        (pkgs.callPackage ../../packages/languagetool-ngrams.nix { inherit pkgs lib; })
-      }/share/languagetool/ngrams";
-    };
   };
 }