From 02908dc450b62d20c94dde7a7a8b258a561f1d76 Mon Sep 17 00:00:00 2001
From: ediblerope <fredrik@nordhammer.it>
Date: Wed, 3 Dec 2025 11:01:51 +0000
Subject: [PATCH] Update common.nix

---
 common.nix | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/common.nix b/common.nix
index b5b5501..1f033c6 100644
--- a/common.nix
+++ b/common.nix
@@ -24,16 +24,25 @@ services.displayManager.gdm.enable = true;
 services.desktopManager.gnome.enable = true;
 
 # Apply GNOME settings on login
-environment.etc."profile.d/gnome-settings.sh".text = ''
-  echo "Running GNOME settings script..." >> /home/fred/gnome-settings.log
-  if [ "$XDG_SESSION_DESKTOP" = "gnome" ]; then
-    gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
-    gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita-dark'
-    gsettings set org.gnome.desktop.wm.keybindings close "['<Super>q']"
-    gsettings set org.gnome.settings-daemon.plugins.media-keys home "['<Super>e']"
-    gsettings set org.gnome.settings-daemon.plugins.media-keys control-center "['<Super>i']"
-  fi
-'';
+systemd.user.services.gnomeSettings = {
+  description = "Apply GNOME custom settings";
+  wantedBy = [ "default.target" ];
+  after = [ "graphical-session.target" ];
+  serviceConfig = {
+    Type = "oneshot";
+    ExecStart = pkgs.writeShellScript "apply-gnome-settings" ''
+      echo "Running GNOME settings script..." >> /home/fred/gnome-settings.log
+      export DBUS_SESSION_BUS_ADDRESS=unix:path=$XDG_RUNTIME_DIR/bus
+
+      gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
+      gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita-dark'
+      gsettings set org.gnome.desktop.wm.keybindings close "['<Super>q']"
+      gsettings set org.gnome.settings-daemon.plugins.media-keys home "['<Super>e']"
+      gsettings set org.gnome.settings-daemon.plugins.media-keys control-center "['<Super>i']"
+    '';
+  };
+};
+
 
 # Define a user account. Don't forget to set a password with ‘passwd’.
 users.users.fred = {