1 files changed, 15 insertions, 22 deletions
diff --git a/run_gnome_tweaks.sh.tmpl b/run_gnome_tweaks.sh.tmpl
index 1c6664c..eaa37d2 100755
--- a/run_gnome_tweaks.sh.tmpl
+++ b/run_gnome_tweaks.sh.tmpl
@@ -2,28 +2,21 @@
 
 set -e
 
-# TODO: Move the lookPath dconf and OS check to chezmoi ignore level
-{{ if lookPath "dconf" }}
-  dconf write /org/gnome/desktop/interface/color-scheme "'prefer-dark'"
-  {{ if eq .chezmoi.username "sophie" }}
-    dconf write /org/gnome/desktop/wm/preferences/button-layout "':appmenu,close'"
-  {{ else }}
-    dconf write /org/gnome/desktop/wm/preferences/button-layout "'close,appmenu:'"
-  {{ end }}
+# TODO: Move settings to .chezmoi.toml.tmpl
 
-  {{ if lookPath "systemd-detect-virt" }}
-    {{ $virt := output "systemd-detect-virt" }}
-    {{ if ne $virt "none" }}
-      dconf write /org/gnome/desktop/session/idle-delay "uint32 0"
-      dconf write /org/gnome/settings-daemon/plugins/power/sleep-inactive-ac-type "'nothing'"
-    {{ end }}
-  {{ end }}
+dconf write /org/gnome/desktop/interface/color-scheme "'prefer-dark'"
+{{ if eq .chezmoi.username "sophie" }}
+  dconf write /org/gnome/desktop/wm/preferences/button-layout "':appmenu,close'"
+{{ else }}
+  dconf write /org/gnome/desktop/wm/preferences/button-layout "'close,appmenu:'"
+{{ end }}
+
+{{ if and (lookPath "systemd-detect-virt") (ne (output "systemd-detect-virt") "none") }}
+  dconf write /org/gnome/desktop/session/idle-delay "uint32 0"
+  dconf write /org/gnome/settings-daemon/plugins/power/sleep-inactive-ac-type "'nothing'"
+{{ end }}
 
-  {{ if lookPath "hostnamectl" }}
-    {{ $chassis := output "hostnamectl" "chassis" }}
-      {{ if or (eq $chassis "laptop") (eq $chassis "vm") }}
-        dconf write /org/gnome/desktop/peripherals/mouse/natural-scroll "true"
-        dconf write /org/gnome/desktop/peripherals/touchpad/two-finger-scrolling-enabled "true"
-      {{ end }}
-  {{ end }}
+{{ if and (lookPath "hostnamectl") (eq (output "hostnamectl" "chassis") "laptop" "vm") }}
+  dconf write /org/gnome/desktop/peripherals/mouse/natural-scroll "true"
+  dconf write /org/gnome/desktop/peripherals/touchpad/two-finger-scrolling-enabled "true"
 {{ end }}