From 3304d04d9ddbe69d87432e3021747f7cb42df45c Mon Sep 17 00:00:00 2001 From: blake Date: Mon, 3 Nov 2025 22:35:46 -0600 Subject: [PATCH] dear lord PLEASE --- .../nixos/yveltal/hardware-configuration.nix | 33 ----------- .../yveltal/hardware-configuration.nix.bak | 59 +++++++++++++++++++ 2 files changed, 59 insertions(+), 33 deletions(-) create mode 100644 hosts/nixos/yveltal/hardware-configuration.nix.bak diff --git a/hosts/nixos/yveltal/hardware-configuration.nix b/hosts/nixos/yveltal/hardware-configuration.nix index 5d69991..abb5fb2 100644 --- a/hosts/nixos/yveltal/hardware-configuration.nix +++ b/hosts/nixos/yveltal/hardware-configuration.nix @@ -13,39 +13,6 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/mapper/crypted"; - fsType = "btrfs"; - options = [ "subvol=@root" ]; - }; - - boot.initrd.luks.devices."crypted".device = "/dev/disk/by-partlabel/disk-main-luks"; - - fileSystems."/.swapvol" = - { device = "/dev/mapper/crypted"; - fsType = "btrfs"; - options = [ "subvol=@swap" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-partlabel/disk-main-ESP"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - fileSystems."/home" = - { device = "/dev/mapper/crypted"; - fsType = "btrfs"; - options = [ "subvol=@home" ]; - }; - - fileSystems."/nix" = - { device = "/dev/mapper/crypted"; - fsType = "btrfs"; - options = [ "subvol=@nix" ]; - }; - - swapDevices = [ ]; # 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 diff --git a/hosts/nixos/yveltal/hardware-configuration.nix.bak b/hosts/nixos/yveltal/hardware-configuration.nix.bak new file mode 100644 index 0000000..5d69991 --- /dev/null +++ b/hosts/nixos/yveltal/hardware-configuration.nix.bak @@ -0,0 +1,59 @@ +# 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" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/mapper/crypted"; + fsType = "btrfs"; + options = [ "subvol=@root" ]; + }; + + boot.initrd.luks.devices."crypted".device = "/dev/disk/by-partlabel/disk-main-luks"; + + fileSystems."/.swapvol" = + { device = "/dev/mapper/crypted"; + fsType = "btrfs"; + options = [ "subvol=@swap" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-partlabel/disk-main-ESP"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + fileSystems."/home" = + { device = "/dev/mapper/crypted"; + fsType = "btrfs"; + options = [ "subvol=@home" ]; + }; + + fileSystems."/nix" = + { device = "/dev/mapper/crypted"; + fsType = "btrfs"; + options = [ "subvol=@nix" ]; + }; + + swapDevices = [ ]; + + # 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..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}