Merge remote-tracking branch 'lass/master'

6 files changed, 43 insertions, 21 deletions

diff --git a/lass/1systems/blue/config.nix b/lass/1systems/blue/config.nix
index 14f4971f7..c46bb351e 100644
--- a/lass/1systems/blue/config.nix
+++ b/lass/1systems/blue/config.nix
@@ -15,14 +15,6 @@ with import <stockholm/lib>;
 
   krebs.build.host = config.krebs.hosts.blue;
 
-  environment.shellAliases = {
-    deploy = pkgs.writeDash "deploy" ''
-      set -eu
-      export SYSTEM="$1"
-      $(nix-build $HOME/sync/stockholm/lass/krops.nix --no-out-link --argstr name "$SYSTEM" -A deploy)
-    '';
-  };
-
   networking.nameservers = [ "1.1.1.1" ];
 
   services.restic.backups = genAttrs [
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index f1f14e791..33ec21e72 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -396,12 +396,12 @@ with import <stockholm/lib>;
       ];
     }
     {
-      nix.trustedUsers = [ "Mic92" ];
-      users.users.Mic92 = {
-        uid = genid_uint31 "Mic92";
+      nix.trustedUsers = [ "mic92" ];
+      users.users.mic92 = {
+        uid = genid_uint31 "mic92";
         isNormalUser = true;
         openssh.authorizedKeys.keys = [
-          config.krebs.users.Mic92.pubkey
+          config.krebs.users.mic92.pubkey
         ];
       };
     }
diff --git a/lass/1systems/yellow/config.nix b/lass/1systems/yellow/config.nix
index 82fe3fac5..bc3b1f5d5 100644
--- a/lass/1systems/yellow/config.nix
+++ b/lass/1systems/yellow/config.nix
@@ -251,6 +251,27 @@ with import <stockholm/lib>;
     3f8a56ddb2e64eb67adfc9b337157ff4
     -----END OpenVPN Static key V1-----
     </tls-auth>
-
   '';
+
+  systemd.services.flix-index = {
+    wantedBy = [ "multi-user.target" ];
+    path = [
+      pkgs.coreutils
+      pkgs.findutils
+      pkgs.inotifyTools
+    ];
+    serviceConfig = {
+      Restart = "always";
+      ExecStart = pkgs.writers.writeDash "flix-index" ''
+        set -efu
+
+        DIR=/var/download/finished
+        cd "$DIR"
+        while inotifywait -rq -e create -e move -e delete "$DIR"; do
+          find . -type f > "$DIR"/index.tmp
+          mv "$DIR"/index.tmp "$DIR"/index
+        done
+      '';
+    };
+  };
 }
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index b0d7ff23b..ae2754c96 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -93,6 +93,7 @@ with import <stockholm/lib>;
 
   environment.systemPackages = with pkgs; [
   #stockholm
+    deploy
     git
     gnumake
     jq
diff --git a/lass/2configs/games.nix b/lass/2configs/games.nix
index 63bfa53e0..67f250ef3 100644
--- a/lass/2configs/games.nix
+++ b/lass/2configs/games.nix
@@ -66,14 +66,16 @@ in {
       useDefaultShell = true;
       packages = with pkgs; [
         # minecraft
-        steam-run
-        scummvm
-        dolphinEmu
-        doom1
-        doom2
-        vdoom1
-        vdoom2
-        vdoomserver
+        # ftb
+        # steam-run
+        # scummvm
+        # dolphinEmu
+        # doom1
+        # doom2
+        # protontricks
+        # vdoom1
+        # vdoom2
+        # vdoomserver
         retroarchBare
       ];
     };
diff --git a/lass/5pkgs/deploy/default.nix b/lass/5pkgs/deploy/default.nix
new file mode 100644
index 000000000..c07cf20d1
--- /dev/null
+++ b/lass/5pkgs/deploy/default.nix
@@ -0,0 +1,6 @@
+{ writers }:
+writers.writeDashBin "deploy" ''
+  set -eu
+  export SYSTEM="$1"
+  $(nix-build $HOME/sync/stockholm/lass/krops.nix --no-out-link --argstr name "$SYSTEM" -A deploy)
+''