Fix bugs

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

hosts/common/system/configs/impermanence/default.nix

@@ -19,6 +19,7 @@
       after = [ "cryptsetup.target" ];
       unitConfig.DefaultDependencies = false;
       serviceConfig.Type = "oneshot";
+      environment.DEVICE = config.environment.impermanence.device;
       script = builtins.readFile ./scripts/wipe.sh;
     };
   };

hosts/common/system/configs/impermanence/options.nix

@@ -43,9 +43,19 @@ let
     ) [ ] parents;
 in
 {
-  options.environment.persistence =
+  options.environment =
     with lib;
     with types;
+    {
+      impermanence.device = mkOption {
+        type = str;
+        default = config.disko.devices.disk.main.content.partitions.root.content.name;
+        description = ''
+          LUKS BTRFS partition to wipe on boot.
+        '';
+      };
+
+      persistence =
         let
           isPathLike = strings.hasPrefix "/";
         in
@@ -163,6 +173,7 @@ in
           default = { };
           description = "Persistence config.";
         };
+    };
 
   config =
     let

hosts/common/system/configs/impermanence/scripts/wipe.sh

@@ -6,8 +6,13 @@ delete_subvolume_recursively() {
   btrfs subvolume delete "$1"
 }
 
+if [[ -z "$DEVICE" ]]; then
+  echo "Error: DEVICE variable is not set."
+  exit 1
+fi
+
 mkdir -p /mnt/btrfs
-mount /dev/mapper/luks /mnt/btrfs
+mount "/dev/mapper/$DEVICE" /mnt/btrfs
 
 if [[ -e /mnt/btrfs/@ ]]; then
   mkdir -p /mnt/btrfs/@.bak

hosts/common/system/configs/libvirt/default.nix

@@ -16,7 +16,10 @@
     description = "Start Default Virtual Network for Libvirt";
     script = "${config.virtualisation.libvirtd.package}/bin/virsh net-start default";
     preStop = "${config.virtualisation.libvirtd.package}/bin/virsh net-destroy default";
-    serviceConfig.Type = "oneshot";
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
     wantedBy = [ "libvirtd.service" ];
     after = [ "libvirtd.service" ];
   };

hosts/common/system/configs/nix-cleanup/cleanup.sh

@@ -16,8 +16,13 @@ if [[ -e /mnt/btrfs && -n $(mountpoint -q /mnt/btrfs) ]]; then
   exit 1
 fi
 
+if [[ -z "$DEVICE" ]]; then
+  echo "Error: DEVICE variable is not set."
+  exit 1
+fi
+
 mkdir -p /mnt/btrfs
-mount /dev/mapper/luks /mnt/btrfs
+mount "/dev/mapper/$DEVICE" /mnt/btrfs
 
 if [[ -e /mnt/btrfs/@.bak ]]; then
   if [[ -n "$(ls -A /mnt/btrfs/@.bak)" ]]; then

hosts/common/system/configs/nix-cleanup/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 {
   environment.systemPackages = [
     (pkgs.writeShellApplication {
@@ -10,6 +10,7 @@
         btrfs-progs
         nix
       ];
+      runtimeEnv.DEVICE = config.environment.impermanence.device;
       text = builtins.readFile ./cleanup.sh;
     })
   ];

hosts/eirene/format.nix

@@ -38,7 +38,7 @@
             name = "root";
             size = "100%";
             content = {
-              name = "luks";
+              name = "main";
               type = "luks";
               settings = {
                 allowDiscards = true;

hosts/elara/default.nix

@@ -1,4 +1,5 @@
 {
+  config,
   inputs,
   lib,
   pkgs,
@@ -23,7 +24,6 @@
     ../common/system/configs/git
     ../common/system/configs/gpg-agent
     ../common/system/configs/impermanence
-    ../common/system/configs/libvirt
     ../common/system/configs/lsof
     ../common/system/configs/ncdu
     ../common/system/configs/neovim
@@ -51,7 +51,7 @@
     ./users/nikara
   ];
 
-  networking.hostName = "sas";
+  networking.hostName = "elara";
   i18n.defaultLocale = "en_US.UTF-8";
   sops.defaultSopsFile = ./secrets/secrets.yaml;
 
@@ -110,6 +110,9 @@
     ];
   };
 
+  environment.impermanence.device =
+    config.disko.devices.disk.usb.content.partitions.root.content.name;
+
   nixpkgs = {
     hostPlatform = "x86_64-linux";
 

hosts/elara/format.nix

@@ -4,7 +4,7 @@
 }:
 {
   disko.devices = {
-    disk.main = {
+    disk.usb = {
       inherit device;
       type = "disk";
       content = {
@@ -30,7 +30,7 @@
             name = "root";
             size = "100%";
             content = {
-              name = "luks";
+              name = "usb";
               type = "luks";
               settings = {
                 allowDiscards = true;

hosts/elara/users/nikara/default.nix

@@ -109,7 +109,7 @@ in
       "globalprotect/gateway".sopsFile = ../../../../secrets/sas/secrets.yaml;
     };
 
-    theme.wallpaper = ../../../../static/wallpapers/clouds.png;
+    theme.wallpaper = ../../../../static/wallpapers/snow.jpg;
 
     programs.obsidian.vaults."Documents/Obsidian/master".enable = true;
   };