Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles

home-modules/calendar-campuszeit-fix.nix

@@ -49,7 +49,7 @@ if __name__ == "__main__":
       text = /*bash*/ ''
         echo CHANGING OWNERSHIP OF "$(realpath "$1")" RECURSIVELY
         read -r -p "Continue?"
-        sudo chown -R ${user} "$1" 
+        sudo chown -R ${hyper.user} "$1" 
         ${u}/bin/nx_fix_campuszeit_python "$1"
         sudo chown -R radicale "$1"
       '';

home.nix

@@ -38,6 +38,7 @@
     ./home-modules/pkgs-list/desktop.nix
     ./home-modules/pkgs-list/programs.nix
     ./home-modules/pkgs-list/shell.nix
+    ./home-modules/pkgs-list/fonts.nix
     ./home-modules/pnx.nix
     ./home-modules/programming/c.nix
     ./home-modules/programming/gleam.nix
@@ -66,6 +67,7 @@
   ] ++ (if (hyper.host == "NxACE") then [ 
     ./home-modules/nx2site.nix
     ./home-modules/nx2site-backup.nix
+    ./home-modules/calendar-campuszeit-fix.nix
   ] else []);
   home.username = hyper.user;
   # home.homeDirectory = hyper.home; # for some reason you cant use hyper.home here

system-modules/nx2site/proxy.nix

@@ -90,11 +90,11 @@
           "~^(/ba)$"                   = { return = "301 /BA.pdf"; };
           "/.well-known/matrix/client" = { return = "502"; };
           "/.well-known/matrix/server" = { return = "502"; };
-          "/phone" = { return = "301 /en/cards/phone"; };
-          "/about-me" = { return = "301 /en/slides/about-me"; };
-          "/about-this-site" = { return = "301 /en/slides/about-this-site"; };
-          "/gpg" = { return = "301 /en/cards/gpg"; };
-          "/contact" = { return = "301 /en/cards/contact"; };
+          "/phone" = { return = "301 /cards/phone"; };
+          "/about-me" = { return = "301 /slides/about-me"; };
+          "/about-this-site" = { return = "301 /slides/about-this-site"; };
+          "/gpg" = { return = "301 /cards/gpg"; };
+          "/contact" = { return = "301 /cards/contact"; };
         }; 
       }; 
       "matrix.${hyper.domain}" = {

system-modules/sshd.nix

@@ -1,12 +1,11 @@
-{ hyper, secrets, ... }:
-
-{
+{ ... }@all: with all; {
   environment.etc."ssh/ssh_host_ed25519_key.pub".text = if (hyper.host == "NxNORTH") then
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF1r5gUQPPS/dGB0SsvWtP6WdNWoxMwhhHRrqlO19cJt root@NxNORTH"
     else if ( hyper.host == "NxXPS" ) then
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPf+08+t8a0lY2+nR1mhIU3vuksStiJOlojJjzCwFk7r root@NxXPS"
-    else 
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBFfZpWVPlujsz3FklSVAM+tuYn4pzDSijhp5CeYNOZk root@NxACE";
+    else if ( hyper.host == "NxACE" ) then
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBFfZpWVPlujsz3FklSVAM+tuYn4pzDSijhp5CeYNOZk root@NxACE"
+    else (assert 1==2; "");
   sops.secrets."ssh/${hyper.host}-ssh_host_ed25519_key" = {
     mode = "0600";
     path = "/etc/ssh/ssh_host_ed25519_key.shadow";
@@ -19,5 +18,6 @@
       PrintLastLog = false; 
     };
   };
+  # users authorized keys are set in users.nix
 }