From 950fb296ae4cf96aceb5ae619f62ebec7e3d172e Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Fri, 2 Oct 2020 17:18:15 -0400
Subject: [PATCH] move gnome user settings

---
 modules/gnome/default.nix | 23 ++++++++++++++++++++++-
 modules/gnome/settings.sh | 25 -------------------------
 2 files changed, 22 insertions(+), 26 deletions(-)
 delete mode 100755 modules/gnome/settings.sh

diff --git a/modules/gnome/default.nix b/modules/gnome/default.nix
index 4db8520..7d6f62d 100644
--- a/modules/gnome/default.nix
+++ b/modules/gnome/default.nix
@@ -29,7 +29,28 @@
     desktopManager.gnome3.enable = true;
     desktopManager.xterm.enable = false;
     displayManager.sessionCommands = ''
-      ${./settings.sh}
+      gsettings set org.gnome.desktop.background picture-uri 'file:///run/current-system/sw/share/backgrounds/gnome/adwaita-night.jpg'
+      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 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.screensaver lock-enabled false
+      gsettings set org.gnome.desktop.wm.keybindings switch-applications "['<Super>Tab']"
+      gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward "['<Shift><Super>Tab']"
+      gsettings set org.gnome.desktop.wm.keybindings switch-windows "['<Alt>Tab']"
+      gsettings set org.gnome.desktop.wm.keybindings switch-windows-backward "['<Shift><Alt>Tab']"
+      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 '[]'
+
+      echo 'window.ssd headerbar.titlebar { padding-top: 2px; padding-bottom: 2px; }' > ~/.config/gtk-3.0/gtk.css
     '';
   };
 }
diff --git a/modules/gnome/settings.sh b/modules/gnome/settings.sh
deleted file mode 100755
index a6bca35..0000000
--- a/modules/gnome/settings.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-set -x
-
-gsettings set org.gnome.desktop.background picture-uri 'file:///run/current-system/sw/share/backgrounds/gnome/adwaita-night.jpg'
-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 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.screensaver lock-enabled false
-gsettings set org.gnome.desktop.wm.keybindings switch-applications "['<Super>Tab']"
-gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward "['<Shift><Super>Tab']"
-gsettings set org.gnome.desktop.wm.keybindings switch-windows "['<Alt>Tab']"
-gsettings set org.gnome.desktop.wm.keybindings switch-windows-backward "['<Shift><Alt>Tab']"
-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 '[]'
-
-echo 'window.ssd headerbar.titlebar { padding-top: 2px; padding-bottom: 2px; }' > ~/.config/gtk-3.0/gtk.css