From 2e5c10c06d500cef82bf5b69a58dcc0145d0c2dd Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Wed, 20 Nov 2024 22:01:34 +0000 Subject: [PATCH] smolder: new install --- system/smolder/boot-config.nix | 7 ------- system/smolder/default.nix | 2 +- system/smolder/hardware-configuration.nix | 21 +++++++++++++-------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/system/smolder/boot-config.nix b/system/smolder/boot-config.nix index 53545b7..8ce9f5c 100644 --- a/system/smolder/boot-config.nix +++ b/system/smolder/boot-config.nix @@ -24,12 +24,5 @@ in kernelPackages = pkgs.linuxPackagesFor kernel; tmp.cleanOnBoot = true; - - initrd.luks.devices.${config.networking.hostName} = { - device = "/dev/disk/by-uuid/b6b4bd3d-d7e1-463e-9a73-6d0f620e914a"; - preLVM = true; - allowDiscards = true; - bypassWorkqueues = true; - }; }; } diff --git a/system/smolder/default.nix b/system/smolder/default.nix index aac26ad..2b17bca 100644 --- a/system/smolder/default.nix +++ b/system/smolder/default.nix @@ -10,5 +10,5 @@ ]; networking.hostName = "smolder"; - system.stateVersion = "23.11"; + system.stateVersion = "24.11"; } diff --git a/system/smolder/hardware-configuration.nix b/system/smolder/hardware-configuration.nix index b0466cd..08a00a6 100644 --- a/system/smolder/hardware-configuration.nix +++ b/system/smolder/hardware-configuration.nix @@ -10,24 +10,30 @@ }: { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; boot.initrd.availableKernelModules = [ "nvme" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; + boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; fileSystems."/" = { - device = "/dev/disk/by-uuid/88c860f3-79e4-4ab0-905b-281560ae626f"; - fsType = "ext4"; + device = "UUID=5bdb4b7f-092b-4117-a865-6828bf78a52e"; + fsType = "bcachefs"; }; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/cdf9ee7e-c076-49b0-b32f-bb92d1eb596d"; - fsType = "ext4"; + device = "/dev/disk/by-uuid/8445-860A"; + fsType = "vfat"; + options = [ + "fmask=0022" + "dmask=0022" + ]; }; - swapDevices = [ { device = "/dev/disk/by-uuid/30f73056-e5c0-4349-bc85-b9a842f4458e"; } ]; + 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 @@ -37,5 +43,4 @@ # networking.interfaces.enP4p65s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; }