Merge remote-tracking branch 'lass/master'

4 files changed, 21 insertions, 3 deletions

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 41a909f16..c897ab655 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -26,7 +26,6 @@ in {
       services.udev.extraRules = ''
         SUBSYSTEM=="net", ATTR{address}=="54:04:a6:7e:f4:06", NAME="et0"
       '';
-
     }
     ../2configs/retiolum.nix
     ../2configs/exim-smarthost.nix
@@ -363,6 +362,23 @@ in {
         ];
       };
     }
+    {
+      #stuff for dritter
+      users.extraUsers.dritter = {
+        name = "dritter";
+        uid = genid "dritter";
+        home = "/home/dritter";
+        group = "users";
+        createHome = true;
+        useDefaultShell = true;
+        extraGroups = [
+          "download"
+        ];
+        openssh.authorizedKeys.keys = [
+          "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqOWDDk7QkSAvrSLkEoz7dY22+xPyv5JDn2zlfUndfavmTMfZvPx9REMjgULbcCSM4m3Ncf40yUjciDpVleGoEz82+p/ObHAkVWPQyXRS3ZRM2IJJultBHEFc61+61Pi8k3p5pBhPPaig6VncJ4uUuuNqen9jqLesSTVXNtdntU2IvnC8B8k1Kq6fu9q1T2yEOMxkD31D5hVHlqAly0LdRiYvtsRIoCSmRvlpGl70uvPprhQxhtoiEUeDqmIL7BG9x7gU0Swdl7R0/HtFXlFuOwSlNYDmOf/Zrb1jhOpj4AlCliGUkM0iKIJhgH0tnJna6kfkGKHDwuzITGIh6SpZ dritter@Janeway"
+        ];
+      };
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.prism;
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index be08d0ec1..72866c067 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -34,11 +34,11 @@ let
       cgit.desc = "take all the computers hostage, they'll love you!";
       cgit.section = "configuration";
     };
-  } // mapAttrs make-public-repo-silent {
     the_playlist = {
       cgit.desc = "Good Music collection + tools";
       cgit.section  = "art";
     };
+  } // mapAttrs make-public-repo-silent {
   };
 
   restricted-repos = mapAttrs make-restricted-repo (
diff --git a/lass/2configs/hfos.nix b/lass/2configs/hfos.nix
index f63e5ea53..f8dd2f0d2 100644
--- a/lass/2configs/hfos.nix
+++ b/lass/2configs/hfos.nix
@@ -40,7 +40,7 @@ with import <stockholm/lib>;
   systemd.services.libvirtd.serviceConfig.ExecStartPost = let
     restart-iptables = pkgs.writeDash "restart-iptables" ''
       #soo hacky
-      ${pkgs.coreutils}/bin/sleep 1s
+      ${pkgs.coreutils}/bin/sleep 5s
       ${pkgs.systemd}/bin/systemctl restart krebs-iptables.service
     '';
   in restart-iptables;
diff --git a/lass/2configs/xresources.nix b/lass/2configs/xresources.nix
index b5e721483..b5ba3df14 100644
--- a/lass/2configs/xresources.nix
+++ b/lass/2configs/xresources.nix
@@ -33,6 +33,8 @@ let
     URxvt*.pointerBlankDelay: 987654321
     URxvt*.pointerColor: #f042b0
     URxvt*.pointerColor2: #050505
+
+    URxvt*color0:        #232342
   '';
 
 in {