summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configs/default.nix2
-rw-r--r--configs/xserver/default.nix2
-rw-r--r--configs/xserver/urxvt.nix2
-rw-r--r--configs/xsessions/urxvtd.nix2
-rw-r--r--pkgs/simple/editor-input.nix2
-rw-r--r--pkgs/simple/pinentry-urxvt/default.nix2
-rw-r--r--pkgs/simple/rxvt-unicode-256color-terminfo/default.nix2
7 files changed, 7 insertions, 7 deletions
diff --git a/configs/default.nix b/configs/default.nix
index 917e508..d693166 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -52,7 +52,7 @@
environment.profileRelativeEnvVars.PATH = lib.mkForce [ "/bin" ];
environment.systemPackages = with pkgs; [
- rxvt_unicode.terminfo
+ rxvt-unicode-unwrapped.terminfo
];
environment.shellAliases = lib.mkForce {
diff --git a/configs/xserver/default.nix b/configs/xserver/default.nix
index e0b8d77..884a982 100644
--- a/configs/xserver/default.nix
+++ b/configs/xserver/default.nix
@@ -115,7 +115,7 @@ in {
config.tv.slock.package
pkgs.flameshot-once-tv
pkgs.pulseaudio.out
- pkgs.rxvt_unicode
+ pkgs.rxvt-unicode-unwrapped
pkgs.xcalib
"/run/wrappers" # for su
];
diff --git a/configs/xserver/urxvt.nix b/configs/xserver/urxvt.nix
index c4e619d..d3c90fd 100644
--- a/configs/xserver/urxvt.nix
+++ b/configs/xserver/urxvt.nix
@@ -6,7 +6,7 @@ in {
restartIfChanged = false;
serviceConfig = {
SyslogIdentifier = "urxvtd";
- ExecStart = "${pkgs.rxvt_unicode}/bin/urxvtd";
+ ExecStart = "${pkgs.rxvt-unicode-unwrapped}/bin/urxvtd";
Restart = "always";
RestartSec = "2s";
StartLimitBurst = 0;
diff --git a/configs/xsessions/urxvtd.nix b/configs/xsessions/urxvtd.nix
index de16a63..80d4b3d 100644
--- a/configs/xsessions/urxvtd.nix
+++ b/configs/xsessions/urxvtd.nix
@@ -9,7 +9,7 @@
RXVT_SOCKET = "%t/urxvtd";
};
serviceConfig = {
- ExecStart = "${pkgs.rxvt_unicode}/bin/urxvtd";
+ ExecStart = "${pkgs.rxvt-unicode-unwrapped}/bin/urxvtd";
};
};
}
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/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/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