Merge branch 'master' of pnp:stockholm

Conflicts:
	makefu/1systems/gum.nix

1 files changed, 23 insertions, 0 deletions

diff --git a/mv/5pkgs/default.nix b/mv/5pkgs/default.nix
new file mode 100644
index 000000000..0c72c450e
--- /dev/null
+++ b/mv/5pkgs/default.nix
@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+
+{
+  # TODO use XDG_RUNTIME_DIR?
+  cr = pkgs.writeScriptBin "cr" ''
+    #! /bin/sh
+    set -efu
+    export LC_TIME=de_DE.utf8
+    exec ${pkgs.chromium}/bin/chromium \
+        --ssl-version-min=tls1 \
+        --disk-cache-dir=/tmp/chromium-disk-cache_"$LOGNAME" \
+        --disk-cache-size=50000000 \
+        "%@"
+  '';
+  ff = pkgs.writeScriptBin "ff" ''
+    #! /bin/sh
+    set -efu
+    exec ${pkgs.firefoxWrapper}/bin/firefox $(printf " %q" "$@")
+  '';
+  xmonad-tv =
+    let src = pkgs.writeNixFromCabal "xmonad-tv.nix" ./xmonad-tv; in
+    pkgs.haskellPackages.callPackage src {};
+}