diff --git a/.config/aliasrc b/.config/aliasrc index a54aeab..615360f 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -1,70 +1,50 @@ #!/bin/sh -# gitup='git remote | xargs -L1 git push --all' \ -alias \ - q='exit' \ - ls="ls --color=auto" \ - ll="ls -G -alh" \ - dd='sudo dd status=progress' \ - h="history 1 | grep" \ - vim='nvim' \ - grep='grep --color=auto' \ - p='sudo pacman' \ - extip='curl -s www.icanhazip.com' \ - gco='git checkout' \ - gbls='git --no-pager branch -a' \ - vv='nvim ~/.config/nvim/init.lua' \ - vz='nvim ~/.zshrc && source ~/.zshrc' \ - va='nvim ~/.config/aliasrc && source ~/.zshrc' \ - sz='source ~/.zshrc' \ - delorig='find . -name "*.orig" -exec rm {} \;' \ - delbak='find . -name "*.bak" -exec rm {} \;' \ - cpp="rsync --progress --recursive" \ - sv="sudo nvim" \ - c="xclip -selection clipboard" \ - v="xclip -selection clipboard -o" \ - lf="lfcd" \ - dcu='docker compose up' \ - dce='docker compose exec' \ - dcr='docker compose run' \ - dps="docker ps" \ - ds="docker stop" \ - dce-test='docker compose exec fpm ./artisan test' \ - dc-phpunit='docker compose exec fpm ./vendor/bin/phpunit' \ - dm='mysql -h localhost -P 33061 --protocol=tcp -u root -psecret' \ - staging-mysql='mysql --host tf-codium-staging.ch66levpagqo.ap-southeast-2.rds.amazonaws.com --user=root --password=r43r34rg' \ - mailhog='docker run -d --restart unless-stopped -p 1025:1025 -p 8025:8025 mailhog/mailhog' \ - t12wl='docker run -it -v $(pwd):/workpace -v /root/.ssh:/root/.ssh:ro -v ~/.aws:/root/.aws -w /workpace hashicorp/terraform:0.12.27 workspace list ' \ - t12ws='docker run -it -v $(pwd):/workpace -v /root/.ssh:/root/.ssh:ro -v ~/.aws:/root/.aws -w /workpace hashicorp/terraform:0.12.27 workspace select ' \ - t12wd='docker run -it -v $(pwd):/workpace -v /root/.ssh:/root/.ssh:ro -v ~/.aws:/root/.aws -w /workpace hashicorp/terraform:0.12.27 workspace delete ' \ - t12='docker run -it -v $(pwd):/workpace -v /root/.ssh:/root/.ssh:ro -v ~/.aws:/root/.aws -w /workpace hashicorp/terraform:0.12.27 ' \ - ducks='du -cks * | sort -rn | head' \ - fn="find . -name" \ - artisan="docker compose exec fpm php artisan" \ - tinker="docker compose exec fpm php artisan tinker" \ - phpunit="docker compose exec fpm ./vendor/bin/phpunit" \ - paratest="docker compose exec fpm ./test" \ - jsonlint="python -m json.tool" \ - ts="~/.local/bin/tmux-sessionizer" \ - tmux="tmux attach-session || tmux" \ - fresh="docker compose exec fpm php artisan migrate:fresh --seed" \ - shrug="echo '¯\\_(ツ)_/¯' | xclip -selection clipboard && echo 'Copied ASCII shrug to clipboard'" \ - dab="cat ~/Documents/dab.txt | xclip -selection clipboard && echo 'Copied ASCII dab to clipboard'" +# Misc +alias q='exit' +alias ls="ls --color=auto" +alias ll="ls -G -alh" +alias vim='nvim' +alias grep='grep --color=auto' +alias vz='nvim ~/.zshrc && source ~/.zshrc' +alias va='nvim ~/.config/aliasrc && source ~/.zshrc' +alias sz='source ~/.zshrc' +alias c="xclip -selection clipboard" +alias v="xclip -selection clipboard -o" +alias lf="lfcd" +alias ducks='du -cks * | sort -rn | head' -alias \ - c="xclip -selection clipboard" \ - v="xclip -selection clipboard -o" +# Docker +alias dc="docker compose" +alias dcu='docker compose up' +alias dce='docker compose exec' +alias dcr='docker compose run' +alias dps="docker ps" +alias ds="docker stop" + +# Docker + Laravel +alias artisan="docker compose exec fpm php artisan" +alias tinker="docker compose exec fpm php artisan tinker" +alias phpunit="docker compose exec fpm ./vendor/bin/phpunit" +alias paratest="docker compose exec fpm ./test" +alias fresh="docker compose exec fpm php artisan migrate:fresh --seed" + +alias ts="~/.local/bin/tmux-sessionizer" +alias tmux="tmux attach-session || tmux" + +# Clipboard +alias c="xclip -selection clipboard" +alias v="xclip -selection clipboard -o" if [[ $(uname) == 'Darwin' ]]; then - alias \ - c="pbcopy" \ - v="pbpaste" + alias c="pbcopy" + alias v="pbpaste" fi +# Jack specific alias jack-artisan="dce app-fpm ./artisan" alias jack-paratest="dce app-fpm ./test" alias jack-phpunit="dce app-fpm ./vendor/bin/phpunit" - alias jack-subscription-artisan="dce subscription-fpm ./artisan" alias jack-subscription-paratest="dce subscription-fpm ./test" alias jack-subscription-phpunit="dce subscription-fpm ./vendor/bin/phpunit" diff --git a/.inputrc b/.inputrc deleted file mode 100644 index a30a380..0000000 --- a/.inputrc +++ /dev/null @@ -1,23 +0,0 @@ -set completion-ignore-case on - -set keymap emacs -"\C-x\C-r": re-read-init-file -"\e[A": history-search-backward -"\e[B": history-search-forward -"\e[C": forward-char -"\e[D": backward-char - -set keymap vi-command -"\C-x\C-r": re-read-init-file -"\e[A": history-search-backward -"\e[B": history-search-forward -"\e[C": forward-char -"\e[D": backward-char - -set keymap vi-insert -"\C-x\C-r": re-read-init-file -"\e[A": history-search-backward -"\e[B": history-search-forward -"\e[C": forward-char -"\e[D": backward-char - diff --git a/.local/bin/fenc b/.local/bin/fenc deleted file mode 100755 index 1e95ee4..0000000 Binary files a/.local/bin/fenc and /dev/null differ diff --git a/.local/bin/flask-unsign b/.local/bin/flask-unsign deleted file mode 100755 index c4d08bf..0000000 --- a/.local/bin/flask-unsign +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -import re -import sys -from flask_unsign.__main__ import main -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/.local/bin/lock_mine b/.local/bin/lock_mine deleted file mode 100755 index 9894353..0000000 --- a/.local/bin/lock_mine +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -if ! pgrep -x "miner" >/dev/null -then - miner --algo ethash --server eth.2miners.com:2020 --user 0x951c9c8ff6a9466536Fca8D6d5010A8Ea39c42f8.desktop & -fi - -slock && pkill miner diff --git a/.local/bin/nohup.out b/.local/bin/nohup.out deleted file mode 100644 index e69de29..0000000 diff --git a/.local/bin/pbr b/.local/bin/pbr deleted file mode 100755 index 5969d2e..0000000 --- a/.local/bin/pbr +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -import re -import sys -from pbr.cmd.main import main -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/.local/bin/remap-keys b/.local/bin/remap-keys deleted file mode 100755 index d800393..0000000 --- a/.local/bin/remap-keys +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -xmodmap -e 'clear Lock' & -xmodmap -e 'keycode 135 = Super_R' & -xmodmap -e 'keycode 66 = Escape' & -xmodmap -e 'keycode 9 = grave' & - - diff --git a/.xinitrc b/.xinitrc deleted file mode 100644 index a0219e5..0000000 --- a/.xinitrc +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/etc/X11/xinit/.Xresources -sysmodmap=/etc/X11/xinit/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f "$userresources" ]; then - xrdb -merge "$userresources" -fi - -if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" -fi - -# start some nice programs - -if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do - [ -x "$f" ] && . "$f" - done - unset f -fi - -systemctl --user import-environment DISPLAY - -# xrandr --output DVI-D-1 --off - -xset r rate 200 25 - -sh ~/.local/bin/dwm-autostart - -exec dwm diff --git a/.zshrc b/.zshrc index ad7a6fe..8ce2004 100644 --- a/.zshrc +++ b/.zshrc @@ -60,9 +60,6 @@ function cdf () { cd $(find . -type d -print | fzf) } -# Load aliases -source ~/.config/aliasrc - # Android dev config export ANDROID_HOME="$HOME/Android/Sdk" if [[ $(uname) == 'Darwin' ]]; then @@ -76,6 +73,10 @@ export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion + +# Load external +source ~/.config/aliasrc + source <(fzf --zsh) eval "$(oh-my-posh init zsh --config $HOME/.config/oh-my-posh/zen.toml)"