feat(moodle-dl): add first WS21 courses

configs/default.nix

@@ -216,7 +216,6 @@ in {
     ./htop.nix
     ./hu-berlin.nix
     ./i3.nix
-    ./keybase.nix
     ./keyboard.nix
     ./lb.nix
     ./mpv.nix

configs/keybase.nix

@@ -1,8 +0,0 @@
-{ config, ... }: {
-  services.keybase.enable = true;
-
-  services.kbfs = {
-    enable = true;
-    mountPoint = "%h/cloud/keybase";
-  };
-}

configs/moodle-dl/meinhark.nix

@@ -45,6 +45,14 @@ in
         103685 # Griechische Sprache und Übersetzung I
         105455 # Elegia greca
         105335 # Homerische Epen
+
+        # WS 2021
+        108122 # Griechisch
+        107986 # Altostslavisch
+        107792 # Elegie in Rom
+        107369 # Tusculanae Disputationes
+        108586 # Griechische Religion
+        107988 # Balkanindogermanisch
       ];
       download_submissions = true;
       download_descriptions = true;
@@ -65,9 +73,9 @@ in
 
   services.nfs.server = {
     enable = true;
-    exports = ''
-      /export        10.243.2.4(fsid=0)      10.243.2.85(fsid=0)
-      /export/moodle 10.243.2.4(insecure,rw) 10.243.2.85(insecure,rw)
+    exports = let machines = with (import <niveum/lib>).retiolumAddresses; [kabsa manakish]; in ''
+      /export        ${lib.concatMapStringsSep " " (machine: "${machine.ipv4}(fsid=0)") machines}
+      /export/moodle ${lib.concatMapStringsSep " " (machine: "${machine.ipv4}(insecure,rw)") machines}
     '';
   };
 }

configs/names.nix

@@ -0,0 +1,38 @@
+{ pkgs, lib, ... }:
+let
+  port = 5703;
+  geogen = (pkgs.fetchFromGitHub {
+    owner = "kmein";
+    repo = "scripts";
+    rev = "c553c212efb04c300edf675c39a87fffd32d4def";
+    sha256 = "0b5xjr7qqgvwc76pqr84p81svzk6nqr5pdvc6daw94rcgdy02mva";
+  }) + "/onomastics";
+  inherit (pkgs.callPackage geogen {}) dependencyEnv;
+in
+{
+  systemd.services.names = {
+    wants = [ "network-online.target" ];
+    wantedBy = [ "multi-user.target" ];
+    description = "Better clone of geogen.stoepel.net";
+    serviceConfig = {
+      DynamicUser = true;
+    };
+    script = ''
+      cd $(mktemp -d)
+      ln -s "${geogen}/wsgi.py" wsgi.py
+      ${dependencyEnv}/bin/gunicorn wsgi:app -b :${toString port}
+    '';
+  };
+
+  services.nginx = {
+    enable = true;
+    recommendedGzipSettings = true;
+    recommendedOptimisation = true;
+    recommendedProxySettings = true;
+    recommendedTlsSettings = true;
+  };
+
+  services.nginx.virtualHosts."names.kmein.r" = {
+    locations."/".proxyPass = "http://127.0.0.1:${toString port}";
+  };
+}

lib/default.nix

@@ -34,6 +34,8 @@ rec {
 
   defaultApplications = import ./default-applications.nix;
 
+  retiolumAddresses = import ./retiolum-network.nix;
+
   localAddresses = import ./local-network.nix;
 
   email-sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINKz33wHtPuIfgXEb0+hybxFGV9ZuPsDTLUZo/+hlcdA";

lib/retiolum-network.nix

@@ -0,0 +1,21 @@
+{
+  kabsa = {
+    ipv4 = "10.243.2.4";
+    ipv6 = "42:0:3c46:861f:a118:8e9a:82c9:3d";
+  };
+
+  zaatar = {
+    ipv4 = "10.243.2.34";
+    ipv6 = "42:0:3c46:156e:10b6:3bd6:6e82:b2cd";
+  };
+
+  makanek = {
+    ipv4 = "10.243.2.84";
+    ipv6 = "42:0:3c46:f7a9:1f0a:1b2b:822a:6050";
+  };
+
+  manakish = {
+    ipv4 = "10.243.2.85";
+    ipv6 = "42:0:3c46:ac99:ae36:cb8:c551:ba27";
+  };
+}

systems/kabsa/configuration.nix

@@ -1,6 +1,7 @@
 { config, pkgs, lib, ... }:
 let
   nixpkgs-unstable = import <nixpkgs-unstable> { config.allowUnfree = true; };
+  inherit (import <niveum/lib>) retiolumAddresses;
 in
 {
   imports = [
@@ -39,10 +40,7 @@ in
 
   networking.wireless.interfaces = [ "wlp3s0" ];
 
-  networking.retiolum = {
-    ipv4 = "10.243.2.4";
-    ipv6 = "42:0:3c46:861f:a118:8e9a:82c9:3d";
-  };
+  networking.retiolum = retiolumAddresses.kabsa;
 
   system.stateVersion = "19.03";
 }

systems/makanek/configuration.nix

@@ -1,6 +1,6 @@
 { lib, config, pkgs, ... }:
 let
-  inherit (import <niveum/lib>) kieran;
+  inherit (import <niveum/lib>) kieran retiolumAddresses;
 in
 {
   imports = [
@@ -58,6 +58,7 @@ in
     <niveum/configs/version.nix>
     <niveum/configs/radio>
     <niveum/configs/gitea.nix>
+    <niveum/configs/names.nix>
     <niveum/configs/telegram-bots>
     <niveum/configs/weechat.nix>
     <niveum/configs/urlwatch.nix>
@@ -87,10 +88,7 @@ in
 
   services.openssh.enable = true;
 
-  networking.retiolum = {
-    ipv4 = "10.243.2.84";
-    ipv6 = "42:0:3c46:f7a9:1f0a:1b2b:822a:6050";
-  };
+  networking.retiolum = retiolumAddresses.makanek;
 
   environment.etc."tinc/retiolum/rsa_key.priv" = {
     text = builtins.readFile <system-secrets/retiolum.key>;

systems/manakish/configuration.nix

@@ -3,6 +3,9 @@
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
 { config, pkgs, ... }:
+let
+  inherit (import <niveum/lib>) retiolumAddresses;
+in
 {
   imports = [ # Include the results of the hardware scan.
     ./hardware-configuration.nix
@@ -45,10 +48,7 @@
     git vim
   ];
 
-  networking.retiolum = {
-    ipv4 = "10.243.2.85";
-    ipv6 = "42:0:3c46:ac99:ae36:cb8:c551:ba27";
-  };
+  networking.retiolum = retiolumAddresses.manakish;
 
   networking.hostName = "manakish";
 

systems/zaatar/configuration.nix

@@ -1,4 +1,7 @@
 { config, pkgs, lib, ... }:
+let
+  inherit (import <niveum/lib>) retiolumAddresses;
+in
 {
   imports = [
     ./hardware-configuration.nix
@@ -117,10 +120,7 @@
   networking.hostName = "zaatar";
   networking.wireless.interfaces = [ "wlp2s0" ];
 
-  networking.retiolum = {
-    ipv4 = "10.243.2.34";
-    ipv6 = "42:0:3c46:156e:10b6:3bd6:6e82:b2cd";
-  };
+  networking.retiolum = retiolumAddresses.zaatar;
 
   system.stateVersion = "20.09";
 }