From 5206c11026245b1fe20a66fb5b14165e51195f0b Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Wed, 21 Oct 2015 22:43:11 +0200
Subject: wu nixpkgs: f77bf46 -> 9048637

---
 tv/1systems/wu.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'tv/1systems/wu.nix')

diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index c691066cb..c687ae52d 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -10,8 +10,11 @@ with lib;
 
   krebs.build.source = {
     git.nixpkgs = {
-      url = https://github.com/NixOS/nixpkgs;
-      rev = "e916273209560b302ab231606babf5ce1c481f08";
+      #url = https://github.com/NixOS/nixpkgs;
+      #rev = "f77bf46c1e705934a00c52d90cc62a76fbb1f6b5";
+      # Revert "rxvt_unicode: add patch to fix Shift+PgUp/PgDown bug"
+      url = https://github.com/4z3/nixpkgs;
+      rev = "9048637";
     };
     dir.secrets = {
       host = config.krebs.hosts.wu;
-- 
cgit v1.2.3


From c2e1ab2bd09c204e1fa1c4ecd637c2e5b8a4b9ab Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 22 Oct 2015 01:25:02 +0200
Subject: tv base systemPackages += git

---
 tv/1systems/wu.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tv/1systems/wu.nix')

diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index c687ae52d..404fdb3d1 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -40,7 +40,6 @@ with lib;
 
         # stockholm
         genid
-        git
         gnumake
         hashPassword
         lentil
-- 
cgit v1.2.3


From 9ba8fc142cb14aa3768cb99bf9170f7875beafd1 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 22 Oct 2015 12:48:17 +0200
Subject: wu nixpkgs: 9048637 -> e916273

Current unstable is really unstable w/system hangs.
---
 tv/1systems/wu.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'tv/1systems/wu.nix')

diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 404fdb3d1..89ad257f0 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -10,11 +10,8 @@ with lib;
 
   krebs.build.source = {
     git.nixpkgs = {
-      #url = https://github.com/NixOS/nixpkgs;
-      #rev = "f77bf46c1e705934a00c52d90cc62a76fbb1f6b5";
-      # Revert "rxvt_unicode: add patch to fix Shift+PgUp/PgDown bug"
-      url = https://github.com/4z3/nixpkgs;
-      rev = "9048637";
+      url = https://github.com/NixOS/nixpkgs;
+      rev = "e916273209560b302ab231606babf5ce1c481f08";
     };
     dir.secrets = {
       host = config.krebs.hosts.wu;
-- 
cgit v1.2.3


From 0306ec4294f6d825ca65c7b0c98a80a3bced8fdf Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 24 Oct 2015 22:31:10 +0200
Subject: tv: lol display-manager

---
 tv/1systems/wu.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tv/1systems/wu.nix')

diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 89ad257f0..987748de0 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -29,8 +29,7 @@ with lib;
     #../2configs/consul-client.nix
     ../2configs/git.nix
     ../2configs/mail-client.nix
-    ../2configs/xserver.nix
-    ../2configs/synaptics.nix # TODO w110er if xserver is enabled
+    ../2configs/xserver
     ../2configs/test.nix
     {
       environment.systemPackages = with pkgs; [
-- 
cgit v1.2.3


From a4d7f920bf49de6237191558d02b0f58ed307fd4 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 24 Oct 2015 22:55:50 +0200
Subject: tv URxvt*url-select.launcher = ff

---
 tv/1systems/wu.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'tv/1systems/wu.nix')

diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 987748de0..a5232c9e1 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -40,12 +40,6 @@ with lib;
         hashPassword
         lentil
         parallel
-        (pkgs.writeScriptBin "ff" ''
-          #! ${pkgs.bash}/bin/bash
-          exec sudo -u ff -i <<EOF
-          exec ${pkgs.firefoxWrapper}/bin/firefox $(printf " %q" "$@")
-          EOF
-        '')
         (pkgs.writeScriptBin "im" ''
           #! ${pkgs.bash}/bin/bash
           export PATH=${makeSearchPath "bin" (with pkgs; [
@@ -69,6 +63,7 @@ with lib;
         bind # dig
         cac
         dic
+        ff
         file
         get
         gitAndTools.qgit
-- 
cgit v1.2.3


From 8afb910e2a87e0edc9fc4693ed09b4a0ce0fb206 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sun, 25 Oct 2015 09:55:51 +0100
Subject: tv: drop test.nix

---
 tv/1systems/wu.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tv/1systems/wu.nix')

diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index a5232c9e1..586ad1725 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -30,7 +30,6 @@ with lib;
     ../2configs/git.nix
     ../2configs/mail-client.nix
     ../2configs/xserver
-    ../2configs/test.nix
     {
       environment.systemPackages = with pkgs; [
 
-- 
cgit v1.2.3