From be17ab59edc68123436386e10dd5ed57e4410615 Mon Sep 17 00:00:00 2001 From: Matthew Bessette Date: Wed, 8 Jan 2025 23:37:03 -0500 Subject: [PATCH] post reinstall --- _hosts/caesium/configuration.nix | 2 + _hosts/caesium/hardware-configuration.nix | 54 ++++++++++++++--------- 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/_hosts/caesium/configuration.nix b/_hosts/caesium/configuration.nix index fe4d150..3231ef0 100644 --- a/_hosts/caesium/configuration.nix +++ b/_hosts/caesium/configuration.nix @@ -114,6 +114,8 @@ kdePackages.kate vscode bottles + _1password-gui + discord ]; }; diff --git a/_hosts/caesium/hardware-configuration.nix b/_hosts/caesium/hardware-configuration.nix index c246daa..2b50610 100644 --- a/_hosts/caesium/hardware-configuration.nix +++ b/_hosts/caesium/hardware-configuration.nix @@ -8,39 +8,50 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "thunderbolt" "usbhid" ]; + boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/87bf1bb9-6f6e-470e-a45d-a1ac1644f82e"; + { device = "/dev/disk/by-uuid/99fe114e-be1a-414b-893f-669bef13baeb"; fsType = "ext4"; }; - fileSystems."/nix/store" = - { device = "/nix/store"; - fsType = "none"; - options = [ "bind" ]; - }; - - fileSystems."/efi" = - { device = "systemd-1"; - fsType = "autofs"; - }; - - fileSystems."/Steam" = - { device = "/dev/disk/by-uuid/0fba3aa4-181a-4c49-bbad-f2aa70e8cbbb"; - fsType = "ext4"; - }; - - fileSystems."/efi" = - { device = "/dev/disk/by-uuid/A4B1-EFAD"; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/EC54-3580"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; - swapDevices = [ ]; + fileSystems."/data/alpha" = + { device = "/dev/disk/by-uuid/465436bf-d997-4961-b577-2a91f9061e33"; + fsType = "ext4"; + }; + + fileSystems."/data/bravo" = + { device = "/dev/disk/by-uuid/1259b0aa-3b6d-43c3-a45a-1073e82fb554"; + fsType = "ext4"; + }; + + fileSystems."/data/charlie" = + { device = "/dev/disk/by-uuid/cb29be2a-a6e8-4581-98fd-1648de77e9c1"; + fsType = "ext4"; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/23e4cffe-4f57-486b-9a9f-24e715838a4d"; + fsType = "ext4"; + }; + + fileSystems."/nix/store" = + { device = "/dev/disk/by-uuid/77fb07a2-68f7-4f4f-a4a0-d3bcdc83b98a"; + fsType = "btrfs"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/25377ac7-4a7a-4648-abe1-f65990145c54"; } + ]; # 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 @@ -48,7 +59,6 @@ # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp15s0u1.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp8s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;