From bbc956ff51be9ced3556ebf7fea5ff8fe4832673 Mon Sep 17 00:00:00 2001 From: thiloho <123883702+thiloho@users.noreply.github.com> Date: Tue, 7 Jan 2025 16:14:44 +0000 Subject: [PATCH] Update laptop configuration --- nixos-configurations/laptop/default.nix | 2 +- .../laptop/hardware-configuration.nix | 49 +++++++------------ 2 files changed, 18 insertions(+), 33 deletions(-) diff --git a/nixos-configurations/laptop/default.nix b/nixos-configurations/laptop/default.nix index b6b5368..ed9dd5a 100644 --- a/nixos-configurations/laptop/default.nix +++ b/nixos-configurations/laptop/default.nix @@ -13,7 +13,7 @@ boot.initrd = { luks.devices = { cryptroot = { - device = "/dev/disk/by-uuid/82ba475d-faa1-488f-82c4-77c1b7bb48da"; + device = "/dev/disk/by-uuid/f1b5a08f-e515-4fba-b3f4-2a1091063cdc"; }; }; }; diff --git a/nixos-configurations/laptop/hardware-configuration.nix b/nixos-configurations/laptop/hardware-configuration.nix index 8df715c..1cd904d 100644 --- a/nixos-configurations/laptop/hardware-configuration.nix +++ b/nixos-configurations/laptop/hardware-configuration.nix @@ -1,47 +1,32 @@ # 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, - ... -}: +{ config, lib, pkgs, modulesPath, ... }: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ - "xhci_pci" - "nvme" - "usbhid" - "usb_storage" - "sd_mod" - ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/2f426371-a6be-48c1-8823-7f7006217817"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/8c24d51b-f02d-4c0c-9894-50b4209cf8c0"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/9C3E-6FAA"; - fsType = "vfat"; - options = [ - "fmask=0022" - "dmask=0022" + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/222F-191E"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/c6a47a90-a892-43c0-82e2-74b489aabc17"; } ]; - }; - - swapDevices = [ - { device = "/dev/disk/by-uuid/7cc6bc72-3ce2-451a-ba46-2b937a6e3269"; } - ]; # 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