X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=inline;f=setup.sh;h=be42a6a017f0ed89b24b48cb5e42f95f10d6ade2;hb=daed52b3c1d6cfa5bfe8246adfcffe0246a5b5c7;hp=5ade6bbf644fb8f52597692e582a15fd84102883;hpb=e7e9c3e89ec4ffca6cb0f1e8e6ebd46202da39f7;p=config%2Fdotfiles.git
diff --git a/setup.sh b/setup.sh
index 5ade6bb..be42a6a 100755
--- a/setup.sh
+++ b/setup.sh
@@ -18,6 +18,8 @@
# along with this program. If not, see .
+set -e
+
. ../lib.sh
# Helper functions.
@@ -34,13 +36,30 @@ if ! infocmp > /dev/null 2>&1; then
fi
+# DIRECTORY SETUP
+
# Create private temporary directory used by many tools (including GNU screen
# and tmux).
mkdir -p ~/.tmp
chmod 0700 ~/.tmp
-# Generate ~/.less with lesskey.
-lesskey lesskey
+# Create rlwrap history directory.
+mkdir -p shell/rlwrap
+
+
+# FILE SETUP
+
+# Generate ~/.less with lesskey. Prevent cluttering ~/ by storing the history
+# file in this directory; this requires replacing the constant HISTORY_PATH in
+# lesskey.
+echo lesskey: generating .lesskey
+perl < lesskey \
+ -e 'while () {
+ s/\bHISTORY_PATH\b/$ARGV[0]/;
+ print;
+ }' \
+ "`pwd`/lesshistory" \
+ | lesskey -
chmod 0600 ~/.less
# Find the required options to get colored ls output. GNU ls is preferred. See
@@ -152,6 +171,19 @@ fi
if installed tmux; then
generate perl tmux.conf ./bin/remove-continuation.pl
+ # Add mappings to switch to windows 10-29 quickly. See tmux-window.pl for
+ # details.
+ perl ./tmux-window.pl 1 "`pwd`/tmux-window2.conf" > tmux-window1.conf
+ perl ./tmux-window.pl 2 > tmux-window2.conf
+ # Set absolute path to tmux-window1.conf in tmux.conf.
+ perl < tmux.conf > tmux.conf.tmp \
+ -e 'while () {
+ s/\bTMUX_WINDOW_PATH\b/$ARGV[0]/;
+ print;
+ }' \
+ "`pwd`/tmux-window1.conf"
+ mv tmux.conf.tmp tmux.conf
+
# 256 colors not available.
if test -z "$use_256colors"; then
echo tmux.conf: removing 256 colors
@@ -176,6 +208,9 @@ if installed remind && test ! -e "$HOME/.reminders"; then
cp reminders.in "$HOME/.reminders"
fi
+
+# LINK SETUP
+
# Link setup for shells.
link shell ~/.shell
link bash ~/.bash
@@ -191,6 +226,9 @@ link zsh/rc ~/.zshrc
link zsh/logout ~/.zlogout
# Link setup for additional files.
+if installed crontab; then
+ link crontab.d ~/.crontab.d
+fi
link lessfilter ~/.lessfilter
if installed colordiff; then
link colordiffrc ~/.colordiffrc
@@ -202,7 +240,8 @@ if installed tmux; then
fi
if installed htop; then
link htoprc ~/.htoprc
+ # New location for htoprc. Use both for compatibility.
+ mkdir -p ~/.config/htop
+ link htoprc ~/.config/htop/htoprc
fi
-# Create rlwrap history directory.
-mkdir -p shell/rlwrap