diff --git a/hosts/fred/hardware-configuration.nix b/hosts/fred/hardware-configuration.nix index 3f502bd..ab7603d 100644 --- a/hosts/fred/hardware-configuration.nix +++ b/hosts/fred/hardware-configuration.nix @@ -1,24 +1,28 @@ # 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, ... }: - boot.initrd.availableKernelModules = - [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "ums_realtek" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "ums_realtek" "usbhid" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/4a1d2915-6964-4479-98c6-d17e333e83e9"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/32f31741-3647-4f0c-ae25-4ca9f5359f3d"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/FAE7-A0C7"; - fsType = "vfat"; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/E7A8-B0DB"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; swapDevices = [ ]; @@ -30,6 +34,5 @@ # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/nixos-anywhere/configuration.nix b/nixos-anywhere/configuration.nix index 8375428..1113c85 100644 --- a/nixos-anywhere/configuration.nix +++ b/nixos-anywhere/configuration.nix @@ -4,7 +4,7 @@ (modulesPath + "/profiles/qemu-guest.nix") ./disk-config.nix ]; - disko.devices.disk.main.device = "/dev/nvme0n1"; + disko.devices.disk.main.device = "/dev/sda"; boot = { kernelPackages = pkgs.linuxPackages_zen; kernelParams = [ "consoleblank=60" ]; diff --git a/nixos-anywhere/flake.lock b/nixos-anywhere/flake.lock index fa91afb..9fa1bc4 100644 --- a/nixos-anywhere/flake.lock +++ b/nixos-anywhere/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1738148035, - "narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=", + "lastModified": 1741786315, + "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", "owner": "nix-community", "repo": "disko", - "rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", + "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738136902, - "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=", + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "type": "github" }, "original": { diff --git a/nixos-anywhere/flake.nix b/nixos-anywhere/flake.nix index a85f77d..c3dd7e8 100644 --- a/nixos-anywhere/flake.nix +++ b/nixos-anywhere/flake.nix @@ -4,6 +4,10 @@ inputs.disko.inputs.nixpkgs.follows = "nixpkgs"; outputs = { nixpkgs, disko, ... }: { + nixosConfigurations.fred = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ disko.nixosModules.disko ./configuration.nix ]; + }; nixosConfigurations.book = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ disko.nixosModules.disko ./configuration.nix ];