X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Fsetup.sh;h=9f622f71494031bd86fb8c2de4a9f8a6a1ce8a76;hb=refs%2Fheads%2Fmaster;hp=7db9722ad9a5b20fb71dc8d188793404595f6640;hpb=d6e56dc30f2b34ef52a1bc9eeec3a3abb45b617a;p=config%2Fdotfiles.git

diff --git a/shell/setup.sh b/shell/setup.sh
index 7db9722..edb209f 100755
--- a/shell/setup.sh
+++ b/shell/setup.sh
@@ -67,9 +67,14 @@ mkdir -p zsh/cache
 # file in this directory; this requires replacing the constant HISTORY_PATH in
 # lesskey.
 echo 'lesskey: generating .lesskey'
-simple_cpp <lesskey \
+cp lesskey lesskey.tmp
+if ! less --help | grep rscroll= > /dev/null; then
+    sed_i 's/--rscroll=[^ ]*//' lesskey.tmp
+fi
+simple_cpp < lesskey.tmp \
     HISTORY_PATH -- "`pwd`/lesshistory" \
     | lesskey -
+rm lesskey.tmp
 chmod 0600 ~/.less
 
 # Custom colors for GNU ls.
@@ -122,7 +127,15 @@ else
     sed_i '/^alias grep=/ s/^/#/' shell/aliases
 fi
 
+if ! lsblk --merge >/dev/null 2>&1; then
+    echo 'shell/aliases: removing lsblk --merge'
+    sed_i 's/lsblk --merge/lsblk/' shell/aliases
+fi
+
 generate screenrc .in cat
+# Use absolute path for "shell" option for proper $SHELL variable.
+apply_optional_replacement screenrc \
+    zsh ZSH "`installed_path zsh`"
 # As screen-256color is not widely supported use it only on machines where the
 # matching terminfo entry is available. This also requires a terminal emulator
 # which supports 256 colors. Also used for tmux.
@@ -228,6 +241,9 @@ fi
 
 # Htop overwrites the comments in its configuration file.
 generate htoprc .in cat
+if installed nproc && test "$(nproc)" -gt 8; then
+    sed_i 's/LeftCPUs/LeftCPUs2/; s/RightCPUs/RightCPUs2/' htoprc
+fi
 
 if installed dig; then
     # dig doesn't support any comments in digrc.