etorres/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mixed aliases between OS-specific config files

Browse Source
This commit is contained in:
Eric Torres 2022-12-08 16:50:43 -08:00
parent 2d939ac9c1
commit 375d0f19a8
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zsh-linux/.config/zsh-linux/00-aliases.zsh
View File

@ -53,6 +53,11 @@ alias pr='makepkg --force --clean --cleanbuild --syncdeps --rmdeps && addpkg rpm
#alias pytest='pytest --numprocesses=$(nproc)' #alias pytest='pytest --numprocesses=$(nproc)'
alias pyarchive='git archive -o rbackup-"$(python setup.py --version)".tar.gz --prefix=rbackup-"$(python setup.py --version)"/' alias pyarchive='git archive -o rbackup-"$(python setup.py --version)".tar.gz --prefix=rbackup-"$(python setup.py --version)"/'
# Personal
alias la='ls --almost-all --color --group-directories-first --human-readable -l'
alias ls='ls --color --group-directories-first'
alias ll='ls --classify --color --group-directories-first --human-readable -l'
# system # system
alias bootloader='cd /boot/loader/entries' alias bootloader='cd /boot/loader/entries'
alias restartfans='sudo systemctl restart fancontrol.service' alias restartfans='sudo systemctl restart fancontrol.service'

18
zsh-macos/.config/zsh-macos/00-aliases.zsh
View File

@ -23,18 +23,10 @@ alias gtv='printf "%s" "$(git describe --long | sed "s/\([^-]*-\)g/r\1/;s/-/./g"
alias gnv='printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"' alias gnv='printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"'
alias gr='git reset' alias gr='git reset'
#========= Package Management ========= # Personal
# Navigation alias la='gls --almost-all --color --group-directories-first --human-readable -l'
alias dirconf='"${EDITOR}" -- "${XDG_CONFIG_HOME:-${HOME}/.config}/user-dirs.dirs"' alias ls='gls --color --group-directories-first'
alias dotfiles='cd "${HOME}/Dotfiles"' alias ll='gls --classify --color --group-directories-first --human-readable -l'
alias xch='cd -- ${XDG_CONFIG_HOME:-${HOME}/.config}'
alias xcah='cd -- ${XDG_CACHE_HOME:-${HOME}/.cache}'
alias xdh='cd -- ${XDG_DATA_HOME:-${HOME}/.local/share}'
# Programming
# Use python-pytest-xdist plugin
#alias pytest='pytest --numprocesses=$(nproc)'
alias pyarchive='git archive -o rbackup-"$(python setup.py --version)".tar.gz --prefix=rbackup-"$(python setup.py --version)"/'
# system # system
alias myip='curl ifconfig.me' alias myip='curl ifconfig.me'
@ -51,7 +43,7 @@ alias zshrc='${EDITOR} -- "$ZDOTDIR"/.zshrc'
alias zshenv='${EDITOR} -- "$ZDOTDIR"/.zshenv' alias zshenv='${EDITOR} -- "$ZDOTDIR"/.zshenv'
# ---------- Parameterized Aliases ---------- # ---------- Parameterized Aliases ----------
# Use macOS-specific flags # Use macOS-specific command line flags
stow-config () { stow-config () {
local dotfile_dir="${HOME}/Dotfiles" local dotfile_dir="${HOME}/Dotfiles"

3
zsh/.config/zsh/00-common-aliases.zsh
View File

@ -25,9 +25,6 @@ alias vmore='nvim -u "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/pager.vim" -'
alias :q='exit' alias :q='exit'
alias ct='cptemplate' alias ct='cptemplate'
alias less='less -i --' alias less='less -i --'
alias la='ls --almost-all --color --group-directories-first --human-readable -l'
alias ls='ls --color --group-directories-first'
alias ll='ls --classify --color --group-directories-first --human-readable -l'
alias python='python3' alias python='python3'
alias spcli='speedtest-cli --secure' alias spcli='speedtest-cli --secure'
alias tmux='tmux -f "${XDG_CONFIG_HOME:-${HOME}/.config}"/tmux/tmux.conf' alias tmux='tmux -f "${XDG_CONFIG_HOME:-${HOME}/.config}"/tmux/tmux.conf'