feat: fixed merge incompatibilities

modules/home-manager-modules/impermanence.nix

@@ -26,8 +26,13 @@ in {
     # If impermanence is not enabled for this user but system impermanence is enabled,
     # persist the entire home directory as fallback
     (lib.mkIf (osConfig.storage.impermanence.enable && !cfg.enable && cfg.fallbackPersistence.enable) {
-      home.persistence."/persist/replicate/home" = {
+      home.persistence."${
+        if osConfig.storage.generateBase
+        then "/persist/replicate/home"
+        else "/persist/home/${config.home.username}"
+      }" = {
         directories = ["."];
+        allowOther = true;
       };
     })
   ];

modules/home-manager-modules/programs/signal.nix

@@ -4,14 +4,14 @@
   config,
   ...
 }: {
-  options.programs.signal-desktop-bin = {
+  options.programs.signal-desktop = {
     enable = lib.mkEnableOption "enable signal";
   };
 
-  config = lib.mkIf config.programs.signal-desktop-bin.enable (lib.mkMerge [
+  config = lib.mkIf config.programs.signal-desktop.enable (lib.mkMerge [
     {
       home.packages = with pkgs; [
-        signal-desktop-bin
+        signal-desktop
       ];
     }
     (

modules/nixos-modules/storage/impermanence.nix

@@ -81,6 +81,9 @@ in {
 
       programs.fuse.userAllowOther = true;
 
+      # Suppress sudo lecture on every boot since impermanence wipes the lecture status file
+      security.sudo.extraConfig = "Defaults lecture=never";
+
       fileSystems =
         lib.mapAttrs' (
           datasetName: dataset: