l 3 fetchWallpaper -> k 3 fetchWallpaper

3 files changed, 1 insertions, 91 deletions

diff --git a/lass/2configs/fetchWallpaper.nix b/lass/2configs/fetchWallpaper.nix
index effbd6c85..9c27706cb 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 5fa5160ee..0dcad971c 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 9baebedbd..000000000
--- 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