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

Merge branch 'macOS'

Browse Source
This commit is contained in:
Eric Torres
2022-12-07 16:07:10 -08:00
parent 43a6b71d41 5661e176ad
commit ba6ceea30f
23 changed files with 6184 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zsh-linux/.config/zsh-linux/.zshenv
View File

@@ -14,7 +14,11 @@ export PASSWORD_STORE_DIR="${XDG_DATA_HOME}/password-store"
export PYLINT_HOME="${XDG_CACHE_HOME}/pylint"
export PYTHON_EGG_CACHE="${XDG_CACHE_HOME}/python-eggs"
export PYTHON_STARTUP="${XDG_CONFIG_HOME}/python/pythonrc"
<<<<<<<< HEAD:zsh-linux/.config/zsh-linux/.zshenv
export UNCRUSTIFY_CONFIG="${XDG_CONFIG_HOME}/uncrustify.conf"
========
export UNCRUSTIFY_CONFIG="${XDG_CONFIG_HOME}/uncrustify/uncrustify.conf"
>>>>>>>> macOS:zsh-macos/.config/zsh-macos/.zshenv
export WINEPREFIX="${XDG_DATA_HOME}/wine"
# nnn

22
zsh-linux/.config/zsh-linux/conf.d/00-aliases.zsh
View File

@@ -1,10 +1,11 @@
# ---------- Normal Aliases ----------
# Common commands
alias cp='cp -piv'
alias mv='mv -iv'
alias cp='gcp -piv'
alias mkdir='gmkdir'
alias mv='gmv -iv'
# Use safe-rm instead of rm
alias rm='safe-rm -iv'
alias rmdir='rmdir -v'
alias rmdir='grmdir -v'
# Games
alias add-modrinth='ferium add-modrinth'
@@ -18,7 +19,7 @@ alias gc='git commit'
alias gca='git commit -a'
alias gco='git checkout'
alias gconf='${EDITOR} -- "${XDG_CONFIG_HOME:-${HOME}/.config}/git/config"'
alias gmv='git mv'
#alias gmv='git mv'
alias grm='git rm'
alias gs='git status'
alias gtv='printf "%s" "$(git describe --long | sed "s/\([^-]*-\)g/r\1/;s/-/./g")"'
@@ -73,10 +74,10 @@ alias pr='makepkg --force --clean --cleanbuild --syncdeps --rmdeps && addpkg rpm
# Personal
alias :q='exit'
alias ct='cptemplate'
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 less='less -i --'
alias la='gls --almost-all --color --group-directories-first --human-readable -l'
alias ls='gls --color --group-directories-first'
alias ll='gls --classify --color --group-directories-first --human-readable -l'
alias python='python3'
alias spcli='speedtest-cli --secure'
alias sshconfig='"${EDITOR}" -- ${HOME}/.ssh/config'
@@ -150,3 +151,8 @@ stow-config () {
fi
done
}
getwifipassword() {
security find-generic-password -ga "$1" | rg "password"
}