summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Phillips <david@yeah.nah.nz>2020-09-27 22:06:07 +1300
committerDavid Phillips <david@yeah.nah.nz>2020-09-27 22:06:07 +1300
commit00ee16522d47772ebdc16b2787566c63ce1af1ce (patch)
treef4901de192d03898581497566846737e0ebe9608
parent1e46113c9acffdec505a471f9fbd923bccf5171f (diff)
parent1f87b9f86a9634d4a10814a1c7e80f7fcd6e712e (diff)
downloaddotfiles-00ee16522d47772ebdc16b2787566c63ce1af1ce.tar.xz
Merge remote-tracking branch 'origin/master' into masterHEADmaster
-rw-r--r--environment13
-rw-r--r--vimrc1
-rw-r--r--zshrc1
3 files changed, 9 insertions, 6 deletions
diff --git a/environment b/environment
index c767584..e10a5c8 100644
--- a/environment
+++ b/environment
@@ -1,20 +1,21 @@
#!/bin/sh
+bin_available() {
+ where "$1" | grep -vq ccache
+}
+
export GPG_TTY=$(tty)
export EDITOR=/usr/bin/vim
export ORIG_PATH="$PATH"
export PATH="/opt/sbase/bin/:$PATH"
-if hash clang 2>/dev/null; then
+if bin_available clang; then
export CC=clang
export CXX=clang++
-elif hash ❤ 2>/dev/null ; then
- export CC=❤
- export CXX=g++
-elif hash gcc 2>/dev/null ; then
+elif bin_available gcc ; then
export CC=gcc
export CXX=g++
-elif hash tcc 2>/dev/null ; then
+elif bin_available tcc ; then
export CC=tcc
fi
diff --git a/vimrc b/vimrc
index abb9b5e..ebfef5e 100644
--- a/vimrc
+++ b/vimrc
@@ -63,6 +63,7 @@ autocmd FileType bitbake setlocal expandtab
autocmd FileType python setlocal expandtab
autocmd FileType haskell setlocal expandtab
autocmd FileType lhaskell setlocal expandtab
+autocmd FileType perl setlocal noexpandtab
""""""""""""""""""""""""""""""
" airline
diff --git a/zshrc b/zshrc
index 6257fcb..f40a661 100644
--- a/zshrc
+++ b/zshrc
@@ -23,6 +23,7 @@ key[Insert]="$terminfo[kich1]"
key[Backspace]="$terminfo[kbs]"
key[Delete]="$terminfo[kdch1]"
+# Emacs-like bindings default
bindkey -e
bindkey "^R" history-incremental-search-backward