diff options
| -rw-r--r-- | .config/git/config | 5 | ||||
| -rw-r--r-- | .config/zsh/utils.zsh | 65 | ||||
| -rw-r--r-- | .config/zsh/zshenv | 6 | ||||
| -rw-r--r-- | .vim/vimrc | 3 | ||||
| -rw-r--r-- | .xinitrc | 7 |
5 files changed, 30 insertions, 56 deletions
diff --git a/.config/git/config b/.config/git/config index 6be8b88..3848058 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,6 +1,6 @@ [user] email = us@starfall.systems - name = Starfall + name = Rabbit Whispers signingkey = 541D770208F350CF2D8050BEBA9A53C969522B56 [init] defaultBranch = main @@ -19,12 +19,11 @@ ; probably also needs to checkout main or develop first clean = !git remote prune origin && git branch | xargs git branch -d force = push --force-with-lease - last = !got --no-pager show --abbrev-commit HEAD + last = !git --no-pager show --abbrev-commit HEAD oops = commit --all --amend --no-edit rebranch = !git checkout main && git pull && git checkout - && git rebase main stashpull = !git stash && git pull && git stash pop stat = status tree = log --all --graph --oneline - unstage = restore --staged [gpg] program = gpg diff --git a/.config/zsh/utils.zsh b/.config/zsh/utils.zsh index 2d292ea..abb9e06 100644 --- a/.config/zsh/utils.zsh +++ b/.config/zsh/utils.zsh @@ -5,56 +5,39 @@ function has () { command -v "$@" &> /dev/null } -# cat -has bat && alias cat='bat --plain --paging=never' -# should consider another alias for --show-all (and --number on base cat) but it's not a good default - -# diff -alias diff='diff --color' - -# grep -grep_opts="--color=auto --exclude-dir=.git" -alias grep="grep $grep_opts" -alias egrep="egrep $grep_opts" -alias fgrep="fgrep $grep_opts" -unset grep_opts +alias dd="dd status=progress oflag=direct,sync" +alias grep="grep -E --color=auto --exclude-dir=.git" # one day i will try ag or rg +alias mkdir='mkdir -p' -# ls -if has eza; then - alias ls='eza' - alias ll='eza --long --header --all' -elif ls --almost-all &> /dev/null; then +if [[ $OSTYPE =~ 'linux' ]]; then + # probably breaks for busybox but i don't run alpine anywhere at the moment + alias df="df -TH --exclude-type=tmpfs --exclude-type=devtmpfs --exclude-type=squashfs --exclude-type=udev" + alias diff='diff --color' alias ls='ls --color=auto' alias ll='ls -l --almost-all --no-group --human-readable --color=auto' -else - # bsd/mac ls +elif [[ $OSTYPE =~ 'darwin' ]]; then + alias df="df -YH -T noautofs,devfs,tmpfs,squashfs" alias ls='ls -G' alias ll='ls -hoAG' +elif [[ $OSTYPE == 'cygwin' ]]; then + alias sudo='cygstart --action=runas' fi -# tree -has tree && alias tree='tree -C' - -# mkdir -alias mkdir='mkdir -p' - -# dd -alias dd="dd status=progress oflag=direct,sync" - -## df -if df --exclude-type=tmpfs &> /dev/null; then - alias df="df -TH --exclude-type=tmpfs --exclude-type=devtmpfs --exclude-type=squashfs --exclude-type=udev" -else - # bsd/mac df - alias df="df -YH -T noautofs,devfs,tmpfs,squashfs" +if has bat; then + alias cat='bat --plain --paging=never' + # another with --show-all? + export MANPAGER="sh -c 'col -bx | bat --plain --language man'" + export MANROFFROPT='-c' fi -# gpg -has gpg2 && alias gpg='gpg2' +if has eza; then + alias ls='eza' + alias ll='eza --long --header --all' +fi -# cygwin-specific -if [[ "$OSTYPE" == 'cygwin' ]]; then - alias sudo='cygstart --action=runas' +if has gpg2; then + alias gpg='gpg2' + export GPG_TTY=$TTY fi -unfunction has +has tree && alias tree='tree -C' diff --git a/.config/zsh/zshenv b/.config/zsh/zshenv index 80ac555..29e10b8 100644 --- a/.config/zsh/zshenv +++ b/.config/zsh/zshenv @@ -1,7 +1,6 @@ export EDITOR='vim' export PAGER='less' export LESS='--RAW-CONTROL-CHARS' -export GPG_TTY=$TTY export PATH=$HOME/.local/bin:$PATH @@ -21,8 +20,3 @@ fi if command -v npm &> /dev/null; then export npm_config_prefix="$HOME/.local" fi - -if command -v bat &> /dev/null; then - export MANPAGER="sh -c 'col -bx | bat --plain --language man'" - export MANROFFOPT="-c" -fi diff --git a/.vim/vimrc b/.vim/vimrc index 869188a..e6cb2da 100644 --- a/.vim/vimrc +++ b/.vim/vimrc @@ -12,7 +12,8 @@ set autoindent set shiftwidth=4 set tabstop=4 -" enable filetype settings +" use editorconfig and filetype defaults +packadd! editorconfig filetype plugin indent on syntax on set smartindent diff --git a/.xinitrc b/.xinitrc index 48bf79b..1f5918b 100644 --- a/.xinitrc +++ b/.xinitrc @@ -29,10 +29,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then unset f fi -# exec desktop session - KDE or XFCE -if command -v startplasma-x11 > /dev/null 2>&1; then - export DESKTOP_SESSION=plasma - exec startplasma-x11 -elif command -v startxfce4 > /dev/null 2>&1; then +# exec desktop session - XFCE +if command -v startxfce4 > /dev/null 2>&1; then exec startxfce4 fi |