summaryrefslogtreecommitdiffstats
path: root/pkgs/simple
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/simple')
-rw-r--r--pkgs/simple/alacritty-tv.nix11
-rw-r--r--pkgs/simple/editor-input.nix2
-rw-r--r--pkgs/simple/ff.nix2
-rwxr-xr-xpkgs/simple/fzmenu/bin/otpmenu31
-rwxr-xr-xpkgs/simple/fzmenu/bin/passmenu31
-rw-r--r--pkgs/simple/fzmenu/default.nix2
-rw-r--r--pkgs/simple/pinentry-urxvt/default.nix2
-rw-r--r--pkgs/simple/q/default.nix4
-rw-r--r--pkgs/simple/rxvt-unicode-256color-terminfo/default.nix2
-rw-r--r--pkgs/simple/xkiller.nix2
10 files changed, 73 insertions, 16 deletions
diff --git a/pkgs/simple/alacritty-tv.nix b/pkgs/simple/alacritty-tv.nix
index 0e65434..0d2fe59 100644
--- a/pkgs/simple/alacritty-tv.nix
+++ b/pkgs/simple/alacritty-tv.nix
@@ -7,7 +7,7 @@ pkgs.symlinkJoin {
# usage:
# alacritty [--profile=PROFILE] [--singleton] [ARGS...]
# where
- # PROFILE must have a corresponding file /etc/alacritty/PROFILE.json
+ # PROFILE must have a corresponding file /etc/alacritty/PROFILE.toml
set -efu
@@ -18,14 +18,19 @@ pkgs.symlinkJoin {
shift
esac
- config=/etc/alacritty/$profile.json
+ config=/etc/alacritty/$profile.toml
if ! test -e "$config"; then
echo "$0: warning: bad profile: $profile; using default instead" >&2
profile=default
- config=/etc/alacritty/default.json
+ config=/etc/alacritty/default.toml
fi
+ export WINIT_X11_SCALE_FACTOR=$(
+ ${pkgs.haskellPackages.xoutinfo}/bin/xoutinfo |
+ ${pkgs.jq}/bin/jq .device_scale_factor
+ )
+
case ''${1-} in
--singleton)
shift
diff --git a/pkgs/simple/editor-input.nix b/pkgs/simple/editor-input.nix
index 931179a..536084d 100644
--- a/pkgs/simple/editor-input.nix
+++ b/pkgs/simple/editor-input.nix
@@ -5,7 +5,7 @@ pkgs.writeDashBin "editor-input" ''
${pkgs.with-tmpdir}/bin/with-tmpdir -t editor-input.XXXXXXXX \
${pkgs.writeDash "editor-input.sh" ''
f=$TMPDIR/input
- ${pkgs.rxvt_unicode}/bin/urxvt -name editor-input-urxvt -e \
+ ${pkgs.rxvt-unicode-unwrapped}/bin/urxvt -name editor-input-urxvt -e \
${pkgs.vim}/bin/vim --cmd ':set noeol binary' -c startinsert "$f"
if test -e "$f"; then
${pkgs.xsel}/bin/xsel -ip < "$f"
diff --git a/pkgs/simple/ff.nix b/pkgs/simple/ff.nix
index b6022c6..355c3ec 100644
--- a/pkgs/simple/ff.nix
+++ b/pkgs/simple/ff.nix
@@ -4,5 +4,5 @@ pkgs.writeDashBin "ff" ''
case $TOUCHSCREEN in 1)
export MOZ_USE_XINPUT2=1
esac
- exec ${pkgs.firefox}/bin/firefox "$@"
+ exec ${lib.getExe pkgs.librewolf} "$@"
''
diff --git a/pkgs/simple/fzmenu/bin/otpmenu b/pkgs/simple/fzmenu/bin/otpmenu
index 714ab7c..59706c1 100755
--- a/pkgs/simple/fzmenu/bin/otpmenu
+++ b/pkgs/simple/fzmenu/bin/otpmenu
@@ -1,8 +1,22 @@
#! /bin/sh
+# usage: otpmenu [--phase2-method=METHOD]
+# where METHOD is either copy or type, type being the default.
set -efu
#PATH=
+while test $# -gt 0; do
+ case $1 in
+ --phase2-method=copy|--phase2-method=type)
+ export FZMENU_PHASE2_METHOD=${1#*=}
+ shift 1
+ ;;
+ *)
+ echo "$0: error: bad argument: $1" >&2
+ exit 1
+ esac
+done
+
case ${FZMENU_PHASE-0} in
0)
export FZMENU_PHASE=1
@@ -25,7 +39,7 @@ case ${FZMENU_PHASE-0} in
exec fzf \
--history=/dev/null \
--no-sort \
- --prompt='OTP: ' \
+ --prompt="${FZMENU_PHASE2_METHOD-type} otp: " \
)
then
export FZMENU_PHASE=2
@@ -38,8 +52,19 @@ case ${FZMENU_PHASE-0} in
# lucidatypewriter, causing a warning to be printed to stderr.
font='-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1'
pass=$(pass otp code "$FZMENU_RESULT/otp")
- printf %s "$pass" |
- xvkbd -xrm "xvkbd*Font: $font" -xsendevent -file -
+ case ${FZMENU_PHASE2_METHOD-type} in
+ copy)
+ printf %s "$pass" |
+ xsel -p -i -t 60000
+ ;;
+ type)
+ printf %s "$pass" |
+ xvkbd -xrm "xvkbd*Font: $font" -xsendevent -file -
+ ;;
+ *)
+ echo "$0: error: bad phase2 method: $FZMENU_PHASE2_METHOD" >&2
+ exit -1
+ esac
;;
*)
echo "$0: error: bad phase: $FZMENU_PHASE" >&2
diff --git a/pkgs/simple/fzmenu/bin/passmenu b/pkgs/simple/fzmenu/bin/passmenu
index a798925..0b07174 100755
--- a/pkgs/simple/fzmenu/bin/passmenu
+++ b/pkgs/simple/fzmenu/bin/passmenu
@@ -1,8 +1,22 @@
#! /bin/sh
+# usage: passmenu [--phase2-method=METHOD]
+# where METHOD is either copy or type, type being the default.
set -efu
#PATH=
+while test $# -gt 0; do
+ case $1 in
+ --phase2-method=copy|--phase2-method=type)
+ export FZMENU_PHASE2_METHOD=${1#*=}
+ shift 1
+ ;;
+ *)
+ echo "$0: error: bad argument: $1" >&2
+ exit 1
+ esac
+done
+
case ${FZMENU_PHASE-0} in
0)
export FZMENU_PHASE=1
@@ -26,7 +40,7 @@ case ${FZMENU_PHASE-0} in
exec fzf \
--history=/dev/null \
--no-sort \
- --prompt='pass: ' \
+ --prompt="${FZMENU_PHASE2_METHOD-type} pass: " \
)
then
export FZMENU_PHASE=2
@@ -39,8 +53,19 @@ case ${FZMENU_PHASE-0} in
# lucidatypewriter, causing a warning to be printed to stderr.
font='-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1'
pass=$(pass show "$FZMENU_RESULT")
- printf %s "$pass" |
- xvkbd -xrm "xvkbd*Font: $font" -xsendevent -file -
+ case ${FZMENU_PHASE2_METHOD-type} in
+ copy)
+ printf %s "$pass" |
+ xsel -p -i -t 60000
+ ;;
+ type)
+ printf %s "$pass" |
+ xvkbd -xrm "xvkbd*Font: $font" -xsendevent -file -
+ ;;
+ *)
+ echo "$0: error: bad phase2 method: $FZMENU_PHASE2_METHOD" >&2
+ exit -1
+ esac
;;
*)
echo "$0: error: bad phase: $FZMENU_PHASE" >&2
diff --git a/pkgs/simple/fzmenu/default.nix b/pkgs/simple/fzmenu/default.nix
index c4dccbf..e709d74 100644
--- a/pkgs/simple/fzmenu/default.nix
+++ b/pkgs/simple/fzmenu/default.nix
@@ -28,6 +28,7 @@ pkgs.runCommand "fzmenu" {
ext.pass-otp
]))
pkgs.utillinux
+ pkgs.xsel
pkgs.xvkbd
terminal
]}
@@ -44,6 +45,7 @@ pkgs.runCommand "fzmenu" {
ext.pass-otp
]))
pkgs.utillinux
+ pkgs.xsel
pkgs.xvkbd
terminal
]}
diff --git a/pkgs/simple/pinentry-urxvt/default.nix b/pkgs/simple/pinentry-urxvt/default.nix
index 6868207..808d00a 100644
--- a/pkgs/simple/pinentry-urxvt/default.nix
+++ b/pkgs/simple/pinentry-urxvt/default.nix
@@ -102,7 +102,7 @@ in
''}
exec 3<&0 4>&1 5>&2
- ${pkgs.rxvt_unicode}/bin/urxvt \
+ ${pkgs.rxvt-unicode-unwrapped}/bin/urxvt \
-name ${mylib.shell.escape cfg.appName} \
-e ${pkgs.writeDash "pinentry-urxvt-tty" ''
set -efu
diff --git a/pkgs/simple/q/default.nix b/pkgs/simple/q/default.nix
index a1e60e3..ca4a466 100644
--- a/pkgs/simple/q/default.nix
+++ b/pkgs/simple/q/default.nix
@@ -83,13 +83,13 @@ let
q-net = /* sh */ ''
for dev in $(
- ${pkgs.iproute}/bin/ip a |
+ ${pkgs.iproute2}/bin/ip a |
${pkgs.gnused}/bin/sed -rn 's/^[0-9]+: ([^:]+):.*/\1/p' |
${pkgs.gnugrep}/bin/grep -Ev '^(lo|retiolum|wiregrill)$'
# TODO wiregrill ping ni.w, retiolum ping ni.r
); do
{
- inet=$(${pkgs.iproute}/bin/ip addr show $dev \
+ inet=$(${pkgs.iproute2}/bin/ip addr show $dev \
| ${pkgs.gnused}/bin/sed -n '
s/.*inet \([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p
')
diff --git a/pkgs/simple/rxvt-unicode-256color-terminfo/default.nix b/pkgs/simple/rxvt-unicode-256color-terminfo/default.nix
index d2f6f46..8bfd1e8 100644
--- a/pkgs/simple/rxvt-unicode-256color-terminfo/default.nix
+++ b/pkgs/simple/rxvt-unicode-256color-terminfo/default.nix
@@ -1,5 +1,5 @@
# This package is mainly intended for cross-built systems for which we cannot
-# or don't want to build pkgs.rxvt_unicode for some reason.
+# or don't want to build pkgs.rxvt-unicode-unwrapped for some reason.
#
# ${./rxvt-unicode-256color.terminfo} was copied from a previously built
# /run/current-system/sw/share/terminfo/r/rxvt-unicode-256color
diff --git a/pkgs/simple/xkiller.nix b/pkgs/simple/xkiller.nix
index 8d8f016..9d83047 100644
--- a/pkgs/simple/xkiller.nix
+++ b/pkgs/simple/xkiller.nix
@@ -2,7 +2,7 @@
pkgs.writeDash "xkiller" ''
set -efu
exec >&2
- ${pkgs.iproute}/bin/ss -lp src unix:/tmp/.X11-unix/X* |
+ ${pkgs.iproute2}/bin/ss -lp src unix:/tmp/.X11-unix/X* |
${pkgs.gnused}/bin/sed -n '
s|.*/tmp/.X11-unix/X\([0-9]\+\)\>.*("X[^"]*",pid=\([0-9]\+\)\>.*|\1 \2|p
' |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 06:38:11 +0000