citadel

commit ec9789806cafdca24c017ace3491faba823e2e70
parent 33e95c1902b1709a3db0477002d2544bec236f2a
Author: William Casarin <jb55@jb55.com>
Date:   Tue, 17 Nov 2020 09:16:09 -0800

bash cleanups

Diffstat:
M
dotfiles/.bashrc
 | 
40
----------------------------------------
M
dotfiles/.zshrc
 | 
14
++------------

2 files changed, 2 insertions(+), 52 deletions(-)
diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc
@@ -15,9 +15,6 @@ export HISTCONTROL=ignoreboth
 # update the values of LINES and COLUMNS.
 shopt -s checkwinsize
 
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(lesspipe)"
-
 # set variable identifying the chroot you work in (used in the prompt below)
 if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
     debian_chroot=$(cat /etc/debian_chroot)
@@ -69,43 +66,6 @@ if [ -f ~/.bash_aliases ]; then
     . ~/.bash_aliases
 fi
 
-# enable color support of ls and also add handy aliases
-if [ "$TERM" != "dumb" ] && [ -x /usr/bin/dircolors ]; then
-    eval "`dircolors -b`"
-    alias ls='ls --color=auto'
-    #alias dir='ls --color=auto --format=vertical'
-    #alias vdir='ls --color=auto --format=long'
-
-    #alias grep='grep --color=auto'
-    #alias fgrep='fgrep --color=auto'
-    #alias egrep='egrep --color=auto'
-fi
-
-# some more ls aliases
-#alias ll='ls -l'
-#alias la='ls -A'
-#alias l='ls -CF'
-
-cl()
-{
-    if [ -d $1 ]; then
-        cd $1
-        ls -a
-    else
-        cd $HOME
-        ls -a
-    fi
-}
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
-fi
-
-PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
-
 # added by travis gem
 [ -f /Users/jb55/.travis/travis.sh ] && source /Users/jb55/.travis/travis.sh
 
diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc
@@ -41,23 +41,18 @@ export NIX_PATH="dotfiles=$HOME/dotfiles:$NIX_PATH"
 
 # Customize to your needs...
 
-[ -e $HOME/.profile ] && source $HOME/.profile
-
 # other
 export EDITOR="edit"
-export VISUAL="edit-visual"
-export BROWSER="qbrowser"
+export VISUAL="edit"
+export BROWSER="browser"
 export PAGER=less
-export LESS="-R"
 
 # go
 
 export GOPATH=$HOME/dev/gocode
-export RUBYBIN=$HOME/.ruby/1.8/gems/bin
 export PATH=$HOME/bin:$PATH
 export PATH=$HOME/.local/bin:$PATH
 export PATH=$RUBYBIN:$HOME/.npm/bin:$GOPATH/bin:$PATH
-export PATH=$RUBYBIN:$HOME/.npm/bin:$GOPATH/bin:$PATH
 
 # alias
 
@@ -82,9 +77,6 @@ export GEM_PATH="$GEM_HOME"
 # z
 source "$HOME/bin/z.sh"
 
-export BARI=$HOME/Dropbox/shared/bari
-
-
 ALIASES="$HOME/.bash_aliases"
 [ -e "$ALIASES" ] && source "$ALIASES"
 
@@ -98,8 +90,6 @@ bindkey "^H" runthefuzzyo_hist
 DIRCOLORS="$HOME/.dircolors"
 [ -e "$DIRCOLORS" ] && eval "$(dircolors -b "$DIRCOLORS")"
 
-export FZF_DEFAULT_OPTS="--color=light"
-
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
 [[ $TERM == "dumb" ]] && unsetopt zle && PS1='$ '