From 6c9a010c3cba3b08c0b222d3db291cd91235168f Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Sat, 23 Aug 2025 18:00:05 -0500 Subject: [PATCH] test stuff --- modules/nixos/disko/x86_64-linux/default.nix | 2 +- modules/nixos/hardware/btrfs/default.nix | 2 +- qemu.nix | 6 +- systems/x86_64-linux/nuc/default.nix | 4 +- .../nuc/hardware-configuration.nix | 63 +++++++++++++++++++ 5 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 systems/x86_64-linux/nuc/hardware-configuration.nix diff --git a/modules/nixos/disko/x86_64-linux/default.nix b/modules/nixos/disko/x86_64-linux/default.nix index a0e92f7..943eebd 100644 --- a/modules/nixos/disko/x86_64-linux/default.nix +++ b/modules/nixos/disko/x86_64-linux/default.nix @@ -93,7 +93,7 @@ in partitions = { ESP = { type = "EF00"; - size = "100M"; + size = "500M"; content = { type = "filesystem"; format = "vfat"; diff --git a/modules/nixos/hardware/btrfs/default.nix b/modules/nixos/hardware/btrfs/default.nix index 929d565..3cfed0e 100644 --- a/modules/nixos/hardware/btrfs/default.nix +++ b/modules/nixos/hardware/btrfs/default.nix @@ -1,7 +1,7 @@ { lib, ... }: { services.btrfs = { - autoScrub.enable = lib.mkDefault true; + autoScrub.enable = lib.mkDefault false; autoScrub.fileSystems = lib.mkDefault [ "/nix" "/root" diff --git a/qemu.nix b/qemu.nix index 38bb837..8d68116 100644 --- a/qemu.nix +++ b/qemu.nix @@ -8,14 +8,14 @@ writeShellApplication { echo "Usage: $0 " exit 1 fi - tmpFile=$(mktemp /tmp/test-image.XXXXXX) + tmpFile=$(mktemp /home/matt/tmp/test-image.XXXXXX) trap 'rm -f $tmpFile' EXIT cp "$1" "$tmpFile" qemu-system-x86_64 \ -enable-kvm \ - -m 2G \ + -m 4G \ -cpu max \ - -smp 2 \ + -smp 4 \ -netdev user,id=net0,hostfwd=tcp::2222-:22 \ -device virtio-net-pci,netdev=net0 \ -drive if=pflash,format=raw,readonly=on,file=${OVMF.firmware} \ diff --git a/systems/x86_64-linux/nuc/default.nix b/systems/x86_64-linux/nuc/default.nix index b6b6f2f..b7b31e2 100644 --- a/systems/x86_64-linux/nuc/default.nix +++ b/systems/x86_64-linux/nuc/default.nix @@ -5,7 +5,7 @@ { imports = [ ./boot.nix - # ./networking.nix - moved to modules/nixos/network + # ./hardware-configuration.nix ./users.nix ./sops.nix ]; @@ -18,7 +18,7 @@ services.home-assistant.enable = true; hardware.disko = { enable = true; - filesystem = "bcachefs"; + filesystem = "btrfs"; }; impermanence.enable = true; network = { diff --git a/systems/x86_64-linux/nuc/hardware-configuration.nix b/systems/x86_64-linux/nuc/hardware-configuration.nix new file mode 100644 index 0000000..a9eca65 --- /dev/null +++ b/systems/x86_64-linux/nuc/hardware-configuration.nix @@ -0,0 +1,63 @@ +# 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") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "ahci" "usbhid" "uas" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = lib.mkForce + { device = "none"; + fsType = "tmpfs"; + options = [ "mode=755" ]; + }; + + fileSystems."/boot" = lib.mkForce + { device = "UUID=0FCB-EC63"; # "/dev/disk/by-partlabel/disk-main-ESP"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + fileSystems."/var/log" = lib.mkForce + { device = "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root"; + fsType = "bcachefs"; + options = [ "X-mount.subdir=log" ]; + }; + + fileSystems."/root" = lib.mkForce + { device = lib.mkDefault "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root"; + fsType = "bcachefs"; + options = [ "X-mount.subdir=root" ]; + }; + + fileSystems."/etc" = lib.mkForce + { device = lib.mkDefault "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root"; + fsType = "bcachefs"; + options = [ "X-mount.subdir=etc" ]; + }; + + fileSystems."/nix" = lib.mkForce + { device = lib.mkDefault "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root"; + fsType = "bcachefs"; + options = [ "X-mount.subdir=nix" "verbose" ]; + }; + + fileSystems."/home" = lib.mkForce + { device = lib.mkDefault "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root"; + fsType = "bcachefs"; + options = [ "X-mount.subdir=home" ]; + }; + + swapDevices = + [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}