From 1b9a044b44d12096dbad27db3a44d5c911ec9eb4 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 12 Dec 2015 19:37:13 +0100
Subject: l 3 fetchWallpaper -> k 3 fetchWallpaper

---
 krebs/3modules/default.nix        |  1 +
 krebs/3modules/fetchWallpaper.nix | 89 +++++++++++++++++++++++++++++++++++++++
 lass/2configs/fetchWallpaper.nix  |  2 +-
 lass/3modules/default.nix         |  1 -
 lass/3modules/fetchWallpaper.nix  | 89 ---------------------------------------
 5 files changed, 91 insertions(+), 91 deletions(-)
 create mode 100644 krebs/3modules/fetchWallpaper.nix
 delete mode 100644 lass/3modules/fetchWallpaper.nix

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 6d2b090a..740ba67b 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -12,6 +12,7 @@ let
       ./current.nix
       ./exim-retiolum.nix
       ./exim-smarthost.nix
+      ./fetchWallpaper.nix
       ./github-hosts-sync.nix
       ./git.nix
       ./go.nix
diff --git a/krebs/3modules/fetchWallpaper.nix b/krebs/3modules/fetchWallpaper.nix
new file mode 100644
index 00000000..a3eddcc2
--- /dev/null
+++ b/krebs/3modules/fetchWallpaper.nix
@@ -0,0 +1,89 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.krebs.fetchWallpaper;
+
+  out = {
+    options.krebs.fetchWallpaper = api;
+    config = mkIf cfg.enable imp;
+  };
+
+  api = {
+    enable = mkEnableOption "fetch wallpaper";
+    predicate = mkOption {
+      type = with types; nullOr path;
+      default = null;
+    };
+    url = mkOption {
+      type = types.str;
+    };
+    timerConfig = mkOption {
+      type = types.unspecified;
+      default = {
+        OnCalendar = "*:00,10,20,30,40,50";
+      };
+    };
+    stateDir = mkOption {
+      type = types.str;
+      default = "/tmp/wallpaper";
+    };
+    display = mkOption {
+      type = types.str;
+      default = ":11";
+    };
+  };
+
+  fetchWallpaperScript = pkgs.writeScript "fetchWallpaper" ''
+    #! ${pkgs.bash}/bin/bash
+    ${if (cfg.predicate == null) then "" else ''
+      ${cfg.predicate}
+      if [ $? -ne 0 ]; then
+        echo "predicate failed"
+        exit 23
+      fi
+    ''}
+    mkdir -p ${shell.escape cfg.stateDir}
+    curl -s -o ${shell.escape cfg.stateDir}/wallpaper -z ${shell.escape cfg.stateDir}/wallpaper ${shell.escape cfg.url}
+    feh --no-fehbg --bg-scale ${shell.escape cfg.stateDir}/wallpaper
+  '';
+
+  imp = {
+    users.extraUsers.fetchWallpaper = {
+      name = "fetchWallpaper";
+      uid = 3332383611; #genid fetchWallpaper
+      description = "fetchWallpaper user";
+      home = "/var/empty";
+    };
+
+    systemd.timers.fetchWallpaper = {
+      description = "fetch wallpaper timer";
+      wantedBy = [ "timers.target" ];
+
+      timerConfig = cfg.timerConfig;
+    };
+    systemd.services.fetchWallpaper = {
+      description = "fetch wallpaper";
+      after = [ "network.target" ];
+
+      path = with pkgs; [
+        curl
+        feh
+      ];
+
+      environment = {
+        URL = cfg.url;
+        DISPLAY = cfg.display;
+      };
+
+      restartIfChanged = true;
+
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = fetchWallpaperScript;
+        User = "fetchWallpaper";
+      };
+    };
+  };
+in out
diff --git a/lass/2configs/fetchWallpaper.nix b/lass/2configs/fetchWallpaper.nix
index effbd6c8..9c27706c 100644
--- a/lass/2configs/fetchWallpaper.nix
+++ b/lass/2configs/fetchWallpaper.nix
@@ -3,7 +3,7 @@
 let
 
 in {
-  lass.fetchWallpaper = {
+  krebs.fetchWallpaper = {
     enable = true;
     url = "echelon/wallpaper.png";
   };
diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix
index 5fa5160e..0dcad971 100644
--- a/lass/3modules/default.nix
+++ b/lass/3modules/default.nix
@@ -8,6 +8,5 @@ _:
     ./urxvtd.nix
     ./xresources.nix
     ./wordpress_nginx.nix
-    ./fetchWallpaper.nix
   ];
 }
diff --git a/lass/3modules/fetchWallpaper.nix b/lass/3modules/fetchWallpaper.nix
deleted file mode 100644
index 9baebedb..00000000
--- a/lass/3modules/fetchWallpaper.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.lass.fetchWallpaper;
-
-  out = {
-    options.lass.fetchWallpaper = api;
-    config = mkIf cfg.enable imp;
-  };
-
-  api = {
-    enable = mkEnableOption "fetch wallpaper";
-    predicate = mkOption {
-      type = with types; nullOr path;
-      default = null;
-    };
-    url = mkOption {
-      type = types.str;
-    };
-    timerConfig = mkOption {
-      type = types.unspecified;
-      default = {
-        OnCalendar = "*:00,10,20,30,40,50";
-      };
-    };
-    stateDir = mkOption {
-      type = types.str;
-      default = "/tmp/wallpaper";
-    };
-    display = mkOption {
-      type = types.str;
-      default = ":11";
-    };
-  };
-
-  fetchWallpaperScript = pkgs.writeScript "fetchWallpaper" ''
-    #! ${pkgs.bash}/bin/bash
-    ${if (cfg.predicate == null) then "" else ''
-      ${cfg.predicate}
-      if [ $? -ne 0 ]; then
-        echo "predicate failed"
-        exit 23
-      fi
-    ''}
-    mkdir -p ${shell.escape cfg.stateDir}
-    curl -s -o ${shell.escape cfg.stateDir}/wallpaper -z ${shell.escape cfg.stateDir}/wallpaper ${shell.escape cfg.url}
-    feh --no-fehbg --bg-scale ${shell.escape cfg.stateDir}/wallpaper
-  '';
-
-  imp = {
-    users.extraUsers.fetchWallpaper = {
-      name = "fetchWallpaper";
-      uid = 3332383611; #genid fetchWallpaper
-      description = "fetchWallpaper user";
-      home = "/var/empty";
-    };
-
-    systemd.timers.fetchWallpaper = {
-      description = "fetch wallpaper timer";
-      wantedBy = [ "timers.target" ];
-
-      timerConfig = cfg.timerConfig;
-    };
-    systemd.services.fetchWallpaper = {
-      description = "fetch wallpaper";
-      after = [ "network.target" ];
-
-      path = with pkgs; [
-        curl
-        feh
-      ];
-
-      environment = {
-        URL = cfg.url;
-        DISPLAY = cfg.display;
-      };
-
-      restartIfChanged = true;
-
-      serviceConfig = {
-        Type = "simple";
-        ExecStart = fetchWallpaperScript;
-        User = "fetchWallpaper";
-      };
-    };
-  };
-in out
-- 
cgit v1.2.3