Merge remote-tracking branch 'lass/master'

krebs/source.nix

@@ -14,6 +14,6 @@ in
     stockholm.file = toString <stockholm>;
     nixpkgs.git = {
       url = https://github.com/NixOS/nixpkgs;
-      ref = "07ca7b64d2ff2fa7a79e4eab1aba70ff746fed8c"; # nixos-17.09 @ 2017-10-02
+      ref = "0c5a587eeba5302ff87e494baefd2f14f4e19bee"; # nixos-17.09 @ 2017-11-10
     };
   }

lass/1systems/helios/config.nix

@@ -105,6 +105,8 @@ with import <stockholm/lib>;
     { output = "DP-2"; primary = true; }
   ];
 
+  networking.hostName = lib.mkForce "BLN02NB0162";
+
   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"; })
@@ -117,4 +119,12 @@ with import <stockholm/lib>;
   ];
 
   lass.screenlock.command = "${pkgs.i3lock}/bin/i3lock -i /home/lass/lock.png -t -f";
+
+  programs.adb.enable = true;
+  users.users.mainUser.extraGroups = [ "adbusers" ];
+
+  services.printing = {
+    enable = true;
+    drivers = [ pkgs.postscript-lexmark ];
+  };
 }

lass/2configs/audit.nix

@@ -1,9 +0,0 @@
-{ ... }:
-
-{
-  security.audit = {
-    rules = [
-      "-a task,never"
-    ];
-  };
-}

lass/2configs/default.nix

@@ -2,7 +2,6 @@
 with import <stockholm/lib>;
 {
   imports = [
-    ../2configs/audit.nix
     ../2configs/binary-cache/client.nix
     ../2configs/gc.nix
     ../2configs/mc.nix

lass/source.nix

@@ -10,7 +10,7 @@ in
       nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";
       nixpkgs.git = {
         url = https://github.com/nixos/nixpkgs;
-        ref = "6a0a00d";
+        ref = "0c5a587";
       };
       secrets.file = getAttr builder {
         buildbot = toString <stockholm/lass/2configs/tests/dummy-secrets>;