Merge remote-tracking branch 'prism/master'

6 files changed, 43 insertions, 14 deletions

diff --git a/krebs/5pkgs/go/default.nix b/krebs/5pkgs/go/default.nix
index 209b7e363..fb8b65ea1 100644
--- a/krebs/5pkgs/go/default.nix
+++ b/krebs/5pkgs/go/default.nix
@@ -22,7 +22,7 @@ in nodePackages.buildNodePackage {
   name = "go";
 
   src = fetchgit {
-    url = "http://cgit.prism.r/go/";
+    url = "http://cgit.lassul.us/go/";
     rev = "05d02740e0adbb36cc461323647f0c1e7f493156";
     sha256 = "6015c9a93317375ae8099c7ab982df0aa93a59ec2b48972e253887bb6ca0004f";
   };
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index 381a37e1b..9a1cab176 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -80,7 +80,7 @@ let
         perm = push "refs/*" [ non-fast-forward create delete merge ];
       } ++
       optional repo.public {
-        user = [ tv makefu miefda ];
+        user = [ tv makefu ];
         repo = [ repo ];
         perm = fetch;
       } ++
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index f88dc927e..3c33c0702 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -32,10 +32,10 @@ in {
     (ssl [ "makeup.apanowicz.de" "www.makeup.apanowicz.de" ])
     (servePage [ "makeup.apanowicz.de" "www.makeup.apanowicz.de" ])
 
-    (ssl [ "pixelpocket.de" "www.pixelpocket.de" ])
+    (ssl [ "pixelpocket.de" ])
     (servePage [ "pixelpocket.de" "www.pixelpocket.de" ])
 
-    (ssl [ "o.ubikmedia.de" "www.o.ubikmedia.de" ])
+    (ssl [ "o.ubikmedia.de" ])
     (serveOwncloud [ "o.ubikmedia.de" "www.o.ubikmedia.de" ])
 
     (ssl [
@@ -47,6 +47,7 @@ in {
       "360gradvideo.tv"
       "ubikmedia.eu"
       "facts.cloud"
+      "youthtube.xyz"
       "www.ubikmedia.de"
       "www.aldona.ubikmedia.de"
       "www.apanowicz.de"
@@ -55,6 +56,7 @@ in {
       "www.360gradvideo.tv"
       "www.ubikmedia.eu"
       "www.facts.cloud"
+      "www.youthtube.xyz"
     ])
     (serveWordpress [
       "ubikmedia.de"
@@ -64,13 +66,15 @@ in {
       "360gradvideo.tv"
       "ubikmedia.eu"
       "facts.cloud"
-      "*.ubikmedia.de"
+      "youthtube.xyz"
       "www.apanowicz.de"
       "www.nirwanabluete.de"
       "www.aldonasiech.com"
       "www.360gradvideo.tv"
       "www.ubikmedia.eu"
       "www.facts.cloud"
+      "www.youthtube.xyz"
+      "*.ubikmedia.de"
     ])
   ];
 
diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix
index 80c947a7b..73b148bf7 100644
--- a/lass/2configs/xserver/default.nix
+++ b/lass/2configs/xserver/default.nix
@@ -91,9 +91,6 @@ let
     set -efu
     export PATH; PATH=${makeSearchPath "bin" ([
       pkgs.rxvt_unicode
-      pkgs.i3lock
-      pkgs.pulseaudioLight
-      pkgs.xorg.xbacklight
     ] ++ config.environment.systemPackages)}:/var/setuid-wrappers
     settle() {(
       # Use PATH for a clean journal
diff --git a/lass/5pkgs/ejabberd/default.nix b/lass/5pkgs/ejabberd/default.nix
new file mode 100644
index 000000000..3a77c5cd1
--- /dev/null
+++ b/lass/5pkgs/ejabberd/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, expat, erlang, zlib, openssl, pam, lib}:
+
+stdenv.mkDerivation rec {
+  version = "2.1.13";
+  name = "ejabberd-${version}";
+  src = fetchurl {
+    url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
+    sha256 = "0vf8mfrx7vr3c5h3nfp3qcgwf2kmzq20rjv1h9sk3nimwir1q3d8";
+  };
+  buildInputs = [ expat erlang zlib openssl pam ];
+  patchPhase = ''
+    sed -i \
+      -e "s|erl \\\|${erlang}/bin/erl \\\|" \
+      -e 's|EXEC_CMD=\"sh -c\"|EXEC_CMD=\"${stdenv.shell} -c\"|' \
+      src/ejabberdctl.template
+  '';
+  preConfigure = ''
+    cd src
+  '';
+  configureFlags = ["--enable-pam"];
+
+  meta = {
+    description = "Open-source XMPP application server written in Erlang";
+    license = stdenv.lib.licenses.gpl2;
+    homepage = http://www.ejabberd.im;
+    maintainers = [ lib.maintainers.sander ];
+  };
+}
diff --git a/lass/5pkgs/xmonad-lass.nix b/lass/5pkgs/xmonad-lass.nix
index 841821a7a..c07bd2b83 100644
--- a/lass/5pkgs/xmonad-lass.nix
+++ b/lass/5pkgs/xmonad-lass.nix
@@ -46,7 +46,7 @@ import XMonad.Util.EZConfig (additionalKeysP)
 
 
 myTerm :: String
-myTerm = "urxvtc"
+myTerm = "${pkgs.rxvt_unicode}/bin/urxvtc"
 
 myFont :: String
 myFont = "-schumacher-*-*-*-*-*-*-*-*-*-*-*-iso10646-*"
@@ -108,11 +108,11 @@ displaySomeException = displayException
 myKeyMap :: [([Char], X ())]
 myKeyMap =
     [ ("M4-<F11>", spawn "i3lock -i /var/lib/wallpaper/wallpaper -f")
-    , ("M4-p", spawn "passmenu --type")
-    , ("<XF86AudioRaiseVolume>", spawn "pactl -- set-sink-volume 0 +4%")
-    , ("<XF86AudioLowerVolume>", spawn "pactl -- set-sink-volume 0 -4%")
-    , ("<XF86AudioMute>", spawn "pactl -- set-sink-mute 0 toggle")
-    , ("<XF86AudioMicMute>", spawn "pactl -- set-source-mute 1 toggle")
+    , ("M4-p", spawn "${pkgs.pass}/bin/passmenu --type")
+    , ("<XF86AudioRaiseVolume>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-volume 0 +4%")
+    , ("<XF86AudioLowerVolume>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-volume 0 -4%")
+    , ("<XF86AudioMute>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-mute 0 toggle")
+    , ("<XF86AudioMicMute>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-source-mute 1 toggle")
     , ("<XF86Launch1>", gridselectWorkspace gridConfig W.view)
     , ("<XF86MonBrightnessUp>", spawn "xbacklight -steps 1 -time 1 -inc 3")
     , ("<XF86MonBrightnessDown>", spawn "xbacklight -steps 1 -time 1 -dec 3")