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 +------
 tv/2configs/xserver/Xresources.nix | 6 +-----
 tv/5pkgs/default.nix               | 7 ++-----
 tv/5pkgs/ff/default.nix            | 8 ++++++++
 4 files changed, 12 insertions(+), 16 deletions(-)
 create mode 100644 tv/5pkgs/ff/default.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
diff --git a/tv/2configs/xserver/Xresources.nix b/tv/2configs/xserver/Xresources.nix
index 3936a26f7..f287bf206 100644
--- a/tv/2configs/xserver/Xresources.nix
+++ b/tv/2configs/xserver/Xresources.nix
@@ -203,11 +203,7 @@ pkgs.writeText "Xresources" ''
   ! ref https://github.com/muennich/urxvt-perls
   URxvt*perl-ext: default,url-select
   URxvt*keysym.M-u: perl:url-select:select_next
-  !URxvt*url-select.launcher: /home/tv/free/firefox -new-tab
-  ! 2014-05-12 nix:
-  !URxvt.url-select.launcher:  /home/tv/bin/ff -new-tab 
-  ! 2015-07-26 stockholm:
-  URxvt*url-select.launcher: ff -new-tab 
+  URxvt*url-select.launcher: ${pkgs.ff}/bin/ff -new-tab
   URxvt*url-select.underline: true
   URxvt*colorUL: #4682B4
   URxvt.perl-lib: ${pkgs.urxvt_perls}/lib/urxvt/perl
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 4175292f2..3cfa8f863 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -1,9 +1,6 @@
 { pkgs, ... }:
 
-let
-  inherit (pkgs) callPackage;
-in
-
 {
-  viljetic-pages = callPackage ./viljetic-pages {};
+  ff = pkgs.callPackage ./ff {};
+  viljetic-pages = pkgs.callPackage ./viljetic-pages {};
 }
diff --git a/tv/5pkgs/ff/default.nix b/tv/5pkgs/ff/default.nix
new file mode 100644
index 000000000..2db404030
--- /dev/null
+++ b/tv/5pkgs/ff/default.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+
+pkgs.writeScriptBin "ff" ''
+ #! ${pkgs.bash}/bin/bash
+ exec sudo -u ff -i <<EOF
+ exec ${pkgs.firefoxWrapper}/bin/firefox $(printf " %q" "$@")
+ EOF
+''
-- 
cgit v1.2.3