stuff

3 files changed, 128 insertions, 32 deletions

diff --git a/hosts/navi/default.nix b/hosts/navi/default.nix
index 6d01de2..22f253b 100644
--- a/hosts/navi/default.nix
+++ b/hosts/navi/default.nix
@@ -15,8 +15,9 @@
     ../../mixins/pipewire.nix
     ../../mixins/multimedia.nix
     ../../mixins/syncthing.nix
-    ../../mixins/firefox
-    # ../../mixins/firefox/absolute-minimum.nix
+    # ../../mixins/firefox
+    ../../mixins/firefox/minimum
+    # ../../mixins/firefox/abs
   ];
 
   config = {
@@ -105,6 +106,21 @@
       };
     };
 
+    # mullvad
+    age.secrets.mullvad.file = ../../secrets/mullvad.age;
+    services.mullvad-vpn = {
+      enable = true;
+    };
+    systemd.services."mullvad-daemon".postStart = let
+      mullvad = config.services.mullvad-vpn.package;
+    in ''
+      while ! ${lib.getExe mullvad} status >/dev/null; do sleep 1; done
+      ${lib.getExe mullvad} account login < ${config.age.secrets.mullvad.path}
+      ${lib.getExe mullvad} auto-connect set on
+      ${lib.getExe mullvad} lockdown-mode set on
+      ${lib.getExe mullvad} tunnel ipv6 set on
+    '';
+
     home-manager.users.tzlil = {
       home.packages = [
         pkgs.schildichat-desktop-wayland
@@ -112,22 +128,88 @@
         pkgs.gtkcord4
         pkgs.cmst
 
-        (pkgs.stdenv.mkDerivation rec {
-          name = "pragmata";
-          version = "1.0";
-          src = ./pragmata;
+        # (pkgs.stdenv.mkDerivation rec {
+        #   name = "pragmata";
+        #   version = "1.0";
+        #   src = ./pragmata;
 
-          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
-          '';
+        #   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
+        #   '';
+        # })
+        # (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 = "APL385 Unicode:size=20";
+      # programs.qutebrowser = {
+      #   enable = true;
+      #   settings.colors.webpage.darkmode.enabled = true;
+      # };
+
+      xdg.configFile."keepassxc/keepassxc.ini".text = lib.generators.toINI {} {
+        General = {ConfigVersion = 2;};
+        Browser = {
+          AlwaysAllowAccess = true;
+          Enabled = true;
+        };
+        GUI = {ApplicationTheme = "dark";};
+      };
+      home.file.".cache/keepassxc/keepassxc.ini".text = lib.generators.toINI {} {
+        General = {LastActiveDatabase = "${config.services.syncthing.dataDir}/passwords/passwords.kdbx";};
+      };
+      home.file.".mozilla/native-messaging-hosts/org.keepassxc.keepassxc_browser.json".text = builtins.toJSON {
+        allowed_extensions = ["keepassxc-browser@keepassxc.org"];
+        description = "KeePassXC integration with native messaging support";
+        name = "org.keepassxc.keepassxc_browser";
+        path = "${pkgs.keepassxc}/bin/keepassxc-proxy";
+        type = "stdio";
+      };
+    };
+
+    fonts = {
+      packages = [
         (pkgs.stdenv.mkDerivation rec {
           name = "APL";
           version = "1.0";
@@ -157,21 +239,13 @@
 
           '';
         })
-        pkgs.apl386
-
-        (pkgs.cutter.withPlugins (ps: with ps; [rz-ghidra sigdb]))
-
-        (pkgs.discord.override {
-          withOpenASAR = true;
-          withVencord = true;
-        })
       ];
 
-      programs.foot.settings.main.font = "APL385 Unicode:size=20";
-      # programs.qutebrowser = {
-      #   enable = true;
-      #   settings.colors.webpage.darkmode.enabled = true;
-      # };
+      fontconfig.defaultFonts = {
+        serif = ["APL385 Unicode"];
+        sansSerif = ["APL385 Unicode"];
+        monospace = ["APL385 Unicode"];
+      };
     };
 
     programs.steam.enable = true;
@@ -196,7 +270,7 @@
       driSupport32Bit = true;
     };
 
-    networking.firewall.allowedTCPPorts = [25565];
+    networking.firewall.allowedTCPPorts = [25565 22753];
 
     services = {
       power-profiles-daemon.enable = true;
diff --git a/hosts/navi/hardware-configuration.nix b/hosts/navi/hardware-configuration.nix
index aa88984..28094f1 100644
--- a/hosts/navi/hardware-configuration.nix
+++ b/hosts/navi/hardware-configuration.nix
@@ -70,7 +70,7 @@ in {
     nodev."/" = {
       fsType = "tmpfs";
       mountOptions = [
-        "size=2G"
+        "size=4G"
         "defaults"
         "mode=755"
       ];
diff --git a/hosts/vps/services/website.nix b/hosts/vps/services/website.nix
index f3ef7b8..95dea73 100644
--- a/hosts/vps/services/website.nix
+++ b/hosts/vps/services/website.nix
@@ -50,8 +50,30 @@
              }
              </style>
              <pre>
+            ~?~+=I?~~IIIII++,:   .?= .,I=O8OZ.DNNO, ZD7:::=.? ,,:,,I,,:,~+?II?I?II?=+=~+7$ZO
+            ?==++??==+I???7..:.   :II$77?I+ID~NND8.ZMN7~=~I7:,., :?7,.,.~+?I???????,+~7+$ZOZ
+            7+===I+~===?I77:  ?   ,$7$.:.,I?=7NNNINMMMNOI=++ .~==I$7, ..++?I???I+=?.+:O+ZZOZ
+            ===++I+==?III??I,?,   ~I7NN,..  ??ONNNMMMD$777$7I$ZOO$7?....+=????I~=+,:+,O8DNMM
+            ~=~==7II=+I?II7I,I+,8Z.II8D+=~:.,7$NMMMMMN8$7~. ..  :88I. ..?=?++I:~+=.~~~NMMMNN
+            ~====II?I~+?I?$7I?~8D7+7$ZZNONDN8Z8NMMMMMMNNON:=. :,$.I7  .,+=??I:,=, .:,=DNNMMN
+            =+?==+==?~+=I?$$I+88D:I$8NMNDDNNNDNNNMMMMMMMMM8I$77=MMDO.  :~=+?,,,   .~,?8DDD8D
+            =~=+==I7I=IIIIO$=~OOD=I7ODNNNNMNNDNDNMMMMMMMMNO$O+OZ 78.,.I::++:..   .,::=888OOO
+            ===I=I?~=?I???$I$?OODZ=7Z8NDONNN7D88MMMMMMMMMMNNNN8DNN~..~:7,,+7?,:,:::+8=Z888OO
+            ~+===7?=??I????7Z7ZOD8I777$+NNN:OOZOMMMMMMMMMMMMMMNMM+..~=?=O:+?::=+~:~+IDD888OZ
+            I==II??=I???=::7OI?O88Z=I~,?ZDD,Z$IDMMMMMMMMMMMMMMMM:$$?.~?+=?:,~+?I??==+++I8OOO
+            ==+++??+=.,~,~:7Z$?7I77$=. $I$8I$7+~8NMMMMMMMMMMMMDDMN$ ,:+?=.~==?II+++=+=?II+OZ
+            ==+?+I?,=:+?=~~??I++~7$$$= 777Z,$Z$$ONNMMMMMMMMMMMMMM8? .~=?:.==+?I~+?=+=??II?I8
+            ?=+?I:=~??II=~~, II?+ 7$7?=?77$?$Z:8NMMMNMMMMMMMMMMMD7 ,,===::~=?II.??++?++III+~
+            ??+.I+I=+I+??=~=~ =I+:?7$77?$$$ZI7Z8DM7NMMNMMMMMMMMOI. .,=~~.~~+I?:???==~????II?
+            I??:==?I++I?~==+=~:.?I7I77$?IZ$ZODDOIDNNNNNMMMMNM8?.:. ,,+=,::~+==II=~,=?+?IIIII
+            ??I:?=,=+++?II+=:,:, +77777$$777ODDMMNO~DNNNDD8?..::: .,,+~.,::=??????=+?IIIII?I
+            ????++=~:=?IIIII=~:: ~~+II77$$7$ZO8NMMMND.+:   .=7+=~ ,,:?...~II??+??I?+??IIII?I
+            ??III7II+~:?II7+II?, ~,:,~7777$$$I$8DNMMNO   .~I  .Z:.,:~: ,+???+=,IIIIII??IIIII
+            ???I7I:,~=:,+II+=~I??:.,,,.:77777777$ODMM8 .:+ZI. ,~,..~~ :II?==~:?II??IIIIIIIII
+            No matter where you go, everyone's connected
+
             <a href="https://fm.tzlil.net">fm.tzlil.net</a> music
-            <a href="https://git.tzlil.net">git.tzlil.net</a> for everything im too embarrased to put on sourcehut
+            <a href="https://git.tzlil.net">git.tzlil.net</a> code
             <a href="/arXiv">arXiv randomizer</a>
             </pre>
           ''} /