summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-04-15 17:13:40 +0200
committerlassulus <lass@lassul.us>2017-04-15 17:14:34 +0200
commita80cbaa6e962ea6dcdbf4c01f7e1188ac71c631f (patch)
treef7da091c42e78ae205afcc9b4766bfb7800ee977 /krebs
parent48d37be5dea8c74c929bd23153361f3cf419f43e (diff)
realwallpaper: introduce marker_file
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/realwallpaper.nix8
-rw-r--r--krebs/5pkgs/realwallpaper/default.nix8
2 files changed, 6 insertions, 10 deletions
diff --git a/krebs/3modules/realwallpaper.nix b/krebs/3modules/realwallpaper.nix
index f9eae8c92..1e7a9faae 100644
--- a/krebs/3modules/realwallpaper.nix
+++ b/krebs/3modules/realwallpaper.nix
@@ -32,9 +32,9 @@ let
default = "http://xplanetclouds.com/free/local/clouds_2048.jpg";
};
- outFile = mkOption {
+ marker = mkOption {
type = types.str;
- default = "/tmp/wallpaper.png";
+ default = "http://graphs.r/marker.json";
};
timerConfig = mkOption {
@@ -43,7 +43,6 @@ let
OnCalendar = "*:0/15";
};
};
-
};
imp = {
@@ -63,6 +62,7 @@ let
imagemagick
curl
file
+ jq
];
environment = {
@@ -70,7 +70,7 @@ let
nightmap_url = cfg.nightmap;
daymap_url = cfg.daymap;
cloudmap_url = cfg.cloudmap;
- out_file = cfg.outFile;
+ marker_url = cfg.marker;
};
restartIfChanged = true;
diff --git a/krebs/5pkgs/realwallpaper/default.nix b/krebs/5pkgs/realwallpaper/default.nix
index 4fea977ec..dec2dada4 100644
--- a/krebs/5pkgs/realwallpaper/default.nix
+++ b/krebs/5pkgs/realwallpaper/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation {
src = fetchgit {
url = https://github.com/Lassulus/realwallpaper;
- rev = "c2778c3c235fc32edc8115d533a0d0853ab101c5";
- sha256 = "0yhbjz19zk8sj5dsvccm6skkqq2vardn1yi70qmd5li7qvp17mvs";
+ rev = "b8408cfb295b6ce5b965309b30358ca6c6409efd";
+ sha256 = "0yyl8hhqshw9bx04xs8glvir3c0qzvfrwzmbvyg318mnz5xalcl0";
};
phases = [
@@ -15,10 +15,6 @@ stdenv.mkDerivation {
];
buildInputs = [
- xplanet
- imagemagick
- curl
- file
];
installPhase = ''