Merge remote-tracking branch 'pnp/master'

4 files changed, 49 insertions, 19 deletions

diff --git a/krebs/3modules/fetchWallpaper.nix b/krebs/3modules/fetchWallpaper.nix
index b5eb00e9c..83ecf4177 100644
--- a/krebs/3modules/fetchWallpaper.nix
+++ b/krebs/3modules/fetchWallpaper.nix
@@ -37,11 +37,10 @@ let
 
   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
+    ${optionalString (cfg.predicate != null) ''
+      if ! ${cfg.predicate}; then
+        echo "predicate failed - will not fetch from remote"
+        exit 0
       fi
     ''}
     mkdir -p ${shell.escape cfg.stateDir}
diff --git a/makefu/2configs/fetchWallpaper.nix b/makefu/2configs/fetchWallpaper.nix
new file mode 100644
index 000000000..b071a128d
--- /dev/null
+++ b/makefu/2configs/fetchWallpaper.nix
@@ -0,0 +1,24 @@
+{ config, pkgs, ... }:
+
+let
+  # check if laptop runs on umts
+  weaksauce-internet = with pkgs;writeScript "weaksauce-internet" ''
+    #! /bin/sh
+    if  ${iproute}/bin/ip addr show dev ppp0 2>/dev/null \
+      | ${gnugrep}/bin/grep -q inet;then
+      exit 1
+    fi
+  '';
+
+in {
+  krebs.fetchWallpaper = {
+    enable = true;
+    display = ":0";
+    predicate = weaksauce-internet;
+    timerConfig = {
+      OnCalendar = "*:0/30";
+    };
+    url = "http://echelon/wallpaper.png";
+  };
+}
+
diff --git a/makefu/2configs/main-laptop.nix b/makefu/2configs/main-laptop.nix
index dfc8c1c07..00a3e73ca 100644
--- a/makefu/2configs/main-laptop.nix
+++ b/makefu/2configs/main-laptop.nix
@@ -6,7 +6,10 @@
 
 with lib;
 {
-  imports = [ ./base-gui.nix ];
+  imports = [
+    ./base-gui.nix
+    ./fetchWallpaper.nix
+  ];
   environment.systemPackages = with pkgs;[
     vlc
     firefox
diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index b3f94e655..15711a5d5 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -12,6 +12,8 @@ local beautiful = require("beautiful")
 local naughty = require("naughty")
 local menubar = require("menubar")
 
+
+
 -- {{{ Error handling
 -- Check if awesome encountered an error during startup and fell back to
 -- another config (This code will only ever execute for the fallback config)
@@ -90,6 +92,20 @@ vicious.register(batwidget, vicious.widgets.bat, "$2%", 61, "BAT0")
 --
 -- beautiful.init("/nix/store/qbx8r72yzaxpz41zq00902zwajl31b5h-awesome-3.5.6/share/awesome/themes/default/theme.lua")
 
+function find_default_theme()
+  -- find the default lua theme in the package path
+  for path in package.path:gmatch('([^;]+);') do
+    if path:match('awesome.*share') then
+      theme_path = path:match('^([^?]*)') .. '../themes/default/theme.lua'
+      if awful.util.file_readable(theme_path) then return theme_path end
+    end
+  end
+end
+
+beautiful.init(find_default_theme())
+client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
+client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
+
 -- This is used later as the default terminal and editor to run.
 terminal = "urxvt"
 editor = os.getenv("EDITOR") or "vim"
@@ -494,21 +510,9 @@ local os = {
     date = os.date,
     time = os.time
 }
+
 -- }}}
 
 
 
-function find_default_theme()
-  -- find the default lua theme in the package path
-  for path in package.path:gmatch('([^;]+);') do
-    if path:match('awesome.*share') then
-      theme_path = path:match('^([^?]*)') .. '../themes/default/theme.lua'
-      if awful.util.file_readable(theme_path) then return theme_path end
-    end
-  end
-end
-
-beautiful.init(find_default_theme())
-client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
-client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 -- }}}