From 045d61b5b9691e397c6409c6479122f0886c627a Mon Sep 17 00:00:00 2001 From: Glen Goodwin Date: Tue, 19 Dec 2023 23:47:46 -0500 Subject: [PATCH] chore: update drive uuids --- hosts/candlekeep/configuration.nix | 11 ++++++++--- hosts/candlekeep/hardware-configuration.nix | 8 ++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/hosts/candlekeep/configuration.nix b/hosts/candlekeep/configuration.nix index 724a76a..5983b25 100644 --- a/hosts/candlekeep/configuration.nix +++ b/hosts/candlekeep/configuration.nix @@ -15,8 +15,9 @@ # outputs.nixosModules.example ../../common/nixos/common.nix ../../common/nixos/laptop.nix - ../../common/networking/zerotier.nix + #../../common/networking/zerotier.nix ../../common/nixos/bluetooth.nix + ../../common/nixos/restic.nix ../../common/gui/hyprland.nix ../../common/gui/thunar.nix ../../common/style/stylix.nix @@ -41,6 +42,12 @@ ./hardware-configuration.nix ]; + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + boot.initrd.luks.devices."luks-b13379b3-2025-4d55-a40a-c0f3ad8ec801".device = "/dev/disk/by-uuid/b13379b3-2025-4d55-a40a-c0f3ad8ec801"; + sops.defaultSopsFile = ../../secrets/secrets.yaml; sops.defaultSopsFormat = "yaml"; @@ -87,8 +94,6 @@ networking.hostName = "candlekeep"; networking.networkmanager.enable = true; - boot.loader.systemd-boot.enable = true; - users.users = { gwg313 = { initialPassword = "correcthorsebatterystaple"; diff --git a/hosts/candlekeep/hardware-configuration.nix b/hosts/candlekeep/hardware-configuration.nix index f9a3acb..52e9199 100644 --- a/hosts/candlekeep/hardware-configuration.nix +++ b/hosts/candlekeep/hardware-configuration.nix @@ -19,19 +19,19 @@ boot.extraModulePackages = []; fileSystems."/" = { - device = "/dev/disk/by-uuid/58fedfa4-d796-4e8f-a79d-2aa6b0f51909"; + device = "/dev/disk/by-uuid/f2c87d99-ea17-4ef3-9ef6-bcc6637357f2"; fsType = "ext4"; }; - boot.initrd.luks.devices."luks-d24cbf42-c364-49e5-b569-34accd6e46cb".device = "/dev/disk/by-uuid/d24cbf42-c364-49e5-b569-34accd6e46cb"; + boot.initrd.luks.devices."luks-58623f70-2e6b-4ee0-8d14-d2bf34c07daf".device = "/dev/disk/by-uuid/58623f70-2e6b-4ee0-8d14-d2bf34c07daf"; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/9D09-4864"; + device = "/dev/disk/by-uuid/2394-0AAF"; fsType = "vfat"; }; swapDevices = [ - {device = "/dev/disk/by-uuid/0144132b-146b-4156-9518-67450854b736";} + {device = "/dev/disk/by-uuid/dd8d717a-d872-4780-af3c-af4c702b587a";} ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking