From 34b9bd06d317ef04e69196cccf9557925c7d1164 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Wed, 18 Mar 2020 09:16:24 +0100 Subject: [PATCH 1/7] Fix darkbg --- .zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index 177b469..d3fdc2d 100644 --- a/.zshrc +++ b/.zshrc @@ -27,7 +27,7 @@ if ack=`whence ack-grep` then alias ack=$ack fi -alias darkbg='xtermcontrol --bg "#000" --fg "#FFF --highlight="#00F""; export BG=dark' +alias darkbg='xtermcontrol --bg "#000" --fg "#FFF" --highlight="#00F"; export BG=dark' alias lightbg='xtermcontrol --bg "#EEE" --fg "#000" --highlight="#0FF"; export BG=light' alias defaultbg='. ~/.zxtermcolors' alias ag='ag --color-path "34;47"' From 74b669b47a547ab43d0fafa1ffcc869056d0dc9d Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Mon, 23 Mar 2020 12:30:28 +0100 Subject: [PATCH 2/7] Search for go in /usr/local --- .zshenv | 1 + 1 file changed, 1 insertion(+) diff --git a/.zshenv b/.zshenv index 16dd836..e0aa981 100644 --- a/.zshenv +++ b/.zshenv @@ -58,6 +58,7 @@ then PATH=`$preppath -c /usr/local/sbin:/usr/local/bin` `$preppath -c -e /usr/local/node-v8.9.4-linux-x86/bin` `$preppath -c -e -r /usr/lib/go-1.*/bin` + `$preppath -c -e -r /usr/local/go-1.*/bin` `$preppath -c -e -r $HOME/go/bin` PATH=`$preppath -c $HOME/scripts` PATH=`$preppath -c $HOME/bin/hosts:$HOME/bin` From c20b8fce3c5883a2ec52875d5adeb8aa06dd85c6 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Thu, 26 Mar 2020 12:09:42 +0100 Subject: [PATCH 3/7] Make lightbg lighter The three-digit color codes in xtermcontrol work differently than in CSS. #EEE is equivalent to #E0E0E0, not #EEEEEE. --- .zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index d3fdc2d..0c0f63b 100644 --- a/.zshrc +++ b/.zshrc @@ -28,7 +28,7 @@ then alias ack=$ack fi alias darkbg='xtermcontrol --bg "#000" --fg "#FFF" --highlight="#00F"; export BG=dark' -alias lightbg='xtermcontrol --bg "#EEE" --fg "#000" --highlight="#0FF"; export BG=light' +alias lightbg='xtermcontrol --bg "#F0F0F0" --fg "#000" --highlight="#0FF"; export BG=light' alias defaultbg='. ~/.zxtermcolors' alias ag='ag --color-path "34;47"' From 9a3b1f0b9bd045ff0b0f427b910ffb6211fc4d81 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Thu, 26 Mar 2020 14:55:30 +0100 Subject: [PATCH 4/7] Handle .ts and .html files Recognize .ts files as javascript (its really typescript but I don't have syntax highlighting for that). Set sw for javascript and html. --- .vimrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.vimrc b/.vimrc index a4bdc73..4354793 100644 --- a/.vimrc +++ b/.vimrc @@ -42,3 +42,8 @@ autocmd FileType perl syntax on autocmd FileType go set sw=8 autocmd FileType go set tw=79 autocmd FileType go set noexpandtab + +autocmd BufRead,BufNewFile *.ts set filetype=javascript +autocmd FileType javascript set sw=2 + +autocmd FileType html set sw=2 From ab06f7efbe28cce561fa37e940aab6318a8f2b80 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Fri, 27 Mar 2020 10:53:34 +0100 Subject: [PATCH 5/7] Don't wrap crontab files --- .vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vimrc b/.vimrc index 4354793..1df75f3 100644 --- a/.vimrc +++ b/.vimrc @@ -47,3 +47,5 @@ autocmd BufRead,BufNewFile *.ts set filetype=javascript autocmd FileType javascript set sw=2 autocmd FileType html set sw=2 + +autocmd FileType crontab set tw=0 From cca4072c374836c549086485fc498764cb854281 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Mon, 30 Mar 2020 16:42:05 +0200 Subject: [PATCH 6/7] Fix handling of FPATH --- .zshrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.zshrc b/.zshrc index 0c0f63b..542968d 100644 --- a/.zshrc +++ b/.zshrc @@ -121,7 +121,16 @@ fi # don't want to recreate that mess manually. if [ -d ~/bin/func ] then + export FPATH FPATH=`preppath -v FPATH ~/bin/func` + # We also have to mark all functions explicitely as undefined, + # or zsh won't look for them. (Is this new? I thought that zsh would + # automatically search for unknown commands in FPATH, too. Maybe + # there's an option for that.) + for f in ~/bin/func/* + do + typeset -fu $(basename $f) + done fi # for new style completion: From 1fb9fc5a6c3d283e4fc782680b9b89b9c34a2855 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Thu, 16 Apr 2020 12:12:25 +0200 Subject: [PATCH 7/7] Set foreground color to black Just setting the background color may result in unreadable combinations. A black foreground should always work well with a light background. --- .znewterm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.znewterm b/.znewterm index fd65a85..0e45ddc 100644 --- a/.znewterm +++ b/.znewterm @@ -66,7 +66,7 @@ then then . ~/.zxtermcolors else - perl -e 'printf(qq{if whence xtermcontrol >/dev/null\nthen\nxtermcontrol --bg "#%02X%02X%02X"\nexport BG=light\nfi\n}, map { rand(128)+128 } qw(1 1 1))' > ~/.zxtermcolors + perl -e 'printf(qq{if whence xtermcontrol >/dev/null\nthen\nxtermcontrol --bg "#%02X%02X%02X" --fg "#000000"\nexport BG=light\nfi\n}, map { rand(128)+128 } qw(1 1 1))' > ~/.zxtermcolors fi fi