summaryrefslogtreecommitdiffstats
path: root/tv/5pkgs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-07-20 16:00:14 +0200
committerlassulus <lassulus@lassul.us>2022-07-20 16:00:14 +0200
commit2c03c42bd62e6890f4193e3023b286a80e6d1dcd (patch)
treef1ee58f82393126da03086e92692c6e6bc04683e /tv/5pkgs
parent3853645a5e3891802d6b3d5bb015e85aaf4e5bfe (diff)
parent9170f1618efed14db081d1d3c3daa14bf3aabd8f (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/5pkgs')
-rw-r--r--tv/5pkgs/default.nix2
-rw-r--r--tv/5pkgs/haskell/xmonad-tv/src/main.hs8
-rw-r--r--tv/5pkgs/override/dhcpcd.nix7
-rw-r--r--tv/5pkgs/simple/ff.nix2
-rw-r--r--tv/5pkgs/simple/fzmenu/default.nix47
5 files changed, 32 insertions, 34 deletions
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 2b9bdeeba..4f6643c7e 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:
diff --git a/tv/5pkgs/haskell/xmonad-tv/src/main.hs b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
index cf0c0f538..81373f410 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]
diff --git a/tv/5pkgs/override/dhcpcd.nix b/tv/5pkgs/override/dhcpcd.nix
deleted file mode 100644
index 202b8e5da..000000000
--- 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"
- ];
-})
diff --git a/tv/5pkgs/simple/ff.nix b/tv/5pkgs/simple/ff.nix
index ec20c4a2f..4ce9c3c75 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 "$@"
''
diff --git a/tv/5pkgs/simple/fzmenu/default.nix b/tv/5pkgs/simple/fzmenu/default.nix
index 1f1b82848..634d8338b 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
]}
''