From 7d1b861630925013483beda33d5e8c808fb0d491 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Sun, 28 Mar 2021 01:05:20 -0400
Subject: [PATCH] move gnome settings to script, for wayland

---
 modules/gnome.nix | 53 +++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/modules/gnome.nix b/modules/gnome.nix
index cbbca78..d672c07 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -5,12 +5,40 @@
       numix-icon-theme
       gnome3.gnome-tweaks
       qemu_kvm
+
       (writeShellScriptBin "red" ''
         x="$(gsettings get org.gnome.settings-daemon.plugins.color night-light-enabled)"
         [ "$x" = "true" ] && x=false || x=true
         echo "Nightlight: $x"
         gsettings set org.gnome.settings-daemon.plugins.color night-light-enabled $x
       '')
+
+      (writeShellScriptBin "gnome-my-settings" ''
+        gsettings set org.gnome.desktop.interface enable-hot-corners false
+        gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita-dark'
+        gsettings set org.gnome.desktop.interface icon-theme 'Numix'
+        gsettings set org.gnome.desktop.interface show-battery-percentage true
+        gsettings set org.gnome.desktop.media-handling automount false
+        gsettings set org.gnome.desktop.media-handling autorun-never true
+        gsettings set org.gnome.desktop.notifications show-in-lock-screen false
+        gsettings set org.gnome.desktop.peripherals.mouse middle-click-emulation true
+        gsettings set org.gnome.desktop.peripherals.mouse speed 0.375
+        gsettings set org.gnome.desktop.privacy recent-files-max-age 30
+        gsettings set org.gnome.desktop.privacy remove-old-temp-files true
+        gsettings set org.gnome.desktop.privacy remove-old-trash-files true
+        gsettings set org.gnome.desktop.privacy report-technical-problems false
+        gsettings set org.gnome.desktop.privacy send-software-usage-stats false
+        gsettings set org.gnome.desktop.screensaver lock-enabled false
+        gsettings set org.gnome.desktop.wm.keybindings maximize-vertically "['<Super>w']"
+        gsettings set org.gnome.desktop.wm.keybindings toggle-fullscreen "['<Super>f']"
+        gsettings set org.gnome.desktop.wm.preferences resize-with-right-button true
+        gsettings set org.gnome.settings-daemon.plugins.media-keys logout '[]'
+        gsettings set org.gnome.settings-daemon.plugins.power power-button-action 'interactive'
+        gsettings set org.gnome.settings-daemon.plugins.power sleep-inactive-ac-type 'nothing'
+
+        echo 'window.ssd headerbar.titlebar { padding-top: 1px; padding-bottom: 1px; }' > ~/.config/gtk-3.0/gtk.css
+      '')
+
     ] ++ (with pkgs.gnomeExtensions; [
       appindicator
       dash-to-panel
@@ -26,30 +54,5 @@
     displayManager.gdm.enable = true;
     displayManager.gdm.autoSuspend = false;
     desktopManager.gnome3.enable = true;
-    displayManager.sessionCommands = ''
-      gsettings set org.gnome.desktop.interface enable-hot-corners false
-      gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita-dark'
-      gsettings set org.gnome.desktop.interface icon-theme 'Numix'
-      gsettings set org.gnome.desktop.interface show-battery-percentage true
-      gsettings set org.gnome.desktop.media-handling automount false
-      gsettings set org.gnome.desktop.media-handling autorun-never true
-      gsettings set org.gnome.desktop.notifications show-in-lock-screen false
-      gsettings set org.gnome.desktop.peripherals.mouse middle-click-emulation true
-      gsettings set org.gnome.desktop.peripherals.mouse speed 0.375
-      gsettings set org.gnome.desktop.privacy recent-files-max-age 30
-      gsettings set org.gnome.desktop.privacy remove-old-temp-files true
-      gsettings set org.gnome.desktop.privacy remove-old-trash-files true
-      gsettings set org.gnome.desktop.privacy report-technical-problems false
-      gsettings set org.gnome.desktop.privacy send-software-usage-stats false
-      gsettings set org.gnome.desktop.screensaver lock-enabled false
-      gsettings set org.gnome.desktop.wm.keybindings maximize-vertically "['<Super>w']"
-      gsettings set org.gnome.desktop.wm.keybindings toggle-fullscreen "['<Super>f']"
-      gsettings set org.gnome.desktop.wm.preferences resize-with-right-button true
-      gsettings set org.gnome.settings-daemon.plugins.media-keys logout '[]'
-      gsettings set org.gnome.settings-daemon.plugins.power power-button-action 'interactive'
-      gsettings set org.gnome.settings-daemon.plugins.power sleep-inactive-ac-type 'nothing'
-
-      echo 'window.ssd headerbar.titlebar { padding-top: 1px; padding-bottom: 1px; }' > ~/.config/gtk-3.0/gtk.css
-    '';
   };
 }