From d183a4dc32081605c1053a95097b0b70ec700488 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Sun, 22 Dec 2024 17:26:45 -0500
Subject: [PATCH] Add zfs support to redmond, update to wg-quick

---
 hosts/envy/default.nix             |  6 ++++--
 hosts/envy/hardware/default.nix    |  4 +++-
 hosts/redmond/boot/default.nix     |  1 -
 hosts/redmond/default.nix          | 17 ++++++++++++-----
 hosts/redmond/hardware/default.nix |  6 ++++--
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/hosts/envy/default.nix b/hosts/envy/default.nix
index 4c8b482..6822f22 100644
--- a/hosts/envy/default.nix
+++ b/hosts/envy/default.nix
@@ -9,8 +9,10 @@
     ../../modules/system
   ];
 
-  networking.hostName = "envy";
-  networking.wg-quick.interfaces.wgc.address = [ "10.100.0.25/24" ];
+  networking = {
+    hostName = "envy";
+    wg-quick.interfaces.wgc.address = [ "10.100.0.25/24" ];
+  };
 
   system = {
     lanzaboote.enable = true;
diff --git a/hosts/envy/hardware/default.nix b/hosts/envy/hardware/default.nix
index b67f311..0430f9f 100644
--- a/hosts/envy/hardware/default.nix
+++ b/hosts/envy/hardware/default.nix
@@ -1,6 +1,8 @@
 # nixos-generate-config --root ./ --no-filesystems
-{ config, lib, ... }:
+{ config, lib, modulesPath, ... }:
 {
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
   boot.initrd.availableKernelModules = [ "xhci_pci" "sr_mod" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
 
diff --git a/hosts/redmond/boot/default.nix b/hosts/redmond/boot/default.nix
index 2c68222..8be768d 100644
--- a/hosts/redmond/boot/default.nix
+++ b/hosts/redmond/boot/default.nix
@@ -2,7 +2,6 @@
 {
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-    kernel.sysctl."vm.max_map_count" = 2147483642;
     kernelParams = [
       "radeon.cik_support=0"
       "amdgpu.cik_support=1"
diff --git a/hosts/redmond/default.nix b/hosts/redmond/default.nix
index e3559b5..c58ae22 100644
--- a/hosts/redmond/default.nix
+++ b/hosts/redmond/default.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, lib, ... }:
 {
   imports = [
     ./boot
@@ -8,10 +8,17 @@
     ../../modules/system
   ];
 
-  system.lanzaboote.enable = true;
+  networking = {
+    hostName = "redmond";
+    hostId = "ae713850";
+    wg-quick.interfaces.wgc.address = [ "10.100.0.23/24" ];
+  };
 
-  system.wireguard.client.enable = true;
-  networking.wireguard.interfaces.wgc.ips = [ "10.100.0.23/24" ];
+  system = {
+    lanzaboote.enable = true;
+    wireguard.client.enable = true;
+    stateVersion = "24.05";
+  };
 
-  networking.hostName = "redmond";
+  environment.sessionVariables.WLR_RENDERER = lib.mkForce "gles2";
 }
diff --git a/hosts/redmond/hardware/default.nix b/hosts/redmond/hardware/default.nix
index 33bdf20..7d3b6f4 100644
--- a/hosts/redmond/hardware/default.nix
+++ b/hosts/redmond/hardware/default.nix
@@ -1,6 +1,8 @@
-{ config, lib, ... }:
-
+# nixos-generate-config --root ./ --no-filesystems
+{ config, lib, modulesPath, ... }:
 {
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "ehci_pci" "sd_mod" "sr_mod" "sdhci_pci" "rtsx_usb_sdmmc" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-amd" ];