From 2a0976b40a2b3888f9ba9f2d047f81b98837dc58 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Fri, 28 Jun 2019 22:28:32 -0400
Subject: Rename catsh to 1sh

Yes it's another rename because I felt like catsh was too long. 1sh is
short and unique.
---
 home/.config/1sh/env.sh   | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 home/.config/catsh/env.sh | 47 -----------------------------------------------
 2 files changed, 47 insertions(+), 47 deletions(-)
 create mode 100644 home/.config/1sh/env.sh
 delete mode 100644 home/.config/catsh/env.sh

(limited to 'home')

diff --git a/home/.config/1sh/env.sh b/home/.config/1sh/env.sh
new file mode 100644
index 00000000..0c645e64
--- /dev/null
+++ b/home/.config/1sh/env.sh
@@ -0,0 +1,47 @@
+set -o noclobber -o nounset -o vi
+HISTSIZE=1000
+
+_PATH=$PATH
+PATH=
+for prefix in '' /usr/local /usr/pkg /usr /opt/pkg ~/.local; do
+	PATH=${PATH}${PATH:+:}${prefix}/sbin:${prefix}/bin
+done
+PATH=$PATH:/usr/games
+CDPATH=:~
+
+export PAGER=less
+export LESS=FRX
+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 !!='fc -s'
+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)"'
+if [ "$(uname)" = 'Linux' ]; then
+	alias ls='ls --color=auto' grep='grep --color'
+fi
+
+af0=$(tput setaf 0 || tput AF 0)
+af7=$(tput setaf 7 || tput AF 7)
+sgr0=$(tput sgr0 || tput me)
+
+PSlit=$'\1'
+[ "${TERM%-*}" = 'xterm' ] && PS0=$'\e]0;\\W\a\n' || PS0=$'\n'
+PS1="${PSlit}${af7}${PSlit}\\\$${PSlit}${sgr0}${PSlit} "
+RPS1="${PSlit}${af0}${PSlit}# ${PSlit}${af7}${PSlit}\\w${PSlit}${sgr0}${PSlit}"
diff --git a/home/.config/catsh/env.sh b/home/.config/catsh/env.sh
deleted file mode 100644
index 0c645e64..00000000
--- a/home/.config/catsh/env.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-set -o noclobber -o nounset -o vi
-HISTSIZE=1000
-
-_PATH=$PATH
-PATH=
-for prefix in '' /usr/local /usr/pkg /usr /opt/pkg ~/.local; do
-	PATH=${PATH}${PATH:+:}${prefix}/sbin:${prefix}/bin
-done
-PATH=$PATH:/usr/games
-CDPATH=:~
-
-export PAGER=less
-export LESS=FRX
-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 !!='fc -s'
-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)"'
-if [ "$(uname)" = 'Linux' ]; then
-	alias ls='ls --color=auto' grep='grep --color'
-fi
-
-af0=$(tput setaf 0 || tput AF 0)
-af7=$(tput setaf 7 || tput AF 7)
-sgr0=$(tput sgr0 || tput me)
-
-PSlit=$'\1'
-[ "${TERM%-*}" = 'xterm' ] && PS0=$'\e]0;\\W\a\n' || PS0=$'\n'
-PS1="${PSlit}${af7}${PSlit}\\\$${PSlit}${sgr0}${PSlit} "
-RPS1="${PSlit}${af0}${PSlit}# ${PSlit}${af7}${PSlit}\\w${PSlit}${sgr0}${PSlit}"
-- 
cgit 1.4.1