fix(Greeter): Multi-distro reliability updates

- Merge duplicate niri input/output KDL nodes instead of appending. Allows more overrides
- Guard AppArmor install/uninstall behind IsAppArmorEnabled() check

quickshell/Modules/Greetd/GreetdMemory.qml

@@ -11,7 +11,7 @@ Singleton {
 
     readonly property string greetCfgDir: Quickshell.env("DMS_GREET_CFG_DIR") || "/var/cache/dms-greeter"
     readonly property string sessionConfigPath: greetCfgDir + "/session.json"
-    readonly property string memoryFile: greetCfgDir + "/memory.json"
+    readonly property string memoryFile: greetCfgDir + "/.local/state/memory.json"
     readonly property bool rememberLastSession: GreetdEnv.readBoolOverride(Quickshell.env, ["DMS_GREET_REMEMBER_LAST_SESSION", "DMS_SAVE_SESSION"], true)
     readonly property bool rememberLastUser: GreetdEnv.readBoolOverride(Quickshell.env, ["DMS_GREET_REMEMBER_LAST_USER", "DMS_SAVE_USERNAME"], true)
 

quickshell/Modules/Greetd/GreeterContent.qml

@@ -37,6 +37,9 @@ Item {
     property bool cancelingExternalAuthForPassword: false
     property int defaultAuthTimeoutMs: 12000
     property int externalAuthTimeoutMs: 45000
+    property int memoryFlushDelayMs: 120
+    property string pendingLaunchCommand: ""
+    property var pendingLaunchEnv: []
     property int passwordFailureCount: 0
     property int passwordAttemptLimitHint: 0
     property string authFeedbackMessage: ""
@@ -49,7 +52,7 @@ Item {
     property string externalAuthAutoStartedForUser: ""
     readonly property bool greeterPamHasFprint: pamModuleEnabled(greetdPamText, "pam_fprintd") || (greetdPamText.includes("system-auth") && pamModuleEnabled(systemAuthPamText, "pam_fprintd")) || (greetdPamText.includes("common-auth") && pamModuleEnabled(commonAuthPamText, "pam_fprintd")) || (greetdPamText.includes("password-auth") && pamModuleEnabled(passwordAuthPamText, "pam_fprintd"))
     readonly property bool greeterPamHasU2f: pamModuleEnabled(greetdPamText, "pam_u2f") || (greetdPamText.includes("system-auth") && pamModuleEnabled(systemAuthPamText, "pam_u2f")) || (greetdPamText.includes("common-auth") && pamModuleEnabled(commonAuthPamText, "pam_u2f")) || (greetdPamText.includes("password-auth") && pamModuleEnabled(passwordAuthPamText, "pam_u2f"))
-    readonly property bool greeterExternalAuthAvailable: greeterPamHasFprint || greeterPamHasU2f
+    readonly property bool greeterExternalAuthAvailable: (greeterPamHasFprint && GreetdSettings.greeterEnableFprint) || (greeterPamHasU2f && GreetdSettings.greeterEnableU2f)
 
     function initWeatherService() {
         if (weatherInitialized)
@@ -1618,7 +1621,9 @@ Item {
             } else if (GreetdMemory.lastSuccessfulUser) {
                 GreetdMemory.setLastSuccessfulUser("");
             }
-            Greetd.launch(sessionCmd.split(" "), ["XDG_SESSION_TYPE=wayland"]);
+            pendingLaunchCommand = sessionCmd;
+            pendingLaunchEnv = ["XDG_SESSION_TYPE=wayland"];
+            memoryFlushTimer.restart();
         }
 
         function onAuthFailure(message) {
@@ -1661,6 +1666,20 @@ Item {
         }
     }
 
+    Timer {
+        id: memoryFlushTimer
+        interval: memoryFlushDelayMs
+        onTriggered: {
+            if (!pendingLaunchCommand)
+                return;
+            const sessionCommand = pendingLaunchCommand;
+            const launchEnv = pendingLaunchEnv;
+            pendingLaunchCommand = "";
+            pendingLaunchEnv = [];
+            Greetd.launch(sessionCommand.split(" "), launchEnv);
+        }
+    }
+
     Timer {
         id: authTimeout
         interval: defaultAuthTimeoutMs

quickshell/Modules/Greetd/assets/dms-greeter

@@ -179,6 +179,22 @@ export QT_QPA_PLATFORM=wayland
 export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
 export EGL_PLATFORM=gbm
 export DMS_RUN_GREETER=1
+
+ensure_cache_tree() {
+    local base="$1"
+    mkdir -p "$base/.local/state" "$base/.local/share" "$base/.cache"
+}
+
+if ! ensure_cache_tree "$CACHE_DIR" 2>/dev/null; then
+    FALLBACK_CACHE_DIR="/tmp/dms-greeter-${UID:-$(id -u)}"
+    echo "Warning: cache directory '$CACHE_DIR' is not writable; falling back to '$FALLBACK_CACHE_DIR'" >&2
+    CACHE_DIR="$FALLBACK_CACHE_DIR"
+    if ! ensure_cache_tree "$CACHE_DIR"; then
+        echo "Error: failed to initialize fallback cache directory '$CACHE_DIR'" >&2
+        exit 1
+    fi
+fi
+
 export DMS_GREET_CFG_DIR="$CACHE_DIR"
 
 if [[ -n "$REMEMBER_LAST_SESSION" ]]; then
@@ -203,11 +219,6 @@ if [[ -n "$REMEMBER_LAST_USER" ]]; then
     export DMS_SAVE_USERNAME
 fi
 
-mkdir -p "$CACHE_DIR"
-mkdir -p "$CACHE_DIR/.local/state"
-mkdir -p "$CACHE_DIR/.local/share"
-mkdir -p "$CACHE_DIR/.cache"
-
 export HOME="$CACHE_DIR"
 export XDG_STATE_HOME="$CACHE_DIR/.local/state"
 export XDG_DATA_HOME="$CACHE_DIR/.local/share"

quickshell/Modules/Settings/GreeterTab.qml

@@ -49,18 +49,24 @@ Item {
     readonly property bool greeterInstalled: greeterBinaryExists || greeterEnabled
 
     readonly property string greeterActionLabel: {
-        if (!root.greeterInstalled) return I18n.tr("Install");
-        if (!root.greeterEnabled) return I18n.tr("Activate");
+        if (!root.greeterInstalled)
+            return I18n.tr("Install");
+        if (!root.greeterEnabled)
+            return I18n.tr("Activate");
         return I18n.tr("Uninstall");
     }
     readonly property string greeterActionIcon: {
-        if (!root.greeterInstalled) return "download";
-        if (!root.greeterEnabled) return "login";
+        if (!root.greeterInstalled)
+            return "download";
+        if (!root.greeterEnabled)
+            return "login";
         return "delete";
     }
     readonly property var greeterActionCommand: {
-        if (!root.greeterInstalled) return ["dms", "greeter", "install", "--terminal"];
-        if (!root.greeterEnabled) return ["dms", "greeter", "enable", "--terminal"];
+        if (!root.greeterInstalled)
+            return ["dms", "greeter", "install", "--terminal"];
+        if (!root.greeterEnabled)
+            return ["dms", "greeter", "enable", "--terminal"];
         return ["dms", "greeter", "uninstall", "--terminal", "--yes"];
     }
     property string greeterPendingAction: ""
@@ -79,9 +85,7 @@ Item {
     }
 
     function runGreeterInstallAction() {
-        root.greeterPendingAction = !root.greeterInstalled ? "install"
-            : !root.greeterEnabled ? "activate"
-            : "uninstall";
+        root.greeterPendingAction = !root.greeterInstalled ? "install" : !root.greeterEnabled ? "activate" : "uninstall";
         greeterStatusText = I18n.tr("Opening terminal: ") + root.greeterActionLabel + "…";
         greeterInstallActionRunning = true;
         greeterInstallActionProcess.running = true;
@@ -241,6 +245,7 @@ Item {
                 root.greeterStatusText = failure;
                 root.launchGreeterSyncTerminalFallback(false, "");
             }
+            root.checkGreeterInstallState();
         }
     }
 
@@ -406,7 +411,10 @@ Item {
                     }
                 }
 
-                Item { width: 1; height: Theme.spacingM }
+                Item {
+                    width: 1
+                    height: Theme.spacingM
+                }
 
                 RowLayout {
                     width: parent.width
@@ -420,7 +428,9 @@ Item {
                         enabled: !root.greeterInstallActionRunning && !root.greeterSyncRunning
                     }
 
-                    Item { Layout.fillWidth: true }
+                    Item {
+                        Layout.fillWidth: true
+                    }
 
                     DankButton {
                         text: I18n.tr("Refresh")