4 files changed, 74 insertions, 5 deletions
diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index 4472816e..298c9083 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -30,6 +30,7 @@ with import <stockholm/lib>;
       networking.wireless.enable = true;
       hardware.pulseaudio = {
         enable = true;
+        systemWide = true;
       };
       users.users.ferret = {
         uid = genid "ferret";
diff --git a/lass/1systems/icarus.nix b/lass/1systems/icarus.nix
new file mode 100644
index 00000000..9a665464
--- /dev/null
+++ b/lass/1systems/icarus.nix
@@ -0,0 +1,59 @@
+{ config, pkgs, ... }:
+
+with import <stockholm/lib>;
+{
+  imports = [
+    ../.
+    ../2configs/retiolum.nix
+    ../2configs/hw/tp-x220.nix
+    ../2configs/baseX.nix
+    ../2configs/git.nix
+    ../2configs/exim-retiolum.nix
+    ../2configs/browsers.nix
+    ../2configs/programs.nix
+    ../2configs/fetchWallpaper.nix
+    ../2configs/backups.nix
+    #{
+    #  users.extraUsers = {
+    #    root = {
+    #      openssh.authorizedKeys.keys = map readFile [
+    #        ../../krebs/Zpubkeys/uriel.ssh.pub
+    #      ];
+    #    };
+    #  };
+    #}
+  ];
+
+  krebs.build.host = config.krebs.hosts.icarus;
+
+  boot = {
+    loader.grub.enable = true;
+    loader.grub.version = 2;
+    loader.grub.device = "/dev/sda";
+
+    initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; } ];
+    initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ];
+    initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
+    #kernelModules = [ "kvm-intel" "msr" ];
+  };
+  fileSystems = {
+    "/" = {
+      device = "/dev/pool/nix";
+      fsType = "btrfs";
+    };
+
+    "/boot" = {
+      device = "/dev/sda1";
+    };
+    "/tmp" = {
+      device = "tmpfs";
+      fsType = "tmpfs";
+      options = ["nosuid" "nodev" "noatime"];
+    };
+  };
+
+  services.udev.extraRules = ''
+    SUBSYSTEM=="net", ATTR{address}=="a0:88:b4:29:26:bc", NAME="wl0"
+    SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:0c:a7:63", NAME="et0"
+  '';
+}
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 594f342d..4553cc15 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -68,11 +68,19 @@ with import <stockholm/lib>;
     {
       krebs.nginx = {
         enable = true;
-        servers.default.locations = [
-          (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
-            alias /home/$1/public_html$2;
-          '')
-        ];
+        servers.default = {
+          server-names = [
+            "localhost"
+            "${config.krebs.build.host.name}"
+            "${config.krebs.build.host.name}.r"
+            "${config.krebs.build.host.name}.retiolum"
+          ];
+          locations = [
+            (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
+              alias /home/$1/public_html$2;
+            '')
+          ];
+        };
       };
     }
     {
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 269f9452..6c11a2f6 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -230,6 +230,7 @@ in {
     }
     {
       virtualisation.libvirtd.enable = true;
+      users.users.mainUser.extraGroups = [ "libvirtd" ];
     }
   ];