From fcd5a051b1fc299b8bf05364bdd272a98759e7a4 Mon Sep 17 00:00:00 2001
From: notohh <github@notohh.dev>
Date: Sat, 10 Jun 2023 17:37:24 -0400
Subject: [PATCH] hosts: formatting, move kernelPackages to module

---
 hosts/ame/default.nix                |  3 --
 hosts/ame/hardware-configuration.nix | 56 +++++++++++++---------------
 hosts/kariru/default.nix             |  2 -
 hosts/sakura/default.nix             |  2 -
 hosts/tsuki/default.nix              |  1 -
 hosts/yuki/default.nix               |  2 -
 6 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/hosts/ame/default.nix b/hosts/ame/default.nix
index aa09cb7..57488f5 100644
--- a/hosts/ame/default.nix
+++ b/hosts/ame/default.nix
@@ -20,10 +20,7 @@
     };
   };
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
   networking.hostName = "ame";
-  networking.wireless.enable = true;
   services.xserver.enable = true;
 
   services.xserver.displayManager.sddm.enable = true;
diff --git a/hosts/ame/hardware-configuration.nix b/hosts/ame/hardware-configuration.nix
index 1e30de2..83aa026 100644
--- a/hosts/ame/hardware-configuration.nix
+++ b/hosts/ame/hardware-configuration.nix
@@ -1,41 +1,35 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "sd_mod"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/57411820-f154-497e-9c7e-dfcb1f21c5cf";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/57411820-f154-497e-9c7e-dfcb1f21c5cf";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot/efi" =
-    { device = "/dev/disk/by-uuid/4D09-1D57";
-      fsType = "vfat";
-    };
+  fileSystems."/boot/efi" = {
+    device = "/dev/disk/by-uuid/4D09-1D57";
+    fsType = "vfat";
+  };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/4f69ab31-f6a9-4799-92f1-5abbe0dc9180"; }
-    ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  swapDevices = [
+    {device = "/dev/disk/by-uuid/4f69ab31-f6a9-4799-92f1-5abbe0dc9180";}
+  ];
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/hosts/kariru/default.nix b/hosts/kariru/default.nix
index 183fd8c..10685d7 100644
--- a/hosts/kariru/default.nix
+++ b/hosts/kariru/default.nix
@@ -14,8 +14,6 @@
     };
   };
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
   networking = {
     hostName = "kariru";
   };
diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix
index ee7ef4a..b60ee16 100644
--- a/hosts/sakura/default.nix
+++ b/hosts/sakura/default.nix
@@ -18,8 +18,6 @@
     };
   };
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
   networking = {
     hostName = "sakura";
   };
diff --git a/hosts/tsuki/default.nix b/hosts/tsuki/default.nix
index b3edcfa..5fa93b1 100755
--- a/hosts/tsuki/default.nix
+++ b/hosts/tsuki/default.nix
@@ -22,7 +22,6 @@
     };
   };
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out];
   boot.kernelModules = ["v4l2loopback" "kvm-intel"];
 
diff --git a/hosts/yuki/default.nix b/hosts/yuki/default.nix
index 44835c6..fd5360a 100644
--- a/hosts/yuki/default.nix
+++ b/hosts/yuki/default.nix
@@ -16,8 +16,6 @@
     };
   };
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
   networking.hostName = "yuki";
 
   networking.networkmanager.enable = true;