From 1025f6466cbed88c6afd901c5b81d8f651a9b4be Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Tue, 6 Jul 2021 13:04:16 +0200
Subject: [PATCH] Improve wallpaper logic

---
 home-manager/roles/games.nix     | 18 +++++++++---------
 home-manager/roles/state.nix     |  1 -
 home-manager/roles/wallpaper.nix |  9 +++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/home-manager/roles/games.nix b/home-manager/roles/games.nix
index 71583dfc..7b530261 100644
--- a/home-manager/roles/games.nix
+++ b/home-manager/roles/games.nix
@@ -48,15 +48,15 @@ let
 in
 {
 
-  dconf.settings."org/gnome/settings-daemon/plugins/media-keys" = {
-    mic-mute = lib.mkForce [ ];
-    next = lib.mkForce [ ];
-    play = lib.mkForce [ ];
-    previous = lib.mkForce [ ];
-    screensaver = lib.mkForce [ ];
-    volume-down = lib.mkForce [ ];
-    volume-up = lib.mkForce [ ];
-  };
+  #dconf.settings."org/gnome/settings-daemon/plugins/media-keys" = {
+  #mic-mute = lib.mkForce [ ];
+  #next = lib.mkForce [ ];
+  #play = lib.mkForce [ ];
+  #previous = lib.mkForce [ ];
+  #screensaver = lib.mkForce [ ];
+  #volume-down = lib.mkForce [ ];
+  #volume-up = lib.mkForce [ ];
+  #};
 
   home.packages = builtins.attrValues {
     #factorio = pkgs.factorio.override {
diff --git a/home-manager/roles/state.nix b/home-manager/roles/state.nix
index 8ba8f3f0..328cec85 100644
--- a/home-manager/roles/state.nix
+++ b/home-manager/roles/state.nix
@@ -15,7 +15,6 @@ let
     ".task"
     ".vdirsyncer"
     ".vimhist"
-    ".wallpapers"
     "Maildir"
     "git"
     "media"
diff --git a/home-manager/roles/wallpaper.nix b/home-manager/roles/wallpaper.nix
index 2aeaf19a..335645be 100644
--- a/home-manager/roles/wallpaper.nix
+++ b/home-manager/roles/wallpaper.nix
@@ -1,5 +1,6 @@
-{ modeFile }: { pkgs, ... }:
+{ modeFile }: { pkgs, config, ... }:
 let
+  wallPapers = "${config.home.homeDirectory}/media/images/wallpapers";
   randomWallpaper = pkgs.writeHaskellScript
     {
       name = "random-wallpaper";
@@ -8,10 +9,10 @@ let
     } ''
     main = do
        mode <- cat "${modeFile}" |> captureTrim
-       (lines . decodeUtf8 -> files) <- ls ([i|/home/maralorn/.wallpapers/#{mode}|] :: String) |> captureTrim
+       (lines . decodeUtf8 -> files) <- ls ([i|${wallPapers}/#{mode}|] :: String) |> captureTrim
        ((files Unsafe.!!) -> file) <- getStdRandom $ randomR (0, length files - 1)
        (decodeUtf8 -> current) <- gsettings "get" "org.gnome.desktop.background" "picture-uri" |> captureTrim
-       let new = [i|file:///home/maralorn/.wallpapers/#{mode}/#{file}|] :: String
+       let new = [i|file:///${wallPapers}/#{mode}/#{file}|] :: String
        when (new /= current) $ do
          gsettings "set" "org.gnome.desktop.background" "picture-uri" new
          gsettings "set" "org.gnome.desktop.screensaver" "picture-uri" new
@@ -28,7 +29,7 @@ in
       };
     };
     timers.random-wallpaper = {
-      Timer = { OnCalendar = "*:00/30:00"; };
+      Timer = { OnCalendar = "*:00/30:00"; OnActiveSec = 10; };
       Install = { WantedBy = [ "timers.target" ]; };
     };
   };