Merge remote-tracking branch 'gum/master'

4 files changed, 35 insertions, 4 deletions

diff --git a/makefu/1systems/darth.nix b/makefu/1systems/darth.nix
index a33744f0b..ad3ac4f22 100644
--- a/makefu/1systems/darth.nix
+++ b/makefu/1systems/darth.nix
@@ -1,17 +1,39 @@
 { config, pkgs, lib, ... }:
 
 with config.krebs.lib;
-{
+let
+  byid = dev: "/dev/disk/by-id/" + dev;
+  rootDisk = byid "ata-ADATA_SSD_S599_64GB_10460000000000000039";
+  auxDisk = byid "ata-HGST_HTS721010A9E630_JR10006PH3A02F";
+  dataPartition = auxDisk + "-part1";
+
+  allDisks = [ rootDisk auxDisk ];
+in {
   imports = [
+        ../.
         ../2configs/fs/single-partition-ext4.nix
         ../2configs/zsh-user.nix
-        ../.
+        ../2configs/smart-monitor.nix
   ];
 
+  # virtualisation.nova.enableSingleNode = true;
   krebs.retiolum.enable = true;
 
-  boot.loader.grub.device = "/dev/disk/by-id/ata-ADATA_SSD_S599_64GB_10460000000000000039";
+  # TODO smartd omo darth gum all-in-one
+  services.smartd.devices = builtins.map (x: { device = x; }) allDisks;
+  zramSwap.enable = true;
+
+  fileSystems."/data" = {
+    device = dataPartition;
+    fsType = "ext4";
+  };
+
+  boot.loader.grub.device = rootDisk;
+
   users.users.root.openssh.authorizedKeys.keys = [
     config.krebs.users.makefu-omo.pubkey
+    config.krebs.users.makefu-vbob.pubkey
   ];
+
+  krebs.build.host = config.krebs.hosts.darth;
 }
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix
index e784fdc12..2ddd2dccc 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum.nix
@@ -45,6 +45,12 @@ in {
     "cgit.euer.krebsco.de"
   ];
 
+  # access
+  users.users = {
+    root.openssh.authorizedKeys.keys = [ config.krebs.users.makefu-omo.pubkey ];
+    makefu.openssh.authorizedKeys.keys = [ config.krebs.users.makefu-vbob.pubkey ];
+  };
+
   # Chat
   environment.systemPackages = with pkgs;[
     weechat
diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index bfcd2298a..f0f1d3088 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo.nix
@@ -11,7 +11,7 @@ let
   # cryptsetup luksFormat $dev --cipher aes-xts-plain64 -s 512 -h sha512
   # cryptsetup luksAddKey $dev tmpkey
   # cryptsetup luksOpen $dev crypt0 --key-file tmpkey --keyfile-size=4096
-  # mkfs.ext4 /dev/mapper/crypt0 -L crypt0 -T largefile
+  # mkfs.xfs /dev/mapper/crypt0 -L crypt0
 
   # omo Chassis:
   # __FRONT_
@@ -30,6 +30,8 @@ let
   cryptDisk2 = byid "ata-ST4000DM000-1F2168_Z303HVSG";
   # cryptDisk3 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WMAZA1786907";
   # all physical disks
+
+  # TODO callPackage ../3modules/MonitorDisks { disks = allDisks }
   allDisks = [ rootDisk cryptDisk0 cryptDisk1 cryptDisk2 ];
 in {
   imports =
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 313ccbec7..20faf7896 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -125,6 +125,7 @@ with config.krebs.lib;
 
   nixpkgs.config.packageOverrides = pkgs: {
     nano = pkgs.runCommand "empty" {} "mkdir -p $out";
+    tinc = pkgs.tinc_pre;
   };
 
   services.cron.enable = false;