From b658de054d724064a3531de2d4a53a7a28cdc6ac Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 13 Sep 2018 16:17:39 +0200
Subject: ma omo.r: split hardware config, use disko for tsp hardware

---
 makefu/1systems/omo/hw/tsp.nix | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 makefu/1systems/omo/hw/tsp.nix

(limited to 'makefu/1systems/omo/hw/tsp.nix')

diff --git a/makefu/1systems/omo/hw/tsp.nix b/makefu/1systems/omo/hw/tsp.nix
new file mode 100644
index 000000000..4af0d73fc
--- /dev/null
+++ b/makefu/1systems/omo/hw/tsp.nix
@@ -0,0 +1,32 @@
+{ pkgs, ... }:
+with builtins;
+let
+  disko = import (builtins.fetchGit {
+    url = https://cgit.lassul.us/disko/;
+    rev = "9c9b62e15e4ac11d4379e66b974f1389daf939fe";
+  });
+  cfg = fromJSON (readFile ../../hardware/tsp-disk.json);
+  primaryInterface = "enp1s0";
+  rootDisk = "/dev/sda"; # TODO same as disko uses
+in {
+  imports = [
+    (disko.config cfg)
+  ];
+  makefu.server.primary-itf = primaryInterface;
+  boot = {
+    loader.grub.device = rootDisk;
+
+    initrd.availableKernelModules = [
+      "ahci"
+      "ohci_pci"
+      "ehci_pci"
+      "pata_atiixp"
+      "firewire_ohci"
+      "usb_storage"
+      "usbhid"
+    ];
+
+    kernelModules = [ "kvm-intel" ];
+  };
+
+}
-- 
cgit v1.2.3


From bbed9690c9b5cece3a51fc6123bfa437f7d0fca9 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 17 Sep 2018 00:39:01 +0200
Subject: ma omo.r: tsp requires more hardware config

---
 makefu/1systems/omo/hw/tsp.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'makefu/1systems/omo/hw/tsp.nix')

diff --git a/makefu/1systems/omo/hw/tsp.nix b/makefu/1systems/omo/hw/tsp.nix
index 4af0d73fc..99c558056 100644
--- a/makefu/1systems/omo/hw/tsp.nix
+++ b/makefu/1systems/omo/hw/tsp.nix
@@ -28,5 +28,13 @@ in {
 
     kernelModules = [ "kvm-intel" ];
   };
-
+  networking.wireless.enable = true;
+  hardware.enableRedistributableFirmware = true;
+  hardware.cpu.intel.updateMicrocode = true;
+  services.logind.lidSwitch = "ignore";
+  services.logind.lidSwitchDocked = "ignore";
+  services.logind.extraConfig = ''
+    HandleSuspendKey = ignore
+  '';
+  powerManagement.enable = false;
 }
-- 
cgit v1.2.3


From 884c73d2c0542a303a8af93e522fc17e3578e622 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 18 Sep 2018 02:16:12 +0200
Subject: ma homeautomation: add mqtt broker with acl

---
 makefu/1systems/omo/hw/tsp.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'makefu/1systems/omo/hw/tsp.nix')

diff --git a/makefu/1systems/omo/hw/tsp.nix b/makefu/1systems/omo/hw/tsp.nix
index 99c558056..a289fadce 100644
--- a/makefu/1systems/omo/hw/tsp.nix
+++ b/makefu/1systems/omo/hw/tsp.nix
@@ -6,7 +6,8 @@ let
     rev = "9c9b62e15e4ac11d4379e66b974f1389daf939fe";
   });
   cfg = fromJSON (readFile ../../hardware/tsp-disk.json);
-  primaryInterface = "enp1s0";
+  # primaryInterface = "enp1s0";
+  primaryInterface = "wlp2s0";
   rootDisk = "/dev/sda"; # TODO same as disko uses
 in {
   imports = [
-- 
cgit v1.2.3