4 files changed, 66 insertions, 3 deletions
diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
index e1bce5da..7b90ebb6 100644
--- a/lass/1systems/daedalus/config.nix
+++ b/lass/1systems/daedalus/config.nix
@@ -9,6 +9,8 @@ with import <stockholm/lib>;
 
     <stockholm/lass/2configs/retiolum.nix>
     <stockholm/lass/2configs/backups.nix>
+    <stockholm/lass/2configs/games.nix>
+    <stockholm/lass/2configs/steam.nix>
     {
       # bubsy config
       users.users.bubsy = {
@@ -34,6 +36,7 @@ with import <stockholm/lib>;
         hexchat
         networkmanagerapplet
         libreoffice
+        audacity
       ];
       services.xserver.enable = true;
       services.xserver.displayManager.lightdm.enable = true;
diff --git a/lass/1systems/helios/config.nix b/lass/1systems/helios/config.nix
index 6ff3fbb8..6db6f8fd 100644
--- a/lass/1systems/helios/config.nix
+++ b/lass/1systems/helios/config.nix
@@ -11,6 +11,7 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/retiolum.nix>
     <stockholm/lass/2configs/otp-ssh.nix>
     <stockholm/lass/2configs/git.nix>
+    <stockholm/lass/2configs/dcso-vpn.nix>
     { # automatic hardware detection
       boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
       boot.kernelModules = [ "kvm-intel" ];
@@ -44,7 +45,9 @@ with import <stockholm/lib>;
     {
       services.xserver.dpi = 200;
       fonts.fontconfig.dpi = 200;
-      lass.myFont = "-schumacher-clean-*-*-*-*-25-*-*-*-*-*-iso10646-1";
+      lass.fonts.regular = "xft:Hack-Regular:pixelsize=22,xft:Symbola";
+      lass.fonts.bold =    "xft:Hack-Bold:pixelsize=22,xft:Symbola";
+      lass.fonts.italic =  "xft:Hack-RegularOblique:pixelsize=22,xft:Symbol";
     }
     { #TAPIR, AGATIS, sentral, a3 - foo
       services.redis.enable = true;
@@ -94,4 +97,22 @@ with import <stockholm/lib>;
   programs.ssh.startAgent = lib.mkForce true;
 
   services.tlp.enable = true;
+
+  services.xserver.videoDrivers = [ "nvidia" ];
+  services.xserver.xrandrHeads = [
+    { output = "DP-0.8"; }
+    { output = "DP-4"; monitorConfig = ''Option "Rotate" "right"''; }
+    { output = "DP-2"; primary = true; }
+  ];
+
+  security.pki.certificateFiles = [
+   (pkgs.fetchurl { url = "http://pki.dcso.de/ca/PEM/DCSOCAROOTC1G1.pem"; sha256 = "14vz9c0fk6li0a26vx0s5ha6y3yivnshx9pjlh9vmnpkbph5a7rh"; })
+   (pkgs.fetchurl { url = "http://pki.dcso.de/ca/PEM/DCSOCAROOTC2G1.pem"; sha256 = "0r1dd48a850cv7whk4g2maik550rd0vsrsl73r6x0ivzz7ap1xz5"; })
+   (pkgs.fetchurl { url = "http://pki.dcso.de/ca/PEM/DCSOCAROOTC3G1.pem"; sha256 = "0b5cdchdkvllnr0kz35d8jrmrf9cjw0kd98mmvzr0x6nkc8hwpdy"; })
+
+   (pkgs.fetchurl { url = "http://pki.dcso.de/ca/PEM/DCSOCACOMPC2G1.pem"; sha256 = "0rn57zv1ry9vj4p2248mxmafmqqmdhbrfx1plszrxsphshbk2hfz"; })
+   (pkgs.fetchurl { url = "http://pki.dcso.de/ca/PEM/DCSOCACOMPC3G1.pem"; sha256 = "0w88qaqhwxzvdkx40kzj2gka1yi85ipppjdkxah4mscwfhlryrnk"; })
+   (pkgs.fetchurl { url = "http://pki.dcso.de/ca/PEM/DCSOCAIDENC2G1.pem"; sha256 = "1z2qkyhgjvri13bvi06ynkb7mjmpcznmc9yw8chx1lnwc3cxa7kf"; })
+   (pkgs.fetchurl { url = "http://pki.dcso.de/ca/PEM/DCSOCAIDENC3G1.pem"; sha256 = "0smdjjvz95n652cb45yhzdb2lr83zg52najgbzf6lm3w71f8mv7f"; })
+  ];
 }
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 8b90cce7..610bfef8 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -157,4 +157,38 @@ with import <stockholm/lib>;
   krebs.repo-sync.timerConfig = {
     OnCalendar = "00:37";
   };
+
+  environment.shellAliases = {
+    deploy = pkgs.writeDash "deploy" ''
+      set -eu
+      export PATH=${makeBinPath [
+        pkgs.bash
+        pkgs.coreutils
+        pkgs.nix
+        (pkgs.writeDashBin "is-git-crypt-locked" ''
+          magic=$(dd status=none if="$1" skip=1 bs=1 count=8)
+          test "$magic" = GITCRYPT
+        '')
+      ]}
+      cd ~/stockholm
+      export SYSTEM="$1"
+      if is-git-crypt-locked ~/secrets/ready; then
+        echo 'secrets are crypted' >&2
+        exit 23
+      else
+        exec nix-shell -I stockholm="$PWD" --run 'deploy --system="$SYSTEM"'
+      fi
+    '';
+    predeploy = pkgs.writeDash "predeploy" ''
+      set -eu
+      export PATH=${makeBinPath [
+        pkgs.bash
+        pkgs.coreutils
+        pkgs.nix
+      ]}
+      cd ~/stockholm
+      export SYSTEM="$1"
+      exec nix-shell -I stockholm="$PWD" --run 'test --system="$SYSTEM" --target="$SYSTEM/var/test/" --force-populate'
+    '';
+  };
 }
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index 8e44b113..30d5c8da 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -230,8 +230,6 @@ in {
     <stockholm/lass/2configs/paste.nix>
     <stockholm/lass/2configs/syncthing.nix>
     <stockholm/lass/2configs/reaktor-coders.nix>
-    <stockholm/lass/2configs/reaktor-krebs.nix>
-    <stockholm/lass/2configs/reaktor-retiolum.nix>
     <stockholm/lass/2configs/ciko.nix>
     <stockholm/lass/2configs/container-networking.nix>
     { # quasi bepasty.nix
@@ -267,6 +265,13 @@ in {
         alias /var/realwallpaper/realwallpaper.png;
       '';
     }
+    {
+      services.minecraft-server.enable = true;
+      krebs.iptables.tables.filter.INPUT.rules = [
+        { predicate = "-p tcp --dport 25565"; target = "ACCEPT"; }
+        { predicate = "-p udp --dport 25565"; target = "ACCEPT"; }
+      ];
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.prism;