Merge remote-tracking branch 'prism/master'

13 files changed, 52 insertions, 24 deletions

diff --git a/krebs/5pkgs/urlwatch/default.nix b/krebs/5pkgs/urlwatch/default.nix
index 7a4df5c7c..7ffbd8870 100644
--- a/krebs/5pkgs/urlwatch/default.nix
+++ b/krebs/5pkgs/urlwatch/default.nix
@@ -15,10 +15,6 @@ python3Packages.buildPythonPackage rec {
     requests2
   ];
 
-  postFixup = ''
-    wrapProgram "$out/bin/urlwatch" --prefix "PYTHONPATH" : "$PYTHONPATH"
-  '';
-
   meta = {
     description = "A tool for monitoring webpages for updates";
     homepage = https://thp.io/2008/urlwatch/;
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 99705cbf1..594f342db 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -13,19 +13,18 @@ with import <stockholm/lib>;
     ../2configs/browsers.nix
     ../2configs/games.nix
     ../2configs/pass.nix
-    ../2configs/virtualbox.nix
     ../2configs/elster.nix
     ../2configs/steam.nix
     ../2configs/wine.nix
     ../2configs/git.nix
     ../2configs/skype.nix
-    ../2configs/teamviewer.nix
     ../2configs/libvirt.nix
     ../2configs/fetchWallpaper.nix
     #../2configs/c-base.nix
     ../2configs/mail.nix
     ../2configs/krebs-pass.nix
     ../2configs/repo-sync.nix
+    ../2configs/ircd.nix
     {
       #risk of rain port
       krebs.iptables.tables.filter.INPUT.rules = [
@@ -79,6 +78,9 @@ with import <stockholm/lib>;
     {
       services.redis.enable = true;
     }
+    {
+      virtualisation.libvirtd.enable = true;
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.mors;
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index cdb6d34ab..e98f382e3 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -7,11 +7,8 @@ in {
     ./xserver
     ./mpv.nix
     ./power-action.nix
+    ./pulse.nix
   ];
-  hardware.pulseaudio = {
-    enable = true;
-    systemWide = true;
-  };
 
   users.extraUsers.mainUser.extraGroups = [ "audio" "video" ];
 
@@ -53,6 +50,9 @@ in {
     yt-next
 
     youtube-tools
+
+    rxvt_unicode
+    termite
   #window manager stuff
     #haskellPackages.xmobar
     #haskellPackages.yeganesh
diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix
index 3bf78d9f4..d120dfcad 100644
--- a/lass/2configs/exim-smarthost.nix
+++ b/lass/2configs/exim-smarthost.nix
@@ -31,6 +31,7 @@ with import <stockholm/lib>;
       { from = "nebenan@lassul.us"; to = lass.mail; }
       { from = "feed@lassul.us"; to = lass.mail; }
       { from = "art@lassul.us"; to = lass.mail; }
+      { from = "irgendwas@lassul.us"; to = lass.mail; }
     ];
     system-aliases = [
       { from = "mailer-daemon"; to = "postmaster"; }
diff --git a/lass/2configs/games.nix b/lass/2configs/games.nix
index 82b7eb2c9..e7c7de938 100644
--- a/lass/2configs/games.nix
+++ b/lass/2configs/games.nix
@@ -2,12 +2,16 @@
 
 let
   mainUser = config.users.extraUsers.mainUser;
+  vdoom = pkgs.writeDash "vdoom" ''
+    ${pkgs.zandronum-bin}/bin/zandronum \
+      -fov 120 \
+      "$@"
+  '';
   doom = pkgs.writeDash "doom" ''
     DOOM_DIR=''${DOOM_DIR:-~/doom/}
-    ${pkgs.zandronum}/bin/zandronum \
+    ${vdoom} \
       -file $DOOM_DIR/lib/brutalv20.pk3 \
       -file $DOOM_DIR/lib/RebotStarcraftMarines.pk3 \
-      -fov 120 \
       "$@"
   '';
   doom1 = pkgs.writeDashBin "doom1" ''
@@ -18,12 +22,22 @@ let
     DOOM_DIR=''${DOOM_DIR:-~/doom/}
     ${doom} -iwad $DOOM_DIR/wads/stock/doom2.wad "$@"
   '';
+  vdoom1 = pkgs.writeDashBin "vdoom1" ''
+    DOOM_DIR=''${DOOM_DIR:-~/doom/}
+    ${vdoom} -iwad $DOOM_DIR/wads/stock/doom.wad "$@"
+  '';
+  vdoom2 = pkgs.writeDashBin "vdoom2" ''
+    DOOM_DIR=''${DOOM_DIR:-~/doom/}
+    ${vdoom} -iwad $DOOM_DIR/wads/stock/doom2.wad "$@"
+  '';
 
 in {
   environment.systemPackages = with pkgs; [
     dwarf_fortress
     doom1
     doom2
+    vdoom1
+    vdoom2
   ];
 
   users.extraUsers = {
diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 48472f7a1..e2bdd5755 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
     url = https://github.com/nixos/nixpkgs;
-    ref = "e360c7205f84be180d80b97f3980fb809a951486";
+    ref = "2a97e149e50e1c701a957c6bd060cc74b7e9a905";
   };
 }
diff --git a/lass/2configs/privoxy-retiolum.nix b/lass/2configs/privoxy-retiolum.nix
index 9059bbac8..352a6d3d8 100644
--- a/lass/2configs/privoxy-retiolum.nix
+++ b/lass/2configs/privoxy-retiolum.nix
@@ -14,6 +14,7 @@ in {
     tables = {
       filter.INPUT.rules = [
         { predicate = "-i retiolum -p tcp --dport 8118"; target = "ACCEPT"; }
+        { predicate = "-i dns0 -p tcp --dport 8118"; target = "ACCEPT"; }
       ];
     };
   };
diff --git a/lass/2configs/teamviewer.nix b/lass/2configs/teamviewer.nix
deleted file mode 100644
index 87b6fbac3..000000000
--- a/lass/2configs/teamviewer.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-{
-  services.teamviewer.enable = true;
-}
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 2a6df06ff..76e13412b 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -151,7 +151,7 @@ in {
     description = "maintenance acc for domsen";
     home = "/home/domsen";
     useDefaultShell = true;
-    extraGroups = [ "nginx" ];
+    extraGroups = [ "nginx" "download" ];
     createHome = true;
   };
 
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index db69be2fa..9a2adbc3e 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -22,8 +22,7 @@ with import <stockholm/lib>;
       user = config.krebs.users.makefu;
       source = let
           inherit (config.krebs.build) host user;
-          # ref = "b8ede35"; # stable @ 2016-10-19
-          ref = "31c72ce"; # stable @ 2016-10-21 (dirtycow)
+          ref = "f52eaf4"; # stable @ 2016-12-12
       in {
         nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
           {
diff --git a/makefu/5pkgs/acdcli/default.nix b/makefu/5pkgs/acdcli/default.nix
new file mode 100644
index 000000000..1621375e3
--- /dev/null
+++ b/makefu/5pkgs/acdcli/default.nix
@@ -0,0 +1,20 @@
+{ lib, pkgs, python3Packages, fetchurl, ... }:
+
+with python3Packages; buildPythonPackage rec {
+  name = "acdcli-${version}";
+  version = "0.3.2";
+  propagatedBuildInputs = [
+    dateutil colorama fusepy appdirs requests2 requests_toolbelt six
+  ];
+  src = fetchurl {
+    url = "mirror://pypi/a/acdcli/${name}.tar.gz";
+    sha256 = "1ak9xxpyb7n6iyalf2082jpimklakm0fgm7vsv7qcm8wy6vlq2cw";
+  };
+  doCheck = false; # ImportError: Failed to import test module: tests
+  postFixup = ''
+    mv $out/bin/.acd_cli.py-wrapped $out/bin/acd_cli.py
+  '';
+  meta = {
+    description = "communicate with amazon drive";
+  };
+}
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 8994b3856..b62f1efa2 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -5,6 +5,7 @@ let
 in
 {
   nixpkgs.config.packageOverrides = rec {
+    acdcli = callPackage ./acdcli {};
     alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
     alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
     alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
diff --git a/makefu/5pkgs/tw-upload-plugin/default.nix b/makefu/5pkgs/tw-upload-plugin/default.nix
index a68dc09dc..8bc675847 100644
--- a/makefu/5pkgs/tw-upload-plugin/default.nix
+++ b/makefu/5pkgs/tw-upload-plugin/default.nix
@@ -3,6 +3,6 @@
 pkgs.fetchFromGitHub {
   owner = "makefu";
   repo = "tw-upload-plugin";
-  rev = "a00aac";
-  sha256 = "0kazqs24kzjxqzr33kg1jbfx8xyvmrnrdxh6g27kgkgbl1d2qknh";
+  rev = "621e5fbe";
+  sha256 = "1wjy76s5mr6z772w6sr0dwqxaxn45c7ys4a5y2v55hxclr096dqg";
 }