commit 9bd7e3e30c65ad0580d103d3815e397c0d0962fe
parent 55ace951d33c469101c3c838e0aab695b11dbf9d
author: nathanael <nathanael@dalliard.ch>
date: Sat, 25 Oct 2025 14:03:01 +0000
s0: only .profile
merge profile.local, shrc and shrc.local into .profile
diffstat:
5 files changed, 58 insertions(+), 64 deletions(-)
diff --git a/s0/dotfiles/profile b/s0/dotfiles/profile
@@ -1,10 +1,65 @@
+set -o vi
+
export PATH=$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin
+export LC_CTYPE=en_US.UTF-8
+
+export SFEED_AUTOCMD=2tgo
+export SFEED_HTMLCONV='webdump -r -l'
+export SFEED_PLUMBER=open
+export SFEED_URL_FILE=~/.sfeed/urls
+export SFEED_YANKER='xsel -bi'
+
export EDITOR=vi
command -v nvi >/dev/null && EDITOR=nvi
-export LC_CTYPE=en_US.UTF-8
+CDPATH=:~
+
+alias b=backup
+alias f=nnn
+alias l=ls
+alias m=minbox
+alias n=news
+alias o=fopen
+alias p=pass
+alias q=exit
+alias v=vi
+
+e() { "$EDITOR" ~/prv/todo; }
+h() { tmux new -DAs s0; }
+s() { cd "$HOME/src/src/$(hostname -s)"; }
+t() { grep '^o' ~/prv/todo; }
+x() { nsxiv -ator "${1:-.}"; }
+
+alias ff='find . -type f -name'
+alias ll='ls -hal'
+alias ls='LC_COLLATE=C ls -F'
+alias openrsync='openrsync --rsync-path=openrsync'
+alias vi=$EDITOR
+
+calc() { echo "$*" | bc -l; }
+mless() { mshow "$@" | less -R; }
+mrm() { mseq "${@:-.}" | xargs rm; }
+
+ma() { minbox ~/mail/Archive "${1:-21}"; }
+mi() { minbox ~/mail/Inbox "${1:-21}"; }
+mj() { minbox ~/mail/Junk "${1:-21}"; }
+ms() { minbox ~/mail/Sent "${1:-21}"; }
+
+alias '?'=duck
+alias '??'=yout
+alias '???'=pbay
+
+duck() { w3m "https://lite.duckduckgo.com/lite?kd=-1&kp=-2&q=${*}"; }
+pbay() { w3m "https://thepiratebay10.org/search/$*"; }
+yout() { w3m "http://localhost/idiotbox?o=relevance&q=$*"; }
+
+alias s1='ssh s1'
+alias s2='ssh s2'
+alias s8='ssh s8'
+alias t1='ssh t1'
+alias w1='ssh w1'
-test -f ~/.profile.local && . ~/.profile.local
+alias a="$EDITOR \$HOME/.profile && . \$HOME/.profile"
-export ENV=~/.shrc
+PS1='\W '
diff --git a/s0/dotfiles/profile.local b/s0/dotfiles/profile.local
@@ -1,5 +0,0 @@
-export SFEED_AUTOCMD=2tgo
-export SFEED_HTMLCONV='webdump -r -l'
-export SFEED_PLUMBER=open
-export SFEED_URL_FILE=~/.sfeed/urls
-export SFEED_YANKER='xsel -bi'
diff --git a/s0/dotfiles/shrc b/s0/dotfiles/shrc
@@ -1,17 +0,0 @@
-set -o vi
-
-CDPATH=:~
-
-alias l=ls
-alias q=exit
-alias v=vi
-
-alias ff='find . -type f -name'
-alias ll='ls -hal'
-alias ls='LC_COLLATE=C ls -F'
-alias openrsync='openrsync --rsync-path=openrsync'
-alias vi=$EDITOR
-
-s() { cd "$HOME/src/src/$(hostname -s)"; }
-
-test -f ~/.shrc.local && . ~/.shrc.local
diff --git a/s0/dotfiles/shrc.local b/s0/dotfiles/shrc.local
@@ -1,36 +0,0 @@
-alias b=backup
-alias f=nnn
-alias m=minbox
-alias n=news
-alias o=fopen
-alias p=pass
-
-e() { "$EDITOR" ~/prv/todo; }
-h() { tmux new -DAs s0; }
-t() { grep '^o' ~/prv/todo; }
-x() { nsxiv -ator "${1:-.}"; }
-
-calc() { echo "$*" | bc -l; }
-mless() { mshow "$@" | less -R; }
-mrm() { mseq "${@:-.}" | xargs rm; }
-
-ma() { minbox ~/mail/Archive "${1:-21}"; }
-mi() { minbox ~/mail/Inbox "${1:-21}"; }
-mj() { minbox ~/mail/Junk "${1:-21}"; }
-ms() { minbox ~/mail/Sent "${1:-21}"; }
-
-alias '?'=duck
-alias '??'=yout
-alias '???'=pbay
-
-duck() { w3m "https://lite.duckduckgo.com/lite?kd=-1&kp=-2&q=${*}"; }
-pbay() { w3m "https://thepiratebay10.org/search/$*"; }
-yout() { w3m "http://localhost/idiotbox?o=relevance&q=$*"; }
-
-alias s1='ssh s1'
-alias s2='ssh s2'
-alias s8='ssh s8'
-alias t1='ssh t1'
-alias w1='ssh w1'
-
-PS1='\W '
diff --git a/s0/scripts/dotfiles.sh b/s0/scripts/dotfiles.sh
@@ -28,9 +28,6 @@ ln -fs "$src/mfilter" "$HOME/.mblaze/filter"
ln -fs "$src/mpv/config" "$HOME/.config/mpv/config"
ln -fs "$src/mpv/input.conf" "$HOME/.config/mpv/input.conf"
ln -fs "$src/profile" "$HOME/.profile"
-ln -fs "$src/profile.local" "$HOME/.profile.local"
-ln -fs "$src/shrc" "$HOME/.shrc"
-ln -fs "$src/shrc.local" "$HOME/.shrc.local"
ln -fs "$src/tmux.conf" "$HOME/.tmux.conf"
ln -fs "$src/user-dirs.dirs" "$HOME/.config/user-dirs.dirs"
ln -fs "$src/w3m/config" "$HOME/.w3m/config"
