add discord (openasar/vencord), finalize arxiv server, switch to APL385

4 files changed, 48 insertions, 12 deletions

diff --git a/hosts/navi/default.nix b/hosts/navi/default.nix
index c6d5db5..6d01de2 100644
--- a/hosts/navi/default.nix
+++ b/hosts/navi/default.nix
@@ -119,20 +119,55 @@
 
           installPhase = ''
             install -D ${src}/Pragmata_Pro_Bold_Italic.otf $out/share/fonts/opentype/Pragmata_Pro_Bold_Italic.otf
-            install -D ${src}/Pragmata_Pro_Bold.otf $out/share/fonts/opentype/Pragmata_Pro_Bold.otf
-            install -D ${src}/Pragmata_Pro_Italic.otf $out/share/fonts/opentype/Pragmata_Pro_Italic.otf
-            install -D ${src}/Pragmata_Pro_Mono_Bold_Italic.otf $out/share/fonts/opentype/Pragmata_Pro_Mono_Bold_Italic.otf
-            install -D ${src}/Pragmata_Pro_Mono_Bold.otf $out/share/fonts/opentype/Pragmata_Pro_Mono_Bold.otf
-            install -D ${src}/Pragmata_Pro_Mono_Italic.otf $out/share/fonts/opentype/Pragmata_Pro_Mono_Italic.otf
-            install -D ${src}/Pragmata_Pro_Mono_Regular.otf $out/share/fonts/opentype/Pragmata_Pro_Mono_Regular.otf
-            install -D ${src}/Pragmata_Pro_Regular.otf $out/share/fonts/opentype/Pragmata_Pro_Regular.otf
+                   install -D ${src}/Pragmata_Pro_Bold.otf $out/share/fonts/opentype/Pragmata_Pro_Bold.otf
+                   install -D ${src}/Pragmata_Pro_Italic.otf $out/share/fonts/opentype/Pragmata_Pro_Italic.otf
+                   install -D ${src}/Pragmata_Pro_Mono_Bold_Italic.otf $out/share/fonts/opentype/Pragmata_Pro_Mono_Bold_Italic.otf
+                   install -D ${src}/Pragmata_Pro_Mono_Bold.otf $out/share/fonts/opentype/Pragmata_Pro_Mono_Bold.otf
+                   install -D ${src}/Pragmata_Pro_Mono_Italic.otf $out/share/fonts/opentype/Pragmata_Pro_Mono_Italic.otf
+                   install -D ${src}/Pragmata_Pro_Mono_Regular.otf $out/share/fonts/opentype/Pragmata_Pro_Mono_Regular.otf
+                   install -D ${src}/Pragmata_Pro_Regular.otf $out/share/fonts/opentype/Pragmata_Pro_Regular.otf
           '';
         })
+        (pkgs.stdenv.mkDerivation rec {
+          name = "APL";
+          version = "1.0";
+          src = pkgs.linkFarm "APL" [
+            {
+              name = "APL333.ttf";
+              path =
+                pkgs.fetchurl
+                {
+                  url = "https://www.dyalog.com/uploads/files/download.php?file=fonts_and_keyboards/APL333.ttf";
+                  hash = "sha256-rvwaHOvoU+p9huY7ZGiX5TrWr5XYSBelFm9IU4S6NQ4=";
+                };
+            }
+            {
+              name = "APL385.ttf";
+              path =
+                pkgs.fetchurl
+                {
+                  url = "https://www.dyalog.com/uploads/files/download.php?file=fonts_and_keyboards/Apl385.ttf";
+                  hash = "sha256-Hs4dom9BCM3tDLSkQd2RbEs6UFy0KqlLgOFxtIBOFwU=";
+                };
+            }
+          ];
+          installPhase = ''
+            install -D ${src}/APL333.ttf $out/share/fonts/truetype/APL333.ttf
+            install -D ${src}/APL385.ttf $out/share/fonts/truetype/APL385.ttf
+
+          '';
+        })
+        pkgs.apl386
 
         (pkgs.cutter.withPlugins (ps: with ps; [rz-ghidra sigdb]))
+
+        (pkgs.discord.override {
+          withOpenASAR = true;
+          withVencord = true;
+        })
       ];
 
-      programs.foot.settings.main.font = "Pragmata Pro Mono:size=20";
+      programs.foot.settings.main.font = "APL385 Unicode:size=20";
       # programs.qutebrowser = {
       #   enable = true;
       #   settings.colors.webpage.darkmode.enabled = true;
diff --git a/hosts/vps/services/arXiv.nix b/hosts/vps/services/arXiv.nix
index 4e45a11..d53d805 100644
--- a/hosts/vps/services/arXiv.nix
+++ b/hosts/vps/services/arXiv.nix
@@ -17,16 +17,16 @@
     arXiv-randomizer = builtins.fetchGit {
       url = "https://git.tzlil.net/arXiv.git";
       ref = "master";
-      rev = "d09927ca6f7af2404e9c3a09a6e99dfdd1e87577";
+      rev = "fe2d2f0dcc7ae16906a318bf96a651f135649ae7";
     };
   in {
     after = ["network.target"];
     wantedBy = ["multi-user.target"];
-    script = "${lib.getExe python} -m gunicorn -w 5 --log-level debug -b 0.0.0.0:3000 --timeout 90 app:app";
+    script = "${lib.getExe python} -m gunicorn -w 1 --log-level debug -b 0.0.0.0:3000 --timeout 90 app:app";
     serviceConfig = {
       Restart = "on-failure";
       RestartSec = 0;
-      WorkingDirectory="${arXiv-randomizer}";
+      WorkingDirectory = "${arXiv-randomizer}";
     };
   };
 
diff --git a/hosts/vps/services/matrix.nix b/hosts/vps/services/matrix.nix
index af38f58..a3be7a2 100644
--- a/hosts/vps/services/matrix.nix
+++ b/hosts/vps/services/matrix.nix
@@ -121,7 +121,7 @@
       }
 
       {
-        directory = "/var/lib/private/dendrite";
+        directory = "/var/lib/dendrite";
         user = "dendrite";
         group = "dendrite";
       }
diff --git a/mixins/cli.nix b/mixins/cli.nix
index ab01eb4..ba48fd7 100644
--- a/mixins/cli.nix
+++ b/mixins/cli.nix
@@ -18,6 +18,7 @@
           ripgrep
           bat
           jq
+	  file
 
           # p2p file transfer
           croc