From 8f57daf4bdcb1d752b1868e3b8b6e36fc71ca872 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 17 Oct 2020 23:38:38 -0400
Subject: [PATCH] Minor refactors

---
 modules/desktop/browsers/qutebrowser.nix | 6 +++---
 modules/desktop/default.nix              | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/desktop/browsers/qutebrowser.nix b/modules/desktop/browsers/qutebrowser.nix
index 1e382cee..8ac7e961 100644
--- a/modules/desktop/browsers/qutebrowser.nix
+++ b/modules/desktop/browsers/qutebrowser.nix
@@ -9,9 +9,9 @@ with lib;
 with lib.my;
 let cfg = config.modules.desktop.browsers.qutebrowser;
 in {
-  options.modules.desktop.browsers.qutebrowser = {
+  options.modules.desktop.browsers.qutebrowser = with types; {
     enable = mkBoolOpt false;
-    userStyles = mkOpt types.lines "";
+    userStyles = mkOpt lines "";
   };
 
   config = mkIf cfg.enable {
@@ -32,7 +32,7 @@ in {
         source = "${configDir}/qutebrowser";
         recursive = true;
       };
-      dataFile."qutebrowser/userstyles.css".text = userStyles;
+      dataFile."qutebrowser/userstyles.css".text = cfg.userStyles;
     };
   };
 }
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 8d98794a..1fd5ad81 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -114,13 +114,17 @@ in {
     env.GTK_DATA_PREFIX = [ "${config.system.path}" ];
     env.QT_QPA_PLATFORMTHEME = "gtk2";
     qt5 = { style = "gtk2"; platformTheme = "gtk2"; };
-    # Also, read xresources files in ~/.config/xtheme/* and init scripts in
-    # ~/.config/xsessions/*, so I can centralize my theme config files.
+
     services.xserver.displayManager.sessionCommands =
       let cfg = config.services.xserver.desktopManager.wallpaper; in ''
+        # Also, read xresources files in ~/.config/xtheme/* and init scripts in
+        # ~/.config/xsessions/*, so I can centralize my theme config files.
         export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc"
         source "$XDG_CONFIG_HOME"/xsession/*.sh
         xrdb -merge "$XDG_CONFIG_HOME"/xtheme/*
+
+        # Set the wallpaper ourselves so we don't need .background-image and/or
+        # .fehbg polluting $HOME
         if [ -e "$XDG_DATA_HOME/wallpaper" ]; then
           ${pkgs.feh}/bin/feh --bg-${cfg.mode} \
             ${optionalString cfg.combineScreens "--no-xinerama"} \