From b477690d331ea06d2a20b29659a50ccee096dc8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vili=20Sinerv=C3=A4?= <vili.m.sinerva@gmail.com>
Date: Fri, 18 Jul 2025 10:44:43 +0300
Subject: [PATCH] Fix lithium config

---
 hosts/x86_64-linux/lithium.nix     |  1 +
 modules/roles/personal-machine.nix | 63 ++++++++++++++++--------------
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/hosts/x86_64-linux/lithium.nix b/hosts/x86_64-linux/lithium.nix
index 5369286..66ff9b3 100644
--- a/hosts/x86_64-linux/lithium.nix
+++ b/hosts/x86_64-linux/lithium.nix
@@ -3,6 +3,7 @@
   imports = [ ../../disko/luks-zfs-impermanence.nix ];
 
   custom = {
+    platform.impermanence.enable = true;
     roles = {
       desktop.enable = true;
       development.enable = true;
diff --git a/modules/roles/personal-machine.nix b/modules/roles/personal-machine.nix
index a6d8967..1f4c256 100644
--- a/modules/roles/personal-machine.nix
+++ b/modules/roles/personal-machine.nix
@@ -10,35 +10,38 @@ in
   options.custom.roles.personalMachine.enable =
     lib.mkEnableOption "role for personal machines (desktop/laptop)";
 
-  config =
-    (lib.mkIf cfg.enable {
-      custom = {
-        hardware = {
-          keychron.enable = true;
-          onlykey.enable = true;
-          trackball.enable = true;
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      {
+        custom = {
+          hardware = {
+            keychron.enable = true;
+            onlykey.enable = true;
+            trackball.enable = true;
+          };
+          programs = {
+            bitwarden.enable = true;
+            communication.enable = true;
+            firefox.enable = true;
+            i3.enable = true;
+            moonlight.enable = true;
+            redshift.enable = true;
+            usbAutoMount.enable = true;
+          };
         };
-        programs = {
-          bitwarden.enable = true;
-          communication.enable = true;
-          firefox.enable = true;
-          i3.enable = true;
-          moonlight.enable = true;
-          redshift.enable = true;
-          usbAutoMount.enable = true;
-        };
-      };
-      system.autoUpgrade.allowReboot = lib.mkForce false;
-    })
-    // (lib.mkIf config.custom.platform.impermanence.enable {
-      # TODO Remove this temporary impermanence setup in favor of a more detailed one
-      environment.persistence."/persist".directories = [
-        {
-          directory = config.users.users.vili.home;
-          user = config.users.users.vili.name;
-          group = config.users.users.vili.group;
-          mode = "u=rwx,g=,o=";
-        }
-      ];
-    });
+        system.autoUpgrade.allowReboot = lib.mkForce false;
+      }
+      (lib.mkIf config.custom.platform.impermanence.enable {
+        # TODO Remove this temporary impermanence setup in favor of a more detailed one
+        environment.persistence."/persist".directories = [
+          {
+            directory = "/home/vili";
+            user = config.users.users.vili.name;
+            group = config.users.users.vili.group;
+            mode = "u=rwx,g=,o=";
+          }
+        ];
+      })
+    ]
+  );
 }