Merge remote-tracking branch 'ni/master' into HEAD

3 files changed, 44 insertions, 6 deletions

diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix
index 66bd52ab2..ed5fb671c 100644
--- a/tv/1systems/alnus/config.nix
+++ b/tv/1systems/alnus/config.nix
@@ -17,7 +17,6 @@ with import <stockholm/lib>;
   };
 
   environment.systemPackages = with pkgs; [
-    chromium
     firefoxWrapper
     networkmanagerapplet
     (pkgs.pidgin-with-plugins.override {
@@ -31,12 +30,12 @@ with import <stockholm/lib>;
     };
     "/" = {
       device = "/dev/mapper/main-root";
-      fsType = "btrfs";
+      fsType = "ext4";
       options = [ "defaults" "noatime" ];
     };
     "/home" = {
       device = "/dev/mapper/main-home";
-      fsType = "btrfs";
+      fsType = "ext4";
       options = [ "defaults" "noatime" ];
     };
   };
@@ -55,9 +54,11 @@ with import <stockholm/lib>;
 
   networking.networkmanager.enable = true;
 
-  nixpkgs.config = {
-    allowUnfree = true;
-  };
+  services.earlyoom.enable = true;
+  services.earlyoom.freeMemThreshold = 5;
+  systemd.services.earlyoom.environment.EARLYOOM_ARGS = toString [
+    "--prefer '^(Web Content|Privileged Cont)$'" # firefox tabs
+  ];
 
   services.xserver = {
     enable = true;
diff --git a/tv/1systems/au/config.nix b/tv/1systems/au/config.nix
new file mode 100644
index 000000000..fc4b216f5
--- /dev/null
+++ b/tv/1systems/au/config.nix
@@ -0,0 +1,18 @@
+{ config, ... }: {
+  imports = [
+    ./disks.nix
+    <stockholm/tv>
+    <stockholm/tv/2configs/hw/x220.nix>
+    <stockholm/tv/2configs/retiolum.nix>
+  ];
+
+  krebs.build.host = config.krebs.hosts.au;
+
+  networking.wireless.enable = true;
+  networking.useDHCP = false;
+  networking.interfaces.enp0s25.useDHCP = true;
+  networking.interfaces.wlp3s0.useDHCP = true;
+  networking.interfaces.wwp0s29u1u4i6.useDHCP = true;
+
+  system.stateVersion = "20.03";
+}
diff --git a/tv/1systems/au/disks.nix b/tv/1systems/au/disks.nix
new file mode 100644
index 000000000..434de1740
--- /dev/null
+++ b/tv/1systems/au/disks.nix
@@ -0,0 +1,19 @@
+{
+  boot.initrd.luks.devices.main.device = "/dev/sda2";
+  fileSystems."/" = {
+    device = "/dev/main/root";
+    options = ["defaults" "noatime" "commit=60"];
+  };
+  fileSystems."/boot" = {
+    device = "/dev/sda1";
+    options = ["defaults" "noatime"];
+  };
+  fileSystems."/bku" = {
+    device = "/dev/main/bku";
+    options = ["defaults" "noatime"];
+  };
+  fileSystems."/home" = {
+    device = "/dev/main/home";
+    options = ["defaults" "noatime" "commit=60"];
+  };
+}