Merge branch 'master' of pnp:stockholm

8 files changed, 5 insertions, 140 deletions

diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix
index 45f7ebd70..b301b504a 100644
--- a/lass/1systems/echelon.nix
+++ b/lass/1systems/echelon.nix
@@ -13,6 +13,7 @@ in {
     ../2configs/retiolum.nix
     ../2configs/realwallpaper-server.nix
     ../2configs/privoxy-retiolum.nix
+    ../2configs/git.nix
     {
       networking.interfaces.enp2s1.ip4 = [
         {
diff --git a/lass/2configs/desktop-base.nix b/lass/2configs/desktop-base.nix
index ed84edefa..4e693997d 100644
--- a/lass/2configs/desktop-base.nix
+++ b/lass/2configs/desktop-base.nix
@@ -28,14 +28,14 @@ in {
   environment.systemPackages = with pkgs; [
 
     powertop
+    sxiv
+    much
 
   #window manager stuff
     haskellPackages.xmobar
     haskellPackages.yeganesh
     dmenu2
     xlibs.fontschumachermisc
-
-    sxiv
   ];
 
   fonts.fonts = [
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index 78e6f0baa..595936da5 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -51,7 +51,7 @@ let
         nick = config.krebs.build.host.name;
         channel = "#retiolum";
         server = "cd.retiolum";
-        verbose = config.krebs.build.host.name == "cloudkrebs";
+        verbose = config.krebs.build.host.name == "echelon";
       };
     };
   };
diff --git a/lass/2configs/realwallpaper.nix b/lass/2configs/realwallpaper.nix
index f1c8861e1..c69cb1660 100644
--- a/lass/2configs/realwallpaper.nix
+++ b/lass/2configs/realwallpaper.nix
@@ -1,9 +1,5 @@
 { config, ... }:
 
 {
-  imports = [
-    ../3modules/realwallpaper.nix
-  ];
-
-  lass.realwallpaper.enable = true;
+  krebs.realwallpaper.enable = true;
 }
diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix
index 9b6211278..9de987bf3 100644
--- a/lass/3modules/default.nix
+++ b/lass/3modules/default.nix
@@ -3,6 +3,5 @@ _:
 {
   imports = [
     ./xresources.nix
-    ./realwallpaper.nix
   ];
 }
diff --git a/lass/3modules/realwallpaper.nix b/lass/3modules/realwallpaper.nix
deleted file mode 100644
index 85dd35233..000000000
--- a/lass/3modules/realwallpaper.nix
+++ /dev/null
@@ -1,102 +0,0 @@
-arg@{ config, lib, pkgs, ... }:
-
-let
-  inherit (lib)
-    mkEnableOption
-    mkOption
-    types
-    mkIf
-  ;
-
-  lpkgs = import ../5pkgs { inherit pkgs; };
-
-  cfg = config.lass.realwallpaper;
-
-  out = {
-    options.lass.realwallpaper = api;
-    config = mkIf cfg.enable imp;
-  };
-
-  api = {
-    enable = mkEnableOption "realwallpaper";
-
-    workingDir = mkOption {
-      type = types.str;
-      default = "/var/realwallpaper/";
-    };
-
-    nightmap = mkOption {
-      type = types.str;
-      default = "http://eoimages.gsfc.nasa.gov/images/imagerecords/55000/55167/earth_lights_lrg.jpg";
-    };
-
-    daymap = mkOption {
-      type = types.str;
-      default = "http://www.nnvl.noaa.gov/images/globaldata/SnowIceCover_Daily.png";
-    };
-
-    cloudmap = mkOption {
-      type = types.str;
-      default = "http://xplanetclouds.com/free/local/clouds_2048.jpg";
-    };
-
-    outFile = mkOption {
-      type = types.str;
-      default = "/tmp/wallpaper.png";
-    };
-
-    timerConfig = mkOption {
-      type = types.unspecified;
-      default = {
-        OnCalendar = "*:0/15";
-      };
-    };
-
-  };
-
-  imp = {
-    systemd.timers.realwallpaper = {
-      description = "real wallpaper generator timer";
-
-      timerConfig = cfg.timerConfig;
-    };
-
-    systemd.services.realwallpaper = {
-      description = "real wallpaper generator";
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
-
-      path = with pkgs; [
-        xplanet
-        imagemagick
-        curl
-        file
-      ];
-
-      environment = {
-        working_dir = cfg.workingDir;
-        nightmap_url = cfg.nightmap;
-        daymap_url = cfg.daymap;
-        cloudmap_url = cfg.cloudmap;
-        out_file = cfg.outFile;
-      };
-
-      restartIfChanged = true;
-
-      serviceConfig = {
-        Type = "simple";
-        ExecStart = "${lpkgs.realwallpaper}/realwallpaper.sh";
-        User = "realwallpaper";
-      };
-    };
-
-    users.extraUsers.realwallpaper = {
-      uid = 2009435407; #genid realwallpaper
-      home = cfg.workingDir;
-      createHome = true;
-    };
-  };
-
-in
-out
-
diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index 6954c6a2c..7427cb620 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -13,5 +13,4 @@ rec {
     ublock = callPackage ./firefoxPlugins/ublock.nix {};
     vimperator = callPackage ./firefoxPlugins/vimperator.nix {};
   };
-  realwallpaper = callPackage ./realwallpaper.nix {};
 }
diff --git a/lass/5pkgs/realwallpaper.nix b/lass/5pkgs/realwallpaper.nix
deleted file mode 100644
index 4fea977ec..000000000
--- a/lass/5pkgs/realwallpaper.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchgit, xplanet, imagemagick, curl, file }:
-
-stdenv.mkDerivation {
-  name = "realwallpaper";
-
-  src = fetchgit {
-    url = https://github.com/Lassulus/realwallpaper;
-    rev = "c2778c3c235fc32edc8115d533a0d0853ab101c5";
-    sha256 = "0yhbjz19zk8sj5dsvccm6skkqq2vardn1yi70qmd5li7qvp17mvs";
-  };
-
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-
-  buildInputs = [
-    xplanet
-    imagemagick
-    curl
-    file
-  ];
-
-  installPhase = ''
-    mkdir -p $out
-    cp realwallpaper.sh $out/realwallpaper.sh
-  '';
-}