From 2a0976b40a2b3888f9ba9f2d047f81b98837dc58 Mon Sep 17 00:00:00 2001 From: June McEnroe 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 /td>June McEnroe 2025-04-13Add A Half-Built GardenJune McEnroe Good one. 2025-04-13Also hide lens for trips if it hasn't changedJune McEnroe 2025-04-12Don't list lens in trips if fixedJune McEnroe 2025-04-12Allow setting exposures when loading filmJune McEnroe 2025-04-08Those were supposed to be en-dashes...June McEnroe 2025-04-08Generate pages per rollJune McEnroe 2025-04-08Add metadata from many rolls of filmJune McEnroe 2025-03-25Add emoji for lens, replace all f/'sJune McEnroe 2024-12-29Add photos from December 28June McEnroe 2024-12-29Fancify the manual lens textJune McEnroe 2024-12-28Update film preset list with what I expect to keep shootingJune McEnroe 2024-12-28Add the past few months of rolls of filmJune McEnroe 2024-11-13Add Tea with the Black DragonJune McEnroe I found this in a box on the side of the road being thrown own. It's decent pulp but nothing special. Not even as racist as I expected it to be. Also as one might guess, the author using their initials is a woman, so I only broke one of my rules when it comes to book selection. 2024-11-05Add a bunch of photosJune McEnroe 2024-10-12Publish "film review"June McEnroe 2024-10-12Add photos from October 6June McEnroe 2024-10-12Add photos from October 5June McEnroe 2024-10-09Add photos from October 1June McEnroe Ok the first 3 are from September 29 but I didn't want to spoil the black and white roll. 2024-10-07Add photos from September 29June McEnroe 2024-10-07Add photos from September 28June McEnroe 2024-10-07Add photos from September 22June McEnroe 2024-09-25Add photos from September 15June McEnroe 2024-09-24Add photos from September 14June McEnroe 2024-09-24Add photos from September 12June McEnroe 2024-09-24Add photos from September 7June McEnroe 2024-09-24Allow not having descriptionsJune McEnroe I'm sorry, I can't keep writing descriptions. It makes posting photos take too long, I often don't know the words for what I'm looking at, and a good description is an entirely different work of art than the photo I took, and I'm just a photographer. It's visual art. 2024-09-23Automatically select the last used lens for a bodyJune McEnroe 2024-09-19Add photos from September 5June McEnroe Had to prefix the folder number onto these file names manually because they must have come out of a different scanner or something. 2024-09-15Add some more film stocks to the listJune McEnroe 2024-09-13Add photos from September 2June McEnroe 2024-09-13Add Fomapan 200 to films listJune McEnroe 2024-09-10Add August 29 picnic photosJune McEnroe 2024-09-08Apply some bold to trips renderingJune McEnroe This seems easier to visually scan. The only other thing I'd like is a nicer date rendering but JavaScript is useless for that. 2024-09-08Render trips hopefully more efficientlyJune McEnroe 2024-09-08Allow removing bodies and lensesJune McEnroe 2024-09-08Limit body width so it looks less silly on desktopJune McEnroe 2024-09-07Handle no film being loadedJune McEnroe 2024-09-07Fancy up the text a littleJune McEnroe