From 949f466cf78ba2e76002012715172e5d5d394006 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 7 Feb 2016 05:17:07 +0100
Subject: tv: s/_/-/g in usernames

---
 mv/2configs/git.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mv')

diff --git a/mv/2configs/git.nix b/mv/2configs/git.nix
index 991d0c410..c182d0d1e 100644
--- a/mv/2configs/git.nix
+++ b/mv/2configs/git.nix
@@ -45,7 +45,7 @@ let
         perm = push "refs/*" [ non-fast-forward create delete merge ];
       } ++
       optional repo.public {
-        user = [ lass makefu uriel tv tv_xu ];
+        user = [ lass makefu uriel tv tv-xu ];
         repo = [ repo ];
         perm = fetch;
       } ++
-- 
cgit v1.2.3


From d98578e3e190463a341a94f2cc778ef886f9252d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 8 Feb 2016 01:07:03 +0100
Subject: rm krebs.build.target

---
 mv/1systems/stro.nix | 2 --
 1 file changed, 2 deletions(-)

(limited to 'mv')

diff --git a/mv/1systems/stro.nix b/mv/1systems/stro.nix
index 38d4b4bc6..3915219b7 100644
--- a/mv/1systems/stro.nix
+++ b/mv/1systems/stro.nix
@@ -8,8 +8,6 @@ with lib;
   krebs.build.source.git.nixpkgs.rev =
     "7ae05edcdd14f6ace83ead9bf0d114e97c89a83a";
 
-  krebs.build.target = "lolwat";
-
   imports = [
     ../2configs/hw/x220.nix
     ../2configs/git.nix
-- 
cgit v1.2.3


From 0cf6d065f43c66efadd0a364c3414e6ecdae0004 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 11 Feb 2016 03:47:26 +0100
Subject: *: turn 5pkgs into a(n optional) module

---
 mv/5pkgs/default.nix | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

(limited to 'mv')

diff --git a/mv/5pkgs/default.nix b/mv/5pkgs/default.nix
index 0c72c450e..882ac0413 100644
--- a/mv/5pkgs/default.nix
+++ b/mv/5pkgs/default.nix
@@ -1,23 +1,24 @@
 { 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 {};
+  nixpkgs.config.packageOverrides = rec {
+    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 {};
+  };
 }
-- 
cgit v1.2.3