diff --git a/system/ookst480s/hardware-configuration.nix b/system/ookst480s/hardware-configuration.nix index c852b24..cf844be 100644 --- a/system/ookst480s/hardware-configuration.nix +++ b/system/ookst480s/hardware-configuration.nix @@ -1,3 +1,6 @@ +# 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, ... }: { @@ -5,47 +8,43 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/db84a41f-6094-46b1-b98a-26e03afc18e1"; + { device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283"; fsType = "btrfs"; options = [ "subvol=root" ]; }; - boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/3ea21f10-f705-457c-8366-a8268f658ba6"; + boot.initrd.luks.devices."cryptnix".device = "/dev/disk/by-uuid/014d725c-bf13-40a2-a9ab-0dd6185a95f6"; fileSystems."/nix" = - { device = "/dev/disk/by-uuid/db84a41f-6094-46b1-b98a-26e03afc18e1"; + { device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283"; fsType = "btrfs"; options = [ "subvol=nix" ]; }; fileSystems."/persist" = - { device = "/dev/disk/by-uuid/db84a41f-6094-46b1-b98a-26e03afc18e1"; + { device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283"; fsType = "btrfs"; options = [ "subvol=persist" ]; }; fileSystems."/swap" = - { device = "/dev/disk/by-uuid/db84a41f-6094-46b1-b98a-26e03afc18e1"; + { device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283"; fsType = "btrfs"; options = [ "subvol=swap" ]; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/45D8-8DC3"; + { device = "/dev/disk/by-uuid/F356-6F9C"; fsType = "vfat"; }; - swapDevices = [{ - device = "/swap/swapfile"; - size = 8196; - }]; - + 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 @@ -53,8 +52,8 @@ # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wwp0s20f0u2c2.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp61s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wwan0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";