From f750a38181466cd79520b268d07acd8058ccfea5 Mon Sep 17 00:00:00 2001 From: ctsk <9384305+ctsk@users.noreply.github.com> Date: Mon, 23 Sep 2024 18:23:49 +0200 Subject: [PATCH] [fugitive] Bring yourself back online --- lib/systems/fugitive/default.nix | 2 +- lib/systems/fugitive/hardware.nix | 7 +++++-- secrets/grafana.age | 16 +++++++++------- secrets/namecheap.age | 16 +++++++++------- secrets/secrets.nix | 2 +- 5 files changed, 25 insertions(+), 18 deletions(-) diff --git a/lib/systems/fugitive/default.nix b/lib/systems/fugitive/default.nix index fe9804a..b62cb16 100644 --- a/lib/systems/fugitive/default.nix +++ b/lib/systems/fugitive/default.nix @@ -118,5 +118,5 @@ in boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - system.stateVersion = "23.05"; + system.stateVersion = "24.05"; } diff --git a/lib/systems/fugitive/hardware.nix b/lib/systems/fugitive/hardware.nix index 75d71ef..dae0ea1 100644 --- a/lib/systems/fugitive/hardware.nix +++ b/lib/systems/fugitive/hardware.nix @@ -6,7 +6,7 @@ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; @@ -59,7 +59,10 @@ ]; }; - swapDevices = [ ]; + swapDevices = + [ + { device = "/dev/disk/by-label/Swap"; } + ]; # 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 diff --git a/secrets/grafana.age b/secrets/grafana.age index 1a6b7c2..c42ad33 100644 --- a/secrets/grafana.age +++ b/secrets/grafana.age @@ -1,8 +1,10 @@ age-encryption.org/v1 --> ssh-ed25519 jfi4TQ a9RF/wMLY4K4QdRerb/884GDUbxCbAYEHDtGDGUEbH0 -XW7JAh516Z0Ld02/NK5FaZ1XSpCJbW7mwTZQaLmC8Nk --> =U.,!-=_-grease -CjxZKY66lnUzRVMYNXFNEJh2nNdlQ/RVQHq2fZrWptelVXqe3bYXuI2d47Sm4E+7 -jD9++lM ---- /toZRWJ5mLoptTqJyyFaw1NiBG1JNLxcDqfifyMjjLo -FG=*9Ng0'-ZCARA|-FeXcd6.Y(-J \ No newline at end of file +-> ssh-ed25519 1ndszQ 0CfNFbdW+AwJAdO9ePw006CoG3suP18rGNalZzdMtlI +qJeTyVm7uFjWEMRpLHj1HhYQfNFjTXKK2foUXW5PNe0 +-> +L-grease GU|0x~!E #5:%N$ n, +NKBzWgoTV7uLRlbb68S8AQQ5vZRMeyXvz6XKRpAIR1oVuW7MwAmX2B3E5drvLFev +97JfGik/ +--- Rkm1HEAT4sIwoK8SKQPnpraZxn9DoiYpWPTPffOHlk8 +whedEɠ>rid +*VS8 +1rnQb:^|h \ No newline at end of file diff --git a/secrets/namecheap.age b/secrets/namecheap.age index 1ec269a..f85d946 100644 --- a/secrets/namecheap.age +++ b/secrets/namecheap.age @@ -1,8 +1,10 @@ age-encryption.org/v1 --> ssh-ed25519 jfi4TQ Mr2LVSJ3Qs03ZQm6/QXpl0Cj5szDcS96FykXk5WLnw0 -hHTV/lno3zsmJbxQLvMxBO8CPXBUpFkDuS5595QHpsE --> <{fBHP-grease FcCEA :6 SSUZ y,$Ho -JzJVrqUxVGP8TMZkNaj9Og3kvL3buI6b+DSfkDg/UBqVAign2dcvOh0njPFHDRDd -7jK+4c1x9e8fdas4Z+ceorzj4TYYTYLVakc68MV9FbJ9LOmn ---- L6xbkwzb4O64N0mM/L7I/+o/Z+MABEZhlzGoszoCapY -fx 6h5~z j2H.&Ť8 62y1$3qP(SE STFR 5JZO.5CF_] \ No newline at end of file +-> ssh-ed25519 1ndszQ 5GarcD18NSDPuyRmTaA7QGUfHbsZMF7BeCVwpx1Volk +08Vb+qLv7wO551ocBU1JrR9ZfZsK+Y+i+YVib1m4XmQ +-> PFk-grease D ba`MOA8v DZ W +9pv1Y9Go79SBAIewUjHFe86oYyJomWgAKA55KH+LsNEi83jpO8ezbfC1jKrJyaoE +Dlsu1AdW0zKsQ06uNKMsxgld3bcHBagDn7Sw5uI9u+morLtPX2MdDn4I1SXIWrZx +Ej0 +--- Z3hXDtf6NQFRWhbBizpPc8nZ4X0ROAWIsitTkUxuWEs +-qJoaHҩgkXYkH+nNTG֭M\vշ[XDTD̈z(/,tO߻Pղ˭1 +cWܔc| \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index f990d0d..b3936c4 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,5 +1,5 @@ let - fugitive = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHVatfyuEoMyvQedoS/dvjPg9NZZYlmWgUnNOGvwVe6"; + fugitive = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOSkT5PFJVo3sLsp9wIXRc4fzQfY2uglrqO9HS97Zoa/"; outpost = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEzLAqfB+Ym1HN1QtQblO8wzH9GXBoXS37EN0lSNiew0"; in {