From d42866d4a9cdea1c6d04091343976d94ddc699ee Mon Sep 17 00:00:00 2001
From: Andreas Glashauser <ag@andreasglashauser.com>
Date: Tue, 1 Apr 2025 09:52:23 +0200
Subject: [PATCH] CHANGED: Mitigate Fedora issue by replacing file.managed
 source: in common.darkmode

---
 .../common/darkmode/darkmode--configure.sls   | 26 ++++++++++++++++---
 user_salt/common/darkmode/files/darkmode.sh   |  4 ---
 user_salt/common/darkmode/files/environment   |  1 -
 user_salt/common/darkmode/init.sls            |  2 +-
 4 files changed, 24 insertions(+), 9 deletions(-)
 delete mode 100644 user_salt/common/darkmode/files/darkmode.sh
 delete mode 100644 user_salt/common/darkmode/files/environment

diff --git a/user_salt/common/darkmode/darkmode--configure.sls b/user_salt/common/darkmode/darkmode--configure.sls
index b4b7b5d..fedce05 100644
--- a/user_salt/common/darkmode/darkmode--configure.sls
+++ b/user_salt/common/darkmode/darkmode--configure.sls
@@ -1,12 +1,32 @@
 darkmode--configure-profile:
   file.managed:
     - name: /etc/profile.d/darkmode.sh
-    - source: salt://common/darkmode/files/darkmode.sh
+    - contents: |
+        #!/bin/bash
+        export QT_QPA_PLATFORMTHEME=gtk2
+        export QT_STYLE_OVERRIDE=Adwaita-dark
+        export GTK_THEME=Adwaita:dark
     - user: root
     - group: root
     - mode: 755
 
+darkmode--ensure-environment-file-exists:
+  file.managed:
+    - name: /etc/environment
+    - user: root
+    - group: root
+    - mode: 644
+    - create: True
+    - replace: False
+
 darkmode--configure-environment:
-  file.append:
+  file.blockreplace:
     - name: /etc/environment
-    - source: salt://common/darkmode/files/environment
+    - marker_start: "# {mark} QT THEME SETTING (SALT) - START"
+    - marker_end: "# {mark} QT THEME SETTING (SALT) - END"
+    - content: |
+        QT_QPA_PLATFORMTHEME=gtk2
+    - append_if_not_found: True
+    - show_changes: True
+    - require:
+      - file: darkmode--ensure-environment-file-exists
diff --git a/user_salt/common/darkmode/files/darkmode.sh b/user_salt/common/darkmode/files/darkmode.sh
deleted file mode 100644
index e420f4b..0000000
--- a/user_salt/common/darkmode/files/darkmode.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-export QT_QPA_PLATFORMTHEME=gtk2
-export QT_STYLE_OVERRIDE=Adwaita-dark
-export GTK_THEME=Adwaita:dark
diff --git a/user_salt/common/darkmode/files/environment b/user_salt/common/darkmode/files/environment
deleted file mode 100644
index acaddfc..0000000
--- a/user_salt/common/darkmode/files/environment
+++ /dev/null
@@ -1 +0,0 @@
-QT_QPA_PLATFORMTHEME=gtk2
diff --git a/user_salt/common/darkmode/init.sls b/user_salt/common/darkmode/init.sls
index a813d5d..d2fb784 100644
--- a/user_salt/common/darkmode/init.sls
+++ b/user_salt/common/darkmode/init.sls
@@ -1,3 +1,3 @@
 include:
   - common.darkmode.darkmode--configure
-  - common.darkmode.darkmode--install-packages
+#  - common.darkmode.darkmode--install-packages
-- 
2.39.5