From bbb4088733f438dce8e713e99583b10d3140a19b Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Mon, 25 Dec 2023 12:40:59 -0500
Subject: [PATCH] Overwrite hardware config, add ZFS params to config
Both apply to palatine-hill
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
---
systems/palatine-hill/configuration.nix | 5 +--
systems/palatine-hill/hardware.nix | 45 +++++++++++++------------
2 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/systems/palatine-hill/configuration.nix b/systems/palatine-hill/configuration.nix
index 0cee328..8d91dc7 100644
--- a/systems/palatine-hill/configuration.nix
+++ b/systems/palatine-hill/configuration.nix
@@ -2,7 +2,8 @@
{
time.timeZone = "America/New_York";
console.keyMap = "us";
- networking.hostId = "1139fa08";
+ boot.zfs.extraPools = [ "ZFS-primary" ];
+ networking.hostId = "dc2f9781";
boot.initrd.network.ssh.authorizedKeys = [ "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" ];
virtualisation = {
@@ -44,4 +45,4 @@
networking.firewall.enable = false;
system.stateVersion = "23.05";
-}
\ No newline at end of file
+}
diff --git a/systems/palatine-hill/hardware.nix b/systems/palatine-hill/hardware.nix
index 932f900..c6ceac6 100644
--- a/systems/palatine-hill/hardware.nix
+++ b/systems/palatine-hill/hardware.nix
@@ -1,37 +1,40 @@
# 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, modulesPath, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
{
- imports =
- [
- (modulesPath + "/installer/scan/not-detected.nix")
- ];
+ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
- boot = {
- initrd = {
- availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ];
- kernelModules = [ ];
- };
- kernelModules = [ "kvm-amd" ];
- extraModulePackages = [ ];
+ boot.initrd.availableKernelModules =
+ [ "xhci_pci" "mpt3sas" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+ boot.initrd.kernelModules = [ ];
+ boot.kernelModules = [ "kvm-amd" ];
+ boot.extraModulePackages = [ ];
+
+ fileSystems."/" = {
+ device = "/dev/disk/by-uuid/b3b709ce-fe88-4267-be47-bf991a512cbe";
+ fsType = "ext4";
};
- fileSystems."/" =
- {
- device = "proot/nixos/root";
- fsType = "zfs";
+ fileSystems."/boot" = {
+ device = "/dev/disk/by-uuid/4CBA-2451";
+ fsType = "vfat";
};
+ swapDevices =
+ [{ device = "/dev/disk/by-uuid/2b01e592-2297-4eb1-854b-17a63f1d4cf6"; }];
+
# 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`.
networking.useDHCP = lib.mkDefault true;
- # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
- # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
-
+ # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+ # networking.interfaces.eno2.useDHCP = lib.mkDefault true;
+ # networking.interfaces.enp72s0f3u1u2c2.useDHCP = lib.mkDefault true;
+
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
- hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
\ No newline at end of file
+ hardware.cpu.amd.updateMicrocode =
+ lib.mkDefault config.hardware.enableRedistributableFirmware;
+}