Revert "Merge branch 'macOS'"
This reverts commit ba6ceea30f63ee36474eda6f993adf423d3c4786, reversing changes made to 43a6b71d41f9d17f7c2a9728835cd9cd09116e95.
This commit is contained in:
Eric Torres
parent
ba6ceea30f
commit
7cac723651
1
.gitignore
vendored
1
.gitignore
vendored
@ -29,6 +29,5 @@ protonmail/.config/protonmail/bridge/cache
|
||||
protonmail/.config/protonmail/bridge/*.pem
|
||||
|
||||
# zsh
|
||||
zsh/.config/zsh/.zcompcache
|
||||
zsh/.config/zsh/.zcompdump
|
||||
zsh/.config/zsh/.zsh_history
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -14,11 +14,7 @@ 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
|
||||
|
||||
@ -1,11 +1,10 @@
|
||||
# ---------- Normal Aliases ----------
|
||||
# Common commands
|
||||
alias cp='gcp -piv'
|
||||
alias mkdir='gmkdir'
|
||||
alias mv='gmv -iv'
|
||||
alias cp='cp -piv'
|
||||
alias mv='mv -iv'
|
||||
# Use safe-rm instead of rm
|
||||
alias rm='safe-rm -iv'
|
||||
alias rmdir='grmdir -v'
|
||||
alias rmdir='rmdir -v'
|
||||
|
||||
# Games
|
||||
alias add-modrinth='ferium add-modrinth'
|
||||
@ -19,7 +18,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")"'
|
||||
@ -74,10 +73,10 @@ alias pr='makepkg --force --clean --cleanbuild --syncdeps --rmdeps && addpkg rpm
|
||||
# Personal
|
||||
alias :q='exit'
|
||||
alias ct='cptemplate'
|
||||
#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 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 spcli='speedtest-cli --secure'
|
||||
alias sshconfig='"${EDITOR}" -- ${HOME}/.ssh/config'
|
||||
@ -151,8 +150,3 @@ stow-config () {
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
getwifipassword() {
|
||||
security find-generic-password -ga "$1" | rg "password"
|
||||
}
|
||||
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
list=( ${(Q)"${(z)$(<<\EO:list
|
||||
'aspell-dictionaries' 'determine-rebottle-runners' 'postgresql-upgrade-database' 'services'
|
||||
EO:list
|
||||
)}"} )
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
@ -1 +0,0 @@
|
||||
emulate sh -c 'source /etc/profile'
|
||||
@ -1,465 +0,0 @@
|
||||
mv nvim .nvim
|
||||
stow nvim
|
||||
cd .config/nvim
|
||||
rm nvim
|
||||
rm -rf *
|
||||
stow nvim neomutt zsh
|
||||
pacman -Ss nvimpager
|
||||
cat /etc/envir
|
||||
cat /etc/environment
|
||||
cd .config/zsh
|
||||
gco -b macos
|
||||
man git
|
||||
\man git
|
||||
git branch -m m
|
||||
git branch -m macOS
|
||||
rg -H nvimpager
|
||||
nvim -h nvimpager
|
||||
brew unlink coreutils && brew link coreutils
|
||||
gman gls
|
||||
man gls
|
||||
bash
|
||||
man man
|
||||
echo $-
|
||||
nvimpage
|
||||
\ ls -l
|
||||
\ls -l
|
||||
rg nvimpager
|
||||
which rg
|
||||
rg -h
|
||||
rg -i nvim
|
||||
rg man
|
||||
\man ls
|
||||
pacman -Ss coreutils
|
||||
brew link coreutils
|
||||
which rm
|
||||
pacman -Ss safe-rm
|
||||
pacman -S safe-rm
|
||||
pacman -Ql fzf
|
||||
pacman -Ql coreutils
|
||||
pacman -Ql coreutils | sort
|
||||
less -h
|
||||
less --help
|
||||
which less
|
||||
less -i
|
||||
which gless
|
||||
gless
|
||||
pacman -Ql coreutils | sort | less
|
||||
pacman -Ql coreutils | sort | rg less
|
||||
git status
|
||||
which ls
|
||||
cd Programming/cs311/In\ Class\ Exercises
|
||||
git branch lst
|
||||
git branch list
|
||||
git branch -d list
|
||||
git branch -d lst
|
||||
git branch -l
|
||||
rg mkcd
|
||||
rg -H mkcd
|
||||
man zshaliases
|
||||
which date
|
||||
which gdate
|
||||
rm ssh-login.zsh
|
||||
gco master
|
||||
rg --hidden mkcd
|
||||
rg --hidden mkcd()
|
||||
rg --hidden 'mkcd()'
|
||||
sudo chown etorres:staff .cache
|
||||
sudo chown -R etorres:staff .cache
|
||||
rg --hidden -i 'mkcd()'
|
||||
rg -i mkcd
|
||||
rg -i mkcd **/*
|
||||
\man rg
|
||||
PAGER=""
|
||||
rg -i 'mkcd()' **/*
|
||||
cd Pack
|
||||
which gmkdir
|
||||
cd /etc/zsh
|
||||
cd /etc
|
||||
fd zsh
|
||||
< zshrc
|
||||
rg mkcd zshrc
|
||||
rg mkcd zsh*
|
||||
which mkcd
|
||||
rg '||'
|
||||
rg '||' **/*
|
||||
PAGER=''
|
||||
man rg
|
||||
rg --follow mkcd
|
||||
rg --follow --hidden mkcd **/*
|
||||
mkcd
|
||||
mkcd hi
|
||||
rmdir hi
|
||||
mkcd Packages
|
||||
git clone https://github.com/lucc/nvimpager.git
|
||||
cd nvimpager
|
||||
pacman -Ss scdoc
|
||||
pacman -Ss busted
|
||||
pacman -S scdoc
|
||||
make PREFIX=$HOME/.local install
|
||||
nvimpager
|
||||
datadir
|
||||
cd .local/bin
|
||||
echo $path
|
||||
zpath
|
||||
which nvimpager
|
||||
man ls
|
||||
zshrc
|
||||
ssh empress
|
||||
cd Programming
|
||||
cd cs311
|
||||
cd Public
|
||||
cd Drop\ Box
|
||||
cd .ssh
|
||||
cd Dco
|
||||
scp -R Programming xenon:/home/etorres
|
||||
scp -R Programming xenon:/home/etorres/Programming
|
||||
scp --help
|
||||
which scp
|
||||
scp -h
|
||||
man scp
|
||||
scp -r Programming xenon:/home/etorres/Programming
|
||||
pacman -Ss topgrade
|
||||
pacman -S topgrade
|
||||
cd Programming/cs311/assignment1
|
||||
rm EricTorresA1.cpp
|
||||
> EricTorresA1.cpp
|
||||
>! EricTorresA1.cpp
|
||||
< EricTorresA1.cpp
|
||||
g++ EricTorresA1.cpp
|
||||
nvim EricTorresA1.cpp
|
||||
mkcd assignment2
|
||||
nvim EricTorresA2.cpp
|
||||
../cs211
|
||||
rg template
|
||||
whoami
|
||||
security find-generic-password -ga eeromeshmc | rg 'password:'
|
||||
cd assignment2
|
||||
git checkout macOS
|
||||
gc -a -m 'Adapt zsh config for macOS'
|
||||
git push --set-upstream origin macOS
|
||||
ga zsh
|
||||
gc -m 'Fix unmatched quote'
|
||||
git tag
|
||||
git tag --list
|
||||
scp -r Programming xenon:/home/etorres/
|
||||
scp -r assignment2 xenon:/home/etorres/Programming/cs311
|
||||
fd factors
|
||||
calcf
|
||||
./calcfactors.py
|
||||
./calcfactors.py -h
|
||||
nvim calcfactors.py
|
||||
./calcfactors.py 61
|
||||
./calcfactors.py 63
|
||||
cd .config/zsh/conf.d
|
||||
git pull
|
||||
cd dist
|
||||
rm -rf dist
|
||||
rm -rf .pytest_cache
|
||||
nvim file-scripts.rb
|
||||
brew install ./file-scripts.rb
|
||||
fedit -h
|
||||
time fedit
|
||||
quickdel
|
||||
ssh xenon
|
||||
ping 192.168.1.3
|
||||
systemctl status
|
||||
ssh xenon-remote
|
||||
tmux
|
||||
pacman -Ss logitech
|
||||
pacman -S logitech-gaming-software
|
||||
myip
|
||||
cd ttf-kriswriting
|
||||
mkcd superscan
|
||||
rmdir superscan
|
||||
cd /Users
|
||||
pacman -Ss kate
|
||||
cd Documents/xenon/Scripts
|
||||
quickdel xenon
|
||||
quickdel -h
|
||||
quickdel x
|
||||
cd Projects/file-scripts
|
||||
/bin/bash --version
|
||||
which bash
|
||||
env bash --version
|
||||
pacman -Ss bash
|
||||
cd Projects
|
||||
git pull https://github.com/etorres4/aurpy.git
|
||||
git pull github.com/etorres4/aurpy.git
|
||||
git pull git@github.com:etorres4/aurpy.git
|
||||
git clone https://github.com/etorres4/aurpy.git
|
||||
cd aurpy
|
||||
pacman -Qi mac-mouse-fix
|
||||
pacman -Ss mouse fix
|
||||
pacman -Qi mouse-fix
|
||||
fd mouse
|
||||
fd logitech
|
||||
pacman -Ql
|
||||
pacman -R mouse-fix
|
||||
pacman -S mouse-fix
|
||||
brew outdated
|
||||
xcode-select --install
|
||||
sudo xcode-select --install
|
||||
cd /usr/lib
|
||||
fd tclConfig
|
||||
xcode-select --version
|
||||
pacman -Syu
|
||||
which python
|
||||
python --version
|
||||
python2
|
||||
cd /usr/local/bin
|
||||
fd python
|
||||
python3
|
||||
pacman -Qi python@3.11
|
||||
brew link python@3.11
|
||||
brew unlink python@3.11 && brew link python@3.11
|
||||
python
|
||||
python3.11
|
||||
cd Scripts/macOS\ Helpers
|
||||
sudo ./post_macos_update.sh
|
||||
which pacsearch
|
||||
pacsearch draw
|
||||
pacman -S drawio
|
||||
ping studentaid.gov
|
||||
getwifipassword
|
||||
echo 'lP+0dw8J/AUuOcFQS41HLA==' | base32
|
||||
echo 'lP+0dw8J/AUuOcFQS41HLA==' | base64
|
||||
zconf
|
||||
fzf --version
|
||||
nvim fzf.zsh
|
||||
cd .gem/ruby/2.6.0/extensions/universal-darwin-22/2.6.0/openssl-3.0.1
|
||||
nvim mkmf.log
|
||||
touch fd_ignore
|
||||
cf assignemnt4
|
||||
fd
|
||||
fd -h
|
||||
fd clang
|
||||
fd -H clang
|
||||
pacsearch uncrustify
|
||||
pacman -S uncrustify
|
||||
man uncrustify
|
||||
rgenv uncrustify
|
||||
> uncrustify.conf
|
||||
uncrustify -h
|
||||
uncrustify -c ~/.config/uncrustify.conf -f TorresEricA4.cpp
|
||||
rm uncrustify.conf
|
||||
touch uncrustify.conf
|
||||
sudo gdb -tui a.out
|
||||
gdb
|
||||
gdb a.out
|
||||
cd Scripts
|
||||
cd macOS\ Helpers
|
||||
chmod 700 codesign-gdb.sh
|
||||
./codesign-gdb.sh
|
||||
man 8 taskgated
|
||||
nvim codesign-gdb.sh
|
||||
mkcd uncrustify
|
||||
mkcd.cnofig
|
||||
mkcd .config
|
||||
stow uncrustify
|
||||
cd uncrustify/.config
|
||||
mv ~/.config/uncrustify.conf .
|
||||
which mv
|
||||
which safe-rm
|
||||
gdb -tui a.out
|
||||
g++ -g TorresEricA4.cpp
|
||||
./a.out
|
||||
which gmv
|
||||
cd uncrustify
|
||||
stow-config
|
||||
which stow-config
|
||||
rm -rf uncrustify
|
||||
zshaliases
|
||||
cd Programming/cs311
|
||||
rm -rf assignment*
|
||||
mkcd assignment4
|
||||
nvim TorresEricA4.cpp
|
||||
nvimplug
|
||||
uncrustify
|
||||
zshenv config
|
||||
rgenv config
|
||||
rgenv unc
|
||||
which mkdir
|
||||
gmkdir -h
|
||||
gmkdir --help
|
||||
zshenv
|
||||
mkdir uncrustify
|
||||
mv uncrustify.conf uncrustify
|
||||
cd -
|
||||
stow-config uncrustify
|
||||
ll uncrustify
|
||||
gd
|
||||
..
|
||||
uncrustify --version
|
||||
uncrustify -f TorresEricA4.cpp
|
||||
g++ TorresEricA4.cpp
|
||||
ga uncrustify
|
||||
git revert uncrustify
|
||||
git reset uncrustify
|
||||
dotfiles
|
||||
ls -l
|
||||
git mv zsh zsh-macos
|
||||
la
|
||||
.s
|
||||
stow zsh-macos
|
||||
stow -h
|
||||
stow --verbose zsh-macos
|
||||
stow .. zsh-macos
|
||||
stow zsh-macos ~
|
||||
xch
|
||||
cd Templates
|
||||
cd etc
|
||||
nvim zshenv
|
||||
nvim zsh/zshenv
|
||||
sudo -e /private/etc/zshenv
|
||||
rm zsh-macos
|
||||
stow -v zsh-macos
|
||||
cd zsh-macos
|
||||
tree zsh
|
||||
tree zsh-macos
|
||||
mv zsh/.* zsh-macos
|
||||
cd zsh
|
||||
mv conf.d ../zsh-macos
|
||||
ls -la
|
||||
rmdir zsh
|
||||
cd ..
|
||||
cd .cnfog
|
||||
cd .config
|
||||
ls -l
|
||||
rm zsh
|
||||
cd Dotfiles
|
||||
grm zsh
|
||||
grm -r zsh
|
||||
ga zsh-macos
|
||||
gc -m 'Rename zsh folder to zsh-macos to avoid naming collision with master'
|
||||
git push
|
||||
gs
|
||||
exi
|
||||
which clang++
|
||||
lldb -h
|
||||
which tty
|
||||
cf assignment4
|
||||
cd
|
||||
tty
|
||||
tty --help
|
||||
tty -s
|
||||
tty -h
|
||||
env
|
||||
sha256sum mt86plus64.iso
|
||||
sha256sum mt86plus_6.00_64.iso.zip
|
||||
md5sum mt86plus_6.00_64.iso.zip
|
||||
cd Downloads
|
||||
ll
|
||||
sha256sum archlinux-2022.12.01-x86_64.iso
|
||||
topgrade
|
||||
nvim
|
||||
cat hosts.txt
|
||||
ls
|
||||
nvim hosts.txt
|
||||
ssh-keygen -t ed25519
|
||||
ssh-copy-id etorres@krypton
|
||||
ssh-copy-id etorres@krypton .ssh/krypton
|
||||
ssh-copy-id -i .ssh/krypton -p 2654 etorres@krypton
|
||||
man nmcli
|
||||
ssh krypton
|
||||
nvim serversetup.txt
|
||||
sshconf
|
||||
sshconfig
|
||||
exit
|
||||
uname -r
|
||||
uname
|
||||
which uname
|
||||
cd Dotfiles
|
||||
ls -l
|
||||
gco macOS
|
||||
git checkout macOS
|
||||
git push
|
||||
git status
|
||||
zsh
|
||||
cd zsh-linux
|
||||
ls -l
|
||||
ls -l
|
||||
pwd
|
||||
cd conf.d
|
||||
ls -l
|
||||
ls -la
|
||||
cd .config/zsh-linux
|
||||
ls -l
|
||||
ls -l
|
||||
cd conf.d
|
||||
ls -l
|
||||
uname
|
||||
uname -h
|
||||
uname --help
|
||||
man uname
|
||||
pwd
|
||||
..
|
||||
..
|
||||
cd ..
|
||||
cd ...
|
||||
cd ..
|
||||
cd ..
|
||||
ls -l
|
||||
cd ..
|
||||
cd zsh
|
||||
cd .config/zsh
|
||||
ls -la
|
||||
git branch
|
||||
git mv .zprofile .zshenv ~/Dotfiles/zsh-linux/.config/zsh
|
||||
git mv .zprofile .zshenv ~/Dotfiles/zsh-linux/.config/zsh-linux
|
||||
git rm .zprofile .zshenv
|
||||
git rm -f .zprofile .zshenv
|
||||
pwd
|
||||
cd ../../..
|
||||
ls -l
|
||||
cd zsh-linux
|
||||
ls -l
|
||||
cd .config/
|
||||
ls -l
|
||||
cd zsh-linux
|
||||
ls -l
|
||||
ls -l
|
||||
ls -la
|
||||
nvim .zshenv
|
||||
ls
|
||||
lcd
|
||||
cd
|
||||
cd Dotfiles/zsh-macos
|
||||
ls -l
|
||||
pwd
|
||||
cd .config
|
||||
ls
|
||||
cd zsh-macos
|
||||
ls
|
||||
la
|
||||
ls -la
|
||||
nvim .zshrc
|
||||
rm .zshrc
|
||||
cd conf.d
|
||||
ls
|
||||
ls -l
|
||||
rm completion.zsh kp.zsh prompt.zsh sudo.zsh tmux.zsh
|
||||
ls -l
|
||||
ls -l
|
||||
nvim 00-aliases.zsh
|
||||
ls
|
||||
ls -l
|
||||
nvim options
|
||||
cat options
|
||||
pwd
|
||||
cat options
|
||||
pwd
|
||||
cd
|
||||
cd Dotfiles/zsh-macos/.config/zsh-macos/conf.d
|
||||
rm options
|
||||
ls -l
|
||||
pwd
|
||||
rm completion.zsh kp prompt.zsh sudo.zsh
|
||||
rm kp.zsh
|
||||
ls -l
|
||||
rm tmux.zsh
|
||||
ls -l
|
||||
rm 00-keybindings.zsh
|
||||
cd
|
||||
pwd
|
||||
exit
|
||||
@ -1,38 +0,0 @@
|
||||
# Local Environment Variables
|
||||
#export SSH_ASKPASS='/usr/bin/ksshaskpass ssh-add < /dev/null'
|
||||
|
||||
#export FZF_DEFAULT_COMMAND="fd --threads $(nproc) --type f --hidden --color=never"
|
||||
|
||||
# XDG Base Directory Support
|
||||
export CARGO_HOME="${XDG_DATA_HOME}/cargo"
|
||||
export GNUPGHOME="${XDG_DATA_HOME}/gnupg"
|
||||
export GTK2_RC_FILES="${XDG_CONFIG_HOME}/gtk-2.0/gtkrc"
|
||||
export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=${XDG_CONFIG_HOME}/.config}/java"
|
||||
export KDEHOME="${XDG_CONFIG_HOME}/kde"
|
||||
export LESSHISTFILE="${XDG_CACHE_HOME}/less/history"
|
||||
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
|
||||
#export NNN_OPTS_PROG=1
|
||||
#export NNN_TRASH=1
|
||||
#export NNN_USE_EDITOR=1
|
||||
|
||||
#export HOMEBREW_NO_AUTO_UPDATE=1
|
||||
|
||||
#export LD_LIBRARY_PATH="/Library/Developer/CommandLineTools/usr/lib/:$LD_LIBRARY_PATH"
|
||||
|
||||
export PAGER="nvimpager"
|
||||
export AUR_PAGER="ranger"
|
||||
|
||||
# Manpager using vim/nvim
|
||||
#export MANPAGER='nvim +Man!'
|
||||
#export MANWIDTH=999
|
||||
@ -1,158 +0,0 @@
|
||||
# ---------- Normal Aliases ----------
|
||||
# Common commands
|
||||
alias cp='gcp -piv'
|
||||
alias mkdir='gmkdir'
|
||||
alias mv='gmv -iv'
|
||||
# Use safe-rm instead of rm
|
||||
alias rm='safe-rm -iv'
|
||||
alias rmdir='grmdir -v'
|
||||
|
||||
# Games
|
||||
alias add-modrinth='ferium add-modrinth'
|
||||
|
||||
# Git
|
||||
alias gar='git archive'
|
||||
alias gb='git branch'
|
||||
alias gd='git diff'
|
||||
alias ga='git add'
|
||||
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 grm='git rm'
|
||||
alias gs='git status'
|
||||
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 gr='git reset'
|
||||
|
||||
# GPG
|
||||
alias gdk='gpg --delete-keys'
|
||||
alias gdsk='gpg --delete-secret-keys'
|
||||
alias gik='gpg --import '
|
||||
alias gk='gpg --list-keys'
|
||||
alias grk='gpg --receive-keys'
|
||||
alias gsk='gpg --list-secret-keys'
|
||||
|
||||
# Neomutt
|
||||
alias neomuttconf='cd -- ${XDG_CONFIG_HOME:-${HOME}/.config}/neomutt'
|
||||
alias neomuttrc='${EDITOR} ${XDG_CONFIG_HOME:-${HOME}/.config}/neomutt/neomuttrc'
|
||||
|
||||
# Neovim
|
||||
alias nvimcomm='${EDITOR} ${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/commands'
|
||||
alias nvimconf='cd "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim"'
|
||||
alias nvimft='cd "${XDG_DATA_HOME:-${HOME}/.local/share}/nvim/site/ftplugin"'
|
||||
alias nvimplug='${EDITOR} -- "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/plugins.vim"'
|
||||
alias nvimkey='${EDITOR} -- "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/keybindings.vim"'
|
||||
alias nvimrc='${EDITOR} -- "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/init.vim"'
|
||||
alias swapdir='cd -- "${XDG_DATA_HOME:-${HOME}/.local/share}/nvim/swap"'
|
||||
alias vmore='nvim -u "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/pager.vim" -'
|
||||
|
||||
#========= Package Management =========
|
||||
# Arch Linux
|
||||
alias aurget='aur sync -d aur'
|
||||
alias -g autoremove='pacman -Rns $(pacman -Qtdq)'
|
||||
alias checkaurupdates='aur sync -d aur --upgrades'
|
||||
# alias does not work correctly for some reason
|
||||
alias lspkg="pacman -Qi | awk '/^Name/{name=$3} /^Installed Size/{print $4$5, name}' | sort -h"
|
||||
alias ql='pacman -Qql'
|
||||
alias pacsearch='pacman -Ss'
|
||||
alias rpmget='aur sync -d rpm'
|
||||
alias -g updatemirrors="reflector --verbose --country 'United States' --latest 20 --age 24 --sort rate --save /etc/pacman.d/mirrorlist"
|
||||
|
||||
# ========== Packaging ==========
|
||||
# Arch Linux
|
||||
alias aurcache='cd ${XDG_CACHE_HOME}/aurutils/sync'
|
||||
alias aurdir='cd /var/cache/pacman/aur'
|
||||
alias customdir='cd /var/cache/pacman/custom'
|
||||
alias gpkginit='cp /usr/share/pacman/PKGBUILD-vcs.proto ./PKGBUILD'
|
||||
alias pkginit='cp /usr/share/pacman/PKGBUILD.proto ./PKGBUILD'
|
||||
alias pa='makepkg --force --clean --cleanbuild --syncdeps --rmdeps && addpkg aur'
|
||||
alias pc='makepkg --force --clean --cleanbuild --syncdeps --rmdeps && addpkg custom'
|
||||
alias pr='makepkg --force --clean --cleanbuild --syncdeps --rmdeps && addpkg rpm'
|
||||
|
||||
# Personal
|
||||
alias :q='exit'
|
||||
alias ct='cptemplate'
|
||||
#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'
|
||||
alias tmux='tmux -f "${XDG_CONFIG_HOME:-${HOME}/.config}"/tmux/tmux.conf'
|
||||
alias tmuxrc='nvim -- "${XDG_CONFIG_HOME:-${HOME}/.config}"/tmux/tmux.conf'
|
||||
alias tuir='tuir --no-flash'
|
||||
alias wget='wget --hsts-file="${XDG_DATA_HOME}/wget-hsts"'
|
||||
|
||||
# Navigation
|
||||
alias dirconf='"${EDITOR}" -- "${XDG_CONFIG_HOME:-${HOME}/.config}/user-dirs.dirs"'
|
||||
alias dotfiles='cd "${HOME}/Dotfiles"'
|
||||
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)"/'
|
||||
|
||||
# ssh
|
||||
alias scpe='scp -i "${HOME}/.ssh/empress"'
|
||||
|
||||
# system
|
||||
alias bootloader='cd /boot/loader/entries'
|
||||
alias myip='curl ifconfig.me'
|
||||
alias restartfans='sudo systemctl restart fancontrol.service'
|
||||
|
||||
# zsh
|
||||
alias zdotdir='cd -- ${ZDOTDIR:-${HOME}/.zsh}'
|
||||
alias zshaliases='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d/00-aliases.zsh'
|
||||
alias zbindings='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d/keybindings.zsh'
|
||||
alias zconf='cd -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d'
|
||||
alias zfuncs='cd -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d/functions'
|
||||
alias zhist='${EDITOR} -- ${HISTFILE}'
|
||||
alias zmod='cd -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d/modules'
|
||||
alias zpath='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d/path.zsh'
|
||||
alias zprompt='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d/prompt.zsh'
|
||||
alias zshrc='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/.zshrc'
|
||||
alias zshrefresh='source -- ${ZDOTDIR:-${HOME}/.zsh}/.zshrc'
|
||||
alias zshenv='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/.zshenv'
|
||||
|
||||
# ---------- Parameterized Aliases ----------
|
||||
lsbin() {
|
||||
if [[ -n $1 ]]; then
|
||||
pacman -Qql $1 | rg bin
|
||||
else
|
||||
return 0
|
||||
fi
|
||||
}
|
||||
|
||||
rgenv () {
|
||||
if [[ -n $1 ]]; then
|
||||
env | rg --ignore-case $1
|
||||
else
|
||||
return 0
|
||||
fi
|
||||
}
|
||||
|
||||
stow-config () {
|
||||
local dotfile_dir="${HOME}/Dotfiles"
|
||||
|
||||
for conf in "${@}"; do
|
||||
if [[ -n ${conf} ]]; then
|
||||
mkdir --parents "${dotfile_dir}/${conf}/.config"
|
||||
mv "${XDG_CONFIG_HOME}/${conf}" "${dotfile_dir}/${conf}/.config"
|
||||
cd "${dotfile_dir}" && stow "${conf}"
|
||||
cd -
|
||||
else
|
||||
continue
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
getwifipassword() {
|
||||
security find-generic-password -ga "$1" | rg "password"
|
||||
}
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
# Setup fzf
|
||||
# ---------
|
||||
|
||||
# Auto-completion
|
||||
# ---------------
|
||||
[[ $- == *i* ]] && source "/usr/local/Cellar/fzf/0.35.1/shell/completion.zsh"
|
||||
|
||||
# Key bindings
|
||||
# ------------
|
||||
source "/usr/local/Cellar/fzf/0.35.1/shell/key-bindings.zsh"
|
||||
@ -1,4 +0,0 @@
|
||||
# PATH variable configuration
|
||||
path=("${HOME}/Scripts/macOS Helpers" "${HOME}/.local/bin" $path)
|
||||
|
||||
export PATH
|
||||
@ -55,7 +55,7 @@ autoload -Uz cf
|
||||
# Make a directory, then change into it
|
||||
|
||||
mkcd() {
|
||||
[[ ! -d "${1}" ]] && gmkdir --parents -- "${1}"
|
||||
[[ ! -d "${1}" ]] && mkdir --parents -- "${1}"
|
||||
cd "${1}" || exit
|
||||
}
|
||||
|
||||
4
zsh/.config/zsh/conf.d/00-keybindings.zsh
Normal file
4
zsh/.config/zsh/conf.d/00-keybindings.zsh
Normal file
@ -0,0 +1,4 @@
|
||||
# bindkey -M viins '^r' history-incremental-search-backward
|
||||
# bindkey -M vicmd '^r' history-incremental-search-backward
|
||||
|
||||
# vim: syntax=zsh
|
||||
27
zsh/.config/zsh/conf.d/completion.zsh
Normal file
27
zsh/.config/zsh/conf.d/completion.zsh
Normal file
@ -0,0 +1,27 @@
|
||||
## zsh-completion-generator
|
||||
#GENCOMPL_FPATH="${HOME}/zsh-completions"
|
||||
#source '/usr/share/zsh-completion-generator/zsh-completion-generator.plugin.zsh'
|
||||
|
||||
autoload -Uz compinit
|
||||
compinit
|
||||
|
||||
# Tab completion menu
|
||||
zstyle ':completion:*' menu select
|
||||
zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
|
||||
|
||||
zstyle ':completion:*:*:kill:*' menu yes select
|
||||
zstyle ':completion:*:kill:*' force-list always
|
||||
|
||||
zstyle ':completion:*:*:killall:*' menu yes select
|
||||
zstyle ':completion:*:killall:*' force-list always
|
||||
|
||||
# Disabling this option enables tab completion for aliases
|
||||
#setopt complete_aliases
|
||||
|
||||
# Case insensitive completion
|
||||
zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|=*' 'l:|=* r:|=*'
|
||||
|
||||
# Automatically load new executables
|
||||
zstyle ':completion:*' rehash true
|
||||
|
||||
# vim: syntax=zsh
|
||||
14
zsh/.config/zsh/conf.d/kp.zsh
Normal file
14
zsh/.config/zsh/conf.d/kp.zsh
Normal file
@ -0,0 +1,14 @@
|
||||
### PROCESS
|
||||
# mnemonic: [K]ill [P]rocess
|
||||
# show output of "ps -ef", use [tab] to select one or multiple entries
|
||||
# press [enter] to kill selected processes and go back to the process list.
|
||||
# or press [escape] to go back to the process list. Press [escape] twice to exit completely.
|
||||
|
||||
kp() {
|
||||
local pid=$(ps -ef | sed 1d | eval "fzf ${FZF_DEFAULT_OPTS} -m --header='[kill:process]'" | awk '{print $2}')
|
||||
|
||||
if [[ -n "${pid}" && "${pid}" != "x" ]]; then
|
||||
echo ${pid} | xargs kill -${1:-9}
|
||||
kp
|
||||
fi
|
||||
}
|
||||
14
zsh/.config/zsh/conf.d/options
Normal file
14
zsh/.config/zsh/conf.d/options
Normal file
@ -0,0 +1,14 @@
|
||||
# automatically cd into a given directory
|
||||
setopt autocd
|
||||
|
||||
# history options
|
||||
setopt append_history
|
||||
setopt hist_ignore_all_dups
|
||||
|
||||
# command correction
|
||||
setopt correctall
|
||||
|
||||
# prevent accidental overwriting of a file
|
||||
setopt noclobber
|
||||
|
||||
# vim: syntax=zsh
|
||||
35
zsh/.config/zsh/conf.d/prompt.zsh
Normal file
35
zsh/.config/zsh/conf.d/prompt.zsh
Normal file
@ -0,0 +1,35 @@
|
||||
# allows substitution in the prompt
|
||||
setopt PROMPT_SUBST
|
||||
|
||||
# ========== VCS info ==========
|
||||
autoload -Uz vcs_info
|
||||
zstyle ':vcs_info:*' enable git
|
||||
zstyle ':vcs_info:*' check-for-changes true
|
||||
#zstyle ':vcs_info:git*' formats "%{$fg[grey]%} %{$fg[blue]%}%b%{$reset_color%}%m %u %c%{$reset_color%}"
|
||||
zstyle ':vcs_info:git*' formats "%{$fg[grey]%}%{$fg[blue]%}%b%{$reset_color%}%m %u %c%{$reset_color%}"
|
||||
|
||||
# ========== Vim Command Mode ==========
|
||||
vim_ins_mode='ins'
|
||||
vim_cmd_mode='cmd'
|
||||
vim_mode=${vim_ins_mode}
|
||||
|
||||
zle-keymap-select() {
|
||||
vim_mode="${${KEYMAP/vicmd/${vim_cmd_mode}}/(main|viins)/${vim_ins_mode}}"
|
||||
zle reset-prompt
|
||||
}
|
||||
zle -N zle-keymap-select
|
||||
|
||||
zle-line-finish() {
|
||||
vim_mode=${vim_ins_mode}
|
||||
}
|
||||
zle -N zle-line-finish
|
||||
|
||||
# ========== Final Prompt ==========
|
||||
precmd() {
|
||||
vcs_info
|
||||
}
|
||||
|
||||
#PS1='%F{blue}%n%f@%m %F{green}%3~%f > '
|
||||
#RPS1='%F{green}${vim_mode}%f ${vcs_info_msg_0_} [%F{red}%?%f]'
|
||||
PS1='%F{green}%3~%f %F{blue}>%f '
|
||||
RPS1='${vcs_info_msg_0_} [%F{red}%?%f]'
|
||||
23
zsh/.config/zsh/conf.d/sudo.zsh
Normal file
23
zsh/.config/zsh/conf.d/sudo.zsh
Normal file
@ -0,0 +1,23 @@
|
||||
# Press escape twice to prepend the previous command with "sudo"
|
||||
sudo-command-line() {
|
||||
[[ -z ${BUFFER} ]] && zle up-history
|
||||
if [[ ${BUFFER} == sudo\ * ]]; then
|
||||
LBUFFER="${LBUFFER#sudo }"
|
||||
elif [[ ${BUFFER} == $EDITOR\ * ]]; then
|
||||
LBUFFER="${LBUFFER#$EDITOR }"
|
||||
LBUFFER="sudoedit $LBUFFER"
|
||||
elif [[ ${BUFFER} == sudoedit\ * ]]; then
|
||||
LBUFFER="${LBUFFER#sudoedit }"
|
||||
LBUFFER="$EDITOR $LBUFFER"
|
||||
else
|
||||
LBUFFER="sudo $LBUFFER"
|
||||
fi
|
||||
}
|
||||
|
||||
zle -N sudo-command-line
|
||||
|
||||
# Defined shortcut keys: [Esc] [Esc]
|
||||
bindkey -M viins "\e\e" sudo-command-line
|
||||
bindkey -M vicmd "\e\e" sudo-command-line
|
||||
|
||||
# vim: syntax=zsh
|
||||
13
zsh/.config/zsh/conf.d/tmux.zsh
Normal file
13
zsh/.config/zsh/conf.d/tmux.zsh
Normal file
@ -0,0 +1,13 @@
|
||||
## load a tmux session
|
||||
_load_tmux() {
|
||||
if [[ -n "${TMUX}" ]]; then
|
||||
echo "Already in a tmux session."
|
||||
else
|
||||
tmux
|
||||
fi
|
||||
}
|
||||
|
||||
zle -N _load_tmux
|
||||
bindkey -M viins "^y" _load_tmux
|
||||
|
||||
# vim: syntax=zsh
|
||||
Loading…
x
Reference in New Issue
Block a user