Merge remote-tracking branch 'lass/master'

5 files changed, 54 insertions, 4 deletions

diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
new file mode 100644
index 00000000..290d8a78
--- /dev/null
+++ b/lass/1systems/daedalus/config.nix
@@ -0,0 +1,35 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    <stockholm/lass>
+    <stockholm/lass/2configs/hw/x220.nix>
+    <stockholm/lass/2configs/boot/stock-x220.nix>
+
+    <stockholm/lass/2configs/mouse.nix>
+    <stockholm/lass/2configs/retiolum.nix>
+    <stockholm/lass/2configs/git.nix>
+    <stockholm/lass/2configs/exim-retiolum.nix>
+    <stockholm/lass/2configs/baseX.nix>
+    <stockholm/lass/2configs/browsers.nix>
+    <stockholm/lass/2configs/programs.nix>
+    <stockholm/lass/2configs/fetchWallpaper.nix>
+    <stockholm/lass/2configs/backups.nix>
+    <stockholm/lass/2configs/games.nix>
+  ];
+
+  krebs.build.host = config.krebs.hosts.daedalus;
+
+  fileSystems = {
+    "/bku" = {
+      device = "/dev/mapper/pool-bku";
+      fsType = "btrfs";
+      options = ["defaults" "noatime" "ssd" "compress=lzo"];
+    };
+  };
+
+  services.udev.extraRules = ''
+    SUBSYSTEM=="net", ATTR{address}=="00:24:d7:f0:e8:c8", NAME="wl0"
+    SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:8f:8a:78", NAME="et0"
+  '';
+}
diff --git a/lass/1systems/daedalus/source.nix b/lass/1systems/daedalus/source.nix
new file mode 100644
index 00000000..a15ac80c
--- /dev/null
+++ b/lass/1systems/daedalus/source.nix
@@ -0,0 +1,4 @@
+import <stockholm/lass/source.nix> {
+  name = "daedalus";
+  secure = true;
+}
diff --git a/lass/2configs/boot/stock-x220.nix b/lass/2configs/boot/stock-x220.nix
new file mode 100644
index 00000000..54a382db
--- /dev/null
+++ b/lass/2configs/boot/stock-x220.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  boot = {
+    loader.systemd-boot.enable = true;
+    loader.efi.canTouchEfiVariables = true;
+  };
+}
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix
index 7f0a3bff..18fd9bb9 100644
--- a/lass/2configs/buildbot-standalone.nix
+++ b/lass/2configs/buildbot-standalone.nix
@@ -9,9 +9,11 @@ let
     ControlPersist 4h
   '';
 
+  hostname = config.networking.hostName;
+
 in {
   config.services.nginx.virtualHosts.build = {
-    serverAliases = [ "build.prism.r" ];
+    serverAliases = [ "build.${hostname}.r" ];
     locations."/".extraConfig = ''
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
@@ -20,7 +22,7 @@ in {
   };
 
   config.krebs.buildbot.master = let
-    stockholm-mirror-url = http://cgit.prism.r/stockholm ;
+    stockholm-mirror-url = "http://cgit.${hostname}.r/stockholm";
   in {
     slaves = {
       testslave = "lasspass";
@@ -109,13 +111,13 @@ in {
     web.enable = true;
     irc = {
       enable = true;
-      nick = "buildbot-lass";
+      nick = "build|${hostname}";
       server = "ni.r";
       channels = [ "retiolum" "noise" ];
       allowForce = true;
     };
     extraConfig = ''
-      c['buildbotURL'] = "http://build.prism.r/"
+      c['buildbotURL'] = "http://build.${hostname}.r/"
     '';
   };
 
diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix
index fd2f1f76..942653ba 100644
--- a/lass/2configs/exim-smarthost.nix
+++ b/lass/2configs/exim-smarthost.nix
@@ -34,6 +34,7 @@ with import <stockholm/lib>;
       { from = "irgendwas@lassul.us"; to = lass.mail; }
       { from = "polo@lassul.us"; to = lass.mail; }
       { from = "shack@lassul.us"; to = lass.mail; }
+      { from = "nix@lassul.us"; to = lass.mail; }
     ];
     system-aliases = [
       { from = "mailer-daemon"; to = "postmaster"; }