Merge remote-tracking branch 'prism/master'

7 files changed, 24 insertions, 14 deletions

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;
   };