From f92644693addbd3c1fea115235e269cd2bf14be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Fri, 2 Feb 2024 10:00:51 +0100
Subject: [PATCH] stroopwafel: fix screens, inputs, and nm persistence

---
 .../.config/sway/config.d/input-defaults.conf     |  2 +-
 .../.config/sway/config.d/screens.conf            | 15 +--------------
 hosts/stroopwafel/configuration.nix               |  2 +-
 hosts/stroopwafel/hardware-configuration.nix      |  5 +++++
 hosts/stroopwafel/persistence.nix                 |  9 +++------
 5 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/hosts/stroopwafel/.config/sway/config.d/input-defaults.conf b/hosts/stroopwafel/.config/sway/config.d/input-defaults.conf
index 426eb5b..fb1f83c 100644
--- a/hosts/stroopwafel/.config/sway/config.d/input-defaults.conf
+++ b/hosts/stroopwafel/.config/sway/config.d/input-defaults.conf
@@ -1,4 +1,4 @@
-input "1739:0:Synaptics_TM3288-011" {
+input "2362:597:PNP0C50:00_093A:0255_Touchpad" {
   dwt enabled
   tap enabled
   middle_emulation enabled
diff --git a/hosts/stroopwafel/.config/sway/config.d/screens.conf b/hosts/stroopwafel/.config/sway/config.d/screens.conf
index f95c13c..a0d50dc 100644
--- a/hosts/stroopwafel/.config/sway/config.d/screens.conf
+++ b/hosts/stroopwafel/.config/sway/config.d/screens.conf
@@ -3,18 +3,5 @@ set $middle "Hewlett Packard HP E231 3CQ4290S5J"
 set $standup "Hewlett Packard HP E231 3CQ4251F33"
 
 output $internal {
-  scale 1
-  pos 1080 1080
-}
-
-output $middle {
-  scale 1
-
-  pos 1080 0
-}
-
-output $standup {
-  scale 1
-  transform 90
-  pos 0 0
+  scale 2
 }
diff --git a/hosts/stroopwafel/configuration.nix b/hosts/stroopwafel/configuration.nix
index 76a5d2c..048fe84 100644
--- a/hosts/stroopwafel/configuration.nix
+++ b/hosts/stroopwafel/configuration.nix
@@ -17,7 +17,7 @@ in {
   boot.initrd.preLVMCommands = "udevadm trigger --settle";
   boot.swraid.enable = true;
   boot.swraid.mdadmConf = ''
-DEVICE /dev/nvme0n1p2 /dev/nvme1n1p2 
+DEVICE /dev/nvme0n1p2 /dev/nvme1n1p2
 ARRAY /dev/md/nixos:root metadata=1.2 name=nixos:root UUID=67d1aa81:1b348887:c17a75e8:f2edf2bd
   '';
 
diff --git a/hosts/stroopwafel/hardware-configuration.nix b/hosts/stroopwafel/hardware-configuration.nix
index 2059399..40936cf 100644
--- a/hosts/stroopwafel/hardware-configuration.nix
+++ b/hosts/stroopwafel/hardware-configuration.nix
@@ -28,6 +28,8 @@
   fileSystems."/home" =
     { device = "/dev/disk/by-uuid/0cc568f0-402d-4535-980a-ed3a1dc697b9";
       fsType = "ext4";
+      # https://github.com/ryantm/agenix/issues/45#issuecomment-957865406
+      neededForBoot = true;
     };
 
   fileSystems."/nix" =
@@ -38,6 +40,8 @@
   fileSystems."/persist" =
     { device = "/dev/disk/by-uuid/a0855aaa-76bf-445e-b0d1-ab1552e5496f";
       fsType = "ext4";
+      # https://github.com/ryantm/agenix/issues/45#issuecomment-957865406
+      neededForBoot = true;
     };
 
   swapDevices =
@@ -54,4 +58,5 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }
diff --git a/hosts/stroopwafel/persistence.nix b/hosts/stroopwafel/persistence.nix
index 28e61c0..db4cab5 100644
--- a/hosts/stroopwafel/persistence.nix
+++ b/hosts/stroopwafel/persistence.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 {
   systemd.tmpfiles.rules = [
-    "L /home/${config.pub-solar.user.name}/Workspace/os - - - - /etc/nixos"
+    "L /etc/nixos - - - - /home/${config.pub-solar.user.name}/Workspace/os"
 
     "L /var/lib/bluetooth - - - - /persist/var/lib/bluetooth"
     "d /persist/var/lib/bluetooth 0500 root root"
@@ -9,15 +9,12 @@
     "L /var/lib/docker - - - - /persist/var/lib/docker"
     "d /persist/var/lib/docker 0510 root root"
 
-    "d /persist/etc/NetworkManager/system-connections 0500 root root"
+    "L /etc/NetworkManager/system-connections - - - - /persist/etc/NetworkManager/system-connections"
+    "d /persist/etc/NetworkManager/system-connections 0700 root root"
 
     "d /persist/etc/ssh 0400 root root"
   ];
 
-  environment.etc."NetworkManager/system-connections" = {
-    source = "/persist/etc/NetworkManager/system-connections/";
-  };
-
   services.openssh = {
     enable = true;
     hostKeys = [