From 39ab82ae4757c7b2a589f5fbaa79876751bbac34 Mon Sep 17 00:00:00 2001 From: smayzy Date: Sun, 27 Jul 2025 17:12:26 +0200 Subject: [PATCH] reinstall --- hosts/desktop1/configuration.nix | 9 ---- hosts/desktop1/hardware-configuration.nix | 61 +++++++++++------------ 2 files changed, 30 insertions(+), 40 deletions(-) diff --git a/hosts/desktop1/configuration.nix b/hosts/desktop1/configuration.nix index 9dc158c..1cc10f9 100644 --- a/hosts/desktop1/configuration.nix +++ b/hosts/desktop1/configuration.nix @@ -29,13 +29,4 @@ system.stateVersion = "24.11"; - boot.loader.grub.extraEntries = '' - menuentry "Archlinux" { - insmod part_gpt - insmod fat - search --no-floppy --fs-uuid --set=root 07CA-4966 - chainloader /EFI/BOOT/BOOTX64.EFI - } - ''; - } diff --git a/hosts/desktop1/hardware-configuration.nix b/hosts/desktop1/hardware-configuration.nix index 15c0b31..c880815 100644 --- a/hosts/desktop1/hardware-configuration.nix +++ b/hosts/desktop1/hardware-configuration.nix @@ -1,45 +1,44 @@ -{ - config, - lib, - pkgs, - modulesPath, - ... -}: +# 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") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "usb_storage" - "usbhid" - "sd_mod" - ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/976bcf9c-3b56-4aa6-98f8-1c899af2b0f8"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/05e716ac-e6a2-407d-9941-5ad95db74698"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/8E7F-2417"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/A238-B4BF"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/30759de4-934a-4c89-aca5-2e4fed7fe94f"; + fsType = "ext4"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/5baebd62-0a58-47c0-b2de-1f5c2970fadf"; } ]; - }; - - 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.enp4s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;