From 872defe627ce057c6d43d000b5285ba246e88808 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Sun, 5 Feb 2023 16:00:16 +0100
Subject: [PATCH] chore: move some common settings into core

---
 hosts/nom/default.nix                | 18 +--------
 hosts/ward/default.nix               | 22 +----------
 modules/core/default.nix             | 56 +++++++++++++++++-----------
 modules/{ => hardware}/bluetooth.nix |  0
 modules/hardware/intel.nix           |  3 ++
 modules/{ => hardware}/nvidia.nix    |  0
 modules/laptop.nix                   |  1 +
 7 files changed, 43 insertions(+), 57 deletions(-)
 rename modules/{ => hardware}/bluetooth.nix (100%)
 create mode 100644 modules/hardware/intel.nix
 rename modules/{ => hardware}/nvidia.nix (100%)

diff --git a/hosts/nom/default.nix b/hosts/nom/default.nix
index 7f2abc1..28013fb 100644
--- a/hosts/nom/default.nix
+++ b/hosts/nom/default.nix
@@ -11,7 +11,7 @@
 
     ../../modules/core
     ../../modules/dev
-
+    ../../modules/hardware/intel.nix
     ../../modules/efi.nix
     ../../modules/laptop.nix
     ../../modules/sound-pipewire.nix
@@ -25,28 +25,14 @@
     ./net.nix
   ];
 
-  boot = {
-    initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
-    kernelModules = [];
-  };
-
-  console = {
-    font = "ter-v28n";
-    keyMap = "de-latin1-nodeadkeys";
-    packages = with pkgs; [terminus_font];
-  };
-
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
   environment.systemPackages = with pkgs; [wireguard-tools powertop];
 
   hardware = {
-    enableRedistributableFirmware = true;
-    enableAllFirmware = true;
     video.hidpi.enable = true;
     opengl.enable = true;
   };
 
-  powerManagement.cpuFreqGovernor = "powersave";
-
   services = {
     fwupd.enable = true;
     smartd.enable = true;
diff --git a/hosts/ward/default.nix b/hosts/ward/default.nix
index 3029ba7..7021666 100644
--- a/hosts/ward/default.nix
+++ b/hosts/ward/default.nix
@@ -9,7 +9,7 @@
     nixos-hardware.common-pc-ssd
 
     ../../modules/core
-
+    ../../modules/hardware/intel.nix
     ../../modules/efi.nix
     ../../modules/zfs.nix
 
@@ -19,25 +19,7 @@
     ./net.nix
   ];
 
-  boot = {
-    initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"];
-    kernelModules = ["kvm-intel"];
-  };
-
-  console = {
-    font = "ter-v28n";
-    keyMap = "de-latin1-nodeadkeys";
-    packages = with pkgs; [terminus_font];
-  };
-
-  environment.systemPackages = with pkgs; [wireguard-tools powertop];
-
-  hardware = {
-    enableRedistributableFirmware = true;
-    enableAllFirmware = true;
-  };
-
-  powerManagement.cpuFreqGovernor = "powersave";
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"];
 
   services = {
     fwupd.enable = true;
diff --git a/modules/core/default.nix b/modules/core/default.nix
index d01e371..88d82a5 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -28,20 +28,23 @@ in {
   # Disable sudo which is entierly unnecessary.
   security.sudo.enable = false;
 
-  # Setup to use Secrets
-  rekey.hostPubkey = ../../secrets/pubkeys + "/${config.networking.hostName}.pub";
-  rekey.masterIdentities = [../../secrets/yk1-nix-rage.pub];
-  rekey.extraEncryptionPubkeys = [../../secrets/backup.pub];
-
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    verbose = true;
-  };
-
   time.timeZone = lib.mkDefault "Europe/Berlin";
   i18n.defaultLocale = "C.UTF-8";
 
+  console =
+    {
+      keyMap = "de-latin1-nodeadkeys";
+    }
+    // lib.mkIf video.hidpi.enable {
+      font = "ter-v28n";
+      packages = with pkgs; [terminus_font];
+    };
+
+  hardware = {
+    enableRedistributableFirmware = true;
+    enableAllFirmware = true;
+  };
+
   networking = {
     useDHCP = lib.mkForce false;
     useNetworkd = true;
@@ -57,16 +60,6 @@ in {
     "nixpkgs-overlays=/run/current-system/overlays"
   ];
 
-  programs = {
-    git = {
-      enable = true;
-      config = {
-        init.defaultBranch = "main";
-        pull.rebase = true;
-      };
-    };
-  };
-
   system = {
     extraSystemBuilderCmds = ''
       ln -sv ${pkgs.path} $out/nixpkgs
@@ -82,4 +75,25 @@ in {
   };
 
   users.mutableUsers = false;
+
+  # Setup to use Secrets
+  rekey.hostPubkey = ../../secrets/pubkeys + "/${config.networking.hostName}.pub";
+  rekey.masterIdentities = [../../secrets/yk1-nix-rage.pub];
+  rekey.extraEncryptionPubkeys = [../../secrets/backup.pub];
+
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    verbose = true;
+  };
+
+  programs = {
+    git = {
+      enable = true;
+      config = {
+        init.defaultBranch = "main";
+        pull.rebase = true;
+      };
+    };
+  };
 }
diff --git a/modules/bluetooth.nix b/modules/hardware/bluetooth.nix
similarity index 100%
rename from modules/bluetooth.nix
rename to modules/hardware/bluetooth.nix
diff --git a/modules/hardware/intel.nix b/modules/hardware/intel.nix
new file mode 100644
index 0000000..78008db
--- /dev/null
+++ b/modules/hardware/intel.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  powerManagement.cpuFreqGovernor = "powersave";
+}
diff --git a/modules/nvidia.nix b/modules/hardware/nvidia.nix
similarity index 100%
rename from modules/nvidia.nix
rename to modules/hardware/nvidia.nix
diff --git a/modules/laptop.nix b/modules/laptop.nix
index c5f5ca9..d9773d9 100644
--- a/modules/laptop.nix
+++ b/modules/laptop.nix
@@ -1,4 +1,5 @@
 {
+  environment.systemPackages = with pkgs; [powertop];
   services.logind = {
     lidSwitch = "ignore";
     lidSwitchDocked = "ignore";