4 files changed, 223 insertions, 6 deletions

diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index 73e41790d..c48188f9d 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -3,6 +3,9 @@
 {
   nixpkgs.config.packageOverrides = rec {
     acronym = pkgs.callPackage ./acronym/default.nix {};
+    ejabberd = pkgs.callPackage ./ejabberd {
+      erlang = pkgs.erlangR16;
+    };
     firefoxPlugins = {
       noscript = pkgs.callPackage ./firefoxPlugins/noscript.nix {};
       ublock = pkgs.callPackage ./firefoxPlugins/ublock.nix {};
@@ -10,6 +13,7 @@
     };
     mk_sql_pair = pkgs.callPackage ./mk_sql_pair/default.nix {};
     mpv-poll = pkgs.callPackage ./mpv-poll/default.nix {};
+    q = pkgs.callPackage ./q {};
     rs = pkgs.callPackage ./rs/default.nix {};
     untilport = pkgs.callPackage ./untilport/default.nix {};
     urban = pkgs.callPackage ./urban/default.nix {};
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/q/default.nix b/lass/5pkgs/q/default.nix
new file mode 100644
index 000000000..571932b1d
--- /dev/null
+++ b/lass/5pkgs/q/default.nix
@@ -0,0 +1,185 @@
+{ pkgs, ... }:
+let
+  q-cal = let
+    # XXX 23 is the longest line of cal's output
+    pad = ''{
+      ${pkgs.gnused}/bin/sed '
+            # rtrim
+            s/ *$//
+
+            # delete last empty line
+            ''${/^$/d}
+          ' \
+        | ${pkgs.gawk}/bin/awk '{printf "%-23s\n", $0}' \
+        | ${pkgs.gnused}/bin/sed '
+              # colorize header
+              1,2s/.*/&/
+
+              # colorize week number
+              s/^[ 1-9][0-9]/&/
+            '
+    }'';
+  in ''
+    ${pkgs.coreutils}/bin/paste \
+        <(${pkgs.utillinux}/bin/cal -mw \
+              $(${pkgs.coreutils}/bin/date +'%m %Y' -d 'last month') \
+            | ${pad}
+        ) \
+        <(${pkgs.utillinux}/bin/cal -mw \
+            | ${pkgs.gnused}/bin/sed '
+                # colorize day of month
+                s/\(^\| \)'"$(${pkgs.coreutils}/bin/date +%e)"'\>/&/
+              ' \
+            | ${pad}
+        ) \
+        <(${pkgs.utillinux}/bin/cal -mw \
+              $(${pkgs.coreutils}/bin/date +'%m %Y' -d 'next month') \
+            | ${pad}
+        ) \
+      | ${pkgs.gnused}/bin/sed 's/\t/  /g'
+  '';
+
+  q-isodate = ''
+    ${pkgs.coreutils}/bin/date \
+        '+%Y-%m-%dT%H:%M:%S%:z'
+  '';
+
+  q-gitdir = ''
+    if test -d .git; then
+      #git status --porcelain
+      branch=$(
+        ${pkgs.git}/bin/git branch \
+          | ${pkgs.gnused}/bin/sed -rn 's/^\* (.*)/\1/p'
+      )
+      echo "± $LOGNAME@''${HOSTNAME-$(${pkgs.nettools}/bin/hostname)}:$PWD .git $branch"
+    fi
+  '';
+
+  q-power_supply = ''
+    for uevent in /sys/class/power_supply/*/uevent; do
+      if test -f $uevent; then
+        eval "$(${pkgs.gnused}/bin/sed -n '
+          s/^\([A-Z_]\+=\)\(.*\)/\1'\'''\2'\'''/p
+        ' $uevent)"
+
+        if test "x''${POWER_SUPPLY_CHARGE_NOW-}" = x; then
+          continue
+        fi
+
+        charge_percentage=$(echo "
+          scale=2
+          $POWER_SUPPLY_CHARGE_NOW / $POWER_SUPPLY_CHARGE_FULL
+        " | ${pkgs.bc}/bin/bc)
+
+        lfc=$POWER_SUPPLY_CHARGE_FULL
+        rc=$POWER_SUPPLY_CHARGE_NOW
+        #rc=2800
+        N=78; N=76
+        N=10
+        n=$(echo $N-1 | ${pkgs.bc}/bin/bc)
+        centi=$(echo "$rc*100/$lfc" | ${pkgs.bc}/bin/bc)
+        deci=$(echo "$rc*$N/$lfc" | ${pkgs.bc}/bin/bc)
+        energy_evel=$(
+          echo -n '☳ ' # TRIGRAM FOR THUNDER
+          if   test $centi -ge 42; then echo -n ''
+          elif test $centi -ge 23; then echo -n ''
+          elif test $centi -ge 11; then echo -n ''
+          else                        echo -n ''; fi
+          for i in $(${pkgs.coreutils}/bin/seq 1 $deci); do
+            echo -n ■
+          done
+          echo -n ''
+          for i in $(${pkgs.coreutils}/bin/seq $deci $n); do
+            echo -n ■
+          done
+          echo '' $rc #/ $lfc
+        )
+        echo "$energy_evel $charge_percentage"
+      fi
+    done
+  '';
+
+  q-virtualization = ''
+    echo "VT: $(${pkgs.systemd}/bin/systemd-detect-virt)"
+  '';
+
+  q-wireless = ''
+    for dev in $(
+      ${pkgs.iw}/bin/iw dev \
+        | ${pkgs.gnused}/bin/sed -n 's/^\s*Interface\s\+\([0-9a-z]\+\)$/\1/p'
+    ); do
+      inet=$(${pkgs.iproute}/bin/ip addr show $dev \
+        | ${pkgs.gnused}/bin/sed -n '
+            s/.*inet \([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p
+          ') \
+        || unset inet
+      ssid=$(${pkgs.iw}/bin/iw dev $dev link \
+        | ${pkgs.gnused}/bin/sed -n '
+            s/.*\tSSID: \(.*\)/\1/p
+          ') \
+        || unset ssid
+      echo "$dev''${inet+ $inet}''${ssid+ $ssid}"
+    done
+  '';
+
+  q-online = ''
+    if ${pkgs.curl}/bin/curl -s google.com >/dev/null; then
+      echo 'online'
+    else
+      echo offline
+    fi
+  '';
+
+  q-thermal_zone = ''
+    for i in /sys/class/thermal/thermal_zone*; do
+      type=$(${pkgs.coreutils}/bin/cat $i/type)
+      temp=$(${pkgs.coreutils}/bin/cat $i/temp)
+      printf '%s %s°C\n' $type $(echo $temp / 1000 | ${pkgs.bc}/bin/bc)
+    done
+  '';
+
+  q-todo = ''
+    TODO_file=$HOME/TODO
+    if test -e "$TODO_file"; then
+      ${pkgs.coreutils}/bin/cat "$TODO_file" \
+        | ${pkgs.gawk}/bin/gawk -v now=$(${pkgs.coreutils}/bin/date +%s) '
+            BEGIN { print "remind=0" }
+            /^[0-9]/{
+              x = $1
+              gsub(".", "\\\\&", x)
+              rest = substr($0, index($0, " "))
+              rest = $0
+              sub(" *", "", rest)
+              gsub(".", "\\\\&", rest)
+              print "test $(${pkgs.coreutils}/bin/date +%s -d"x") -lt "now" && \
+                echo \"\x1b[38;5;208m\""rest esc "\"\x1b[m\" && \
+                (( remind++ ))"
+            }
+            END { print "test $remind = 0 && echo \"nothing to remind\"" }
+          ' \
+        | {
+          # bash needed for (( ... ))
+          ${pkgs.bash}/bin/bash
+        }
+    else
+      echo "$TODO_file: no such file or directory"
+    fi
+  '';
+
+in
+# bash needed for <(...)
+pkgs.writeBashBin "q" ''
+  set -eu
+  export PATH=/var/empty
+  ${q-cal}
+  echo
+  ${q-isodate}
+  (${q-gitdir}) &
+  (${q-power_supply}) &
+  (${q-virtualization}) &
+  (${q-wireless}) &
+  (${q-online}) &
+  (${q-thermal_zone}) &
+  wait
+  ${q-todo}
+''
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")