From 65a7b6bf03c6976060d897c78fcd391d6b689e2f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 31 May 2022 19:14:09 +0200
Subject: tv: pass-otp -> pass.withExtensions

---
 tv/5pkgs/simple/fzmenu/default.nix | 47 +++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

(limited to 'tv/5pkgs')

diff --git a/tv/5pkgs/simple/fzmenu/default.nix b/tv/5pkgs/simple/fzmenu/default.nix
index 1f1b8284..634d8338 100644
--- a/tv/5pkgs/simple/fzmenu/default.nix
+++ b/tv/5pkgs/simple/fzmenu/default.nix
@@ -1,37 +1,38 @@
-{ lib, stdenv
-, runCommand
-, coreutils, dash, gnused, fzf, pass-otp, rxvt_unicode, utillinux, xdotool
-}:
+{ lib, pkgs, stdenv }:
 
-runCommand "fzmenu" {
+pkgs.runCommand "fzmenu" {
 } /* sh */ ''
   mkdir $out
 
   cp -r ${./bin} $out/bin
 
   substituteInPlace $out/bin/otpmenu \
-      --replace '#! /bin/sh' '#! ${dash}/bin/dash' \
+      --replace '#! /bin/sh' '#! ${pkgs.dash}/bin/dash' \
       --replace '#PATH=' PATH=${lib.makeBinPath [
-        coreutils
-        dash
-        fzf
-        gnused
-        pass-otp
-        rxvt_unicode
-        utillinux
-        xdotool
+        pkgs.coreutils
+        pkgs.dash
+        pkgs.fzf
+        pkgs.gnused
+        (pkgs.pass.withExtensions (ext: [
+          ext.pass-otp
+        ]))
+        pkgs.rxvt_unicode
+        pkgs.utillinux
+        pkgs.xdotool
       ]}
 
   substituteInPlace $out/bin/passmenu \
-      --replace '#! /bin/sh' '#! ${dash}/bin/dash' \
+      --replace '#! /bin/sh' '#! ${pkgs.dash}/bin/dash' \
       --replace '#PATH=' PATH=${lib.makeBinPath [
-        coreutils
-        dash
-        fzf
-        gnused
-        pass-otp
-        rxvt_unicode
-        utillinux
-        xdotool
+        pkgs.coreutils
+        pkgs.dash
+        pkgs.fzf
+        pkgs.gnused
+        (pkgs.pass.withExtensions (ext: [
+          ext.pass-otp
+        ]))
+        pkgs.rxvt_unicode
+        pkgs.utillinux
+        pkgs.xdotool
       ]}
 ''
-- 
cgit v1.2.3


From d389189efd7efe36df6a285efdc6a9caea29b1fe Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 31 May 2022 20:12:06 +0200
Subject: tv: firefoxWrapper -> firefox

---
 tv/5pkgs/simple/ff.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/5pkgs')

diff --git a/tv/5pkgs/simple/ff.nix b/tv/5pkgs/simple/ff.nix
index ec20c4a2..4ce9c3c7 100644
--- a/tv/5pkgs/simple/ff.nix
+++ b/tv/5pkgs/simple/ff.nix
@@ -1,5 +1,5 @@
 { pkgs }:
 
 pkgs.writeDashBin "ff" ''
-  exec ${pkgs.firefoxWrapper}/bin/firefox "$@"
+  exec ${pkgs.firefox}/bin/firefox "$@"
 ''
-- 
cgit v1.2.3


From 88a2a5fc9d6003722203e234096e1306bc9b01e6 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 19 Jun 2022 12:34:14 +0200
Subject: tv xmonad: add 22.05 compatibility

---
 tv/5pkgs/haskell/xmonad-tv/src/main.hs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'tv/5pkgs')

diff --git a/tv/5pkgs/haskell/xmonad-tv/src/main.hs b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
index cf0c0f53..81373f41 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/main.hs
+++ b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
@@ -7,7 +7,7 @@ module Main (main) where
 import System.Exit (exitFailure)
 
 import Control.Exception
-import Control.Monad.Extra (ifM, whenJustM)
+import Control.Monad.Extra (whenJustM)
 import qualified Data.List
 import Graphics.X11.ExtraTypes.XF86
 import Text.Read (readEither)
@@ -68,7 +68,9 @@ mainNoArgs :: IO ()
 mainNoArgs = do
     workspaces0 <- getWorkspaces0
     handleShutdownEvent <- newShutdownEventHandler
-    launch
+    let
+      config =
+        id
         $ withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ")
         $ def
             { terminal          = {-pkg:rxvt_unicode-}"urxvtc"
@@ -100,6 +102,8 @@ mainNoArgs = do
             , focusedBorderColor = "#f000b0"
             , handleEventHook = handleShutdownEvent
             }
+    directories <- getDirectories
+    launch config directories
 
 
 getWorkspaces0 :: IO [String]
-- 
cgit v1.2.3


From a501cefc19cac105921612f9544f6d0cd137d9b7 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 14 Jul 2022 15:38:17 +0200
Subject: tv pkgs pushBack: fix typo

---
 tv/5pkgs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/5pkgs')

diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 2b9bdeeb..4f6643c7 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -4,7 +4,7 @@ let
     if elem x xs then
       remove x xs ++ [ x ]
     else
-      names;
+      xs;
 in
 
 self: super:
-- 
cgit v1.2.3


From 9170f1618efed14db081d1d3c3daa14bf3aabd8f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 14 Jul 2022 15:41:59 +0200
Subject: tv dhcpcd: RIP

---
 tv/5pkgs/override/dhcpcd.nix | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 tv/5pkgs/override/dhcpcd.nix

(limited to 'tv/5pkgs')

diff --git a/tv/5pkgs/override/dhcpcd.nix b/tv/5pkgs/override/dhcpcd.nix
deleted file mode 100644
index 202b8e5d..00000000
--- a/tv/5pkgs/override/dhcpcd.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-self: super:
-
-self.lib.overrideDerivation super.dhcpcd (old: {
-  configureFlags = old.configureFlags ++ [
-    "--dbdir=/var/lib/dhcpcd"
-  ];
-})
-- 
cgit v1.2.3