From 4758ffb1194e1d8471ab0f8abd4a41781dc13fda Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 13 Jan 2019 15:05:29 -0500 Subject: Change default ENV from cashrc to env.sh --- bin/cash/cash.1 | 2 +- bin/cash/var.c | 2 +- home/.config/cash/cashrc | 41 ----------------------------------------- home/.config/cash/env.sh | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 43 deletions(-) delete mode 100644 home/.config/cash/cashrc create mode 100644 home/.config/cash/env.sh diff --git a/bin/cash/cash.1 b/bin/cash/cash.1 index 14c7aeca..55e7fa8e 100644 --- a/bin/cash/cash.1 +++ b/bin/cash/cash.1 @@ -142,7 +142,7 @@ The default value of .Ev ENV is: .Pp -.Dl "ENV=${XDG_CONFIG_HOME:-${HOME}/.config}/cash/cashrc" +.Dl "ENV=${XDG_CONFIG_HOME:-${HOME}/.config}/cash/env.sh" . .Pp The first non-option argument specified on the command line diff --git a/bin/cash/var.c b/bin/cash/var.c index e183eaa3..18e5de62 100644 --- a/bin/cash/var.c +++ b/bin/cash/var.c @@ -106,7 +106,7 @@ struct localvar *localvars; int forcelocal; static const struct varinit varinit[] = { - { &venv, 0, "ENV=${XDG_CONFIG_HOME:-${HOME}/.config}/cash/cashrc", NULL }, + { &venv, 0, "ENV=${XDG_CONFIG_HOME:-${HOME}/.config}/cash/env.sh", NULL }, #ifndef NO_HISTORY { &vhistsize, VUNSET, "HISTSIZE=", sethistsize }, diff --git a/home/.config/cash/cashrc b/home/.config/cash/cashrc deleted file mode 100644 index 573d7c2d..00000000 --- a/home/.config/cash/cashrc +++ /dev/null @@ -1,41 +0,0 @@ -set -o noclobber -o nounset -o vi - -systemPath=$PATH -PATH=/sbin:/bin:/opt/pkg/sbin:/opt/pkg/bin:/usr/local/sbin:/usr/local/bin:/usr/pkg/sbin:/usr/pkg/bin:/usr/sbin:/usr/bin:~/.local/sbin:~/.local/bin:/usr/games -CDPATH=:$HOME - -export PAGER=less -export MANSECT=2:3:1:8:6:5:7:4:9 -export EDITOR=vim -if type nvim > /dev/null; then - EDITOR=nvim - alias vim=nvim - export MANPAGER="nvim -c 'set ft=man' -" -fi -export GIT_EDITOR=$EDITOR -export CLICOLOR=1 -export GPG_TTY=$(tty) -export NETHACKOPTIONS='pickup_types:$!?+/=, color, DECgraphics' - -alias ls='ls -p' -alias ll='ls -lh' -if [ "$(uname)" = 'Linux' ]; then - alias ls='ls --color=auto' grep='grep --color' rm='rm -I' -fi -alias bc='bc -l' -alias gs='git status --short --branch || ls' gd='git diff' -alias gsh='git show' gl='git log --graph --pretty=log' -alias gco='git checkout' gb='git branch' gm='git merge' gst='git stash' -alias ga='git add' gmv='git mv' grm='git rm' -alias gc='git commit' gca='gc --amend' gt='git tag' -alias gp='git push' gu='git pull' gf='git fetch' -alias gr='git rebase' gra='gr --abort' grc='gr --continue' grs='gr --skip' -alias rand='openssl rand -base64 33' -alias private='eval "$(gpg -d ~/.private)"' - -af7=$(tput setaf 7 || tput AF 7) -sgr0=$(tput sgr0 || tput me) - -PSlit=$'\1' -PS1="${PSlit}${af7}${PSlit}\$${PSlit}${sgr0}${PSlit} " -RPS1="${PSlit}${af7}${PSlit}\\W${PSlit}${sgr0}${PSlit}" diff --git a/home/.config/cash/env.sh b/home/.config/cash/env.sh new file mode 100644 index 00000000..32733a8a --- /dev/null +++ b/home/.config/cash/env.sh @@ -0,0 +1,42 @@ +set -o noclobber -o nounset -o vi + +colon() { + IFS=: + echo "$*" +} + +# {,/opt/pkg,/usr{/local,/pkg,},$HOME/.local}/{s,}bin /usr/games +_PATH=$PATH +PATH=$(colon /sbin /bin /opt/pkg/sbin /opt/pkg/bin /usr/local/sbin /usr/local/bin /usr/pkg/sbin /usr/pkg/bin /usr/sbin /usr/bin ~/.local/sbin ~/.local/bin /usr/games) +CDPATH=:~ + +export PAGER=less +export EDITOR=nvim +export MANPAGER="nvim -c 'set ft=man' -" +export MANSECT=2:3:1:8:6:5:7:4:9 +export CLICOLOR=1 +export GPG_TTY=$(tty) +export NETHACKOPTIONS='pickup_types:$!?+/=, color, DECgraphics' +type nvim > /dev/null || EDITOR=vim + +alias vim="$EDITOR" +alias ls='ls -p' +alias ll='ls -hl' +alias bc='bc -l' +alias gs='git status --short --branch || ls' gd='git diff' +alias gsh='git show' gl='git log --graph --pretty=log' +alias gco='git checkout' gb='git branch' gm='git merge' gst='git stash' +alias ga='git add' gmv='git mv' grm='git rm' +alias gc='git commit' gca='gc --amend' gt='git tag' +alias gp='git push' gu='git pull' gf='git fetch' +alias gr='git rebase' gra='gr --abort' grc='gr --continue' grs='gr --skip' +alias rand='openssl rand -base64 33' +alias private='eval "$(gpg -d ~/.private)"' +[ "$(uname)" = 'Linux' ] && alias ls='ls --color=auto' grep='grep --color' + +af7=$(tput setaf 7 || tput AF 7) +sgr0=$(tput sgr0 || tput me) + +PSlit=$'\1' +PS1="${PSlit}${af7}${PSlit}\$${PSlit}${sgr0}${PSlit} " +RPS1="${PSlit}${af7}${PSlit}\\W${PSlit}${sgr0}${PSlit}" -- cgit 1.4.1 >June McEnroe 2019-02-10Add hi debug outputJune McEnroe 2019-02-10Actually do HTML " escapingJune McEnroe 2019-02-10Set git commit.verboseJune McEnroe 2019-02-10Add back missing static keywordJune McEnroe