diff options
| -rw-r--r-- | .bash_aliases | 3 | ||||
| -rw-r--r-- | .bashrc | 14 | ||||
| -rw-r--r-- | .config/micro/settings.json | 1 | ||||
| -rw-r--r-- | .gitconfig | 25 | ||||
| -rwxr-xr-x | .local/bin/emojis.sh | 3 | ||||
| -rwxr-xr-x | .local/bin/mfi.py | 25 | ||||
| -rwxr-xr-x | .local/bin/wl-copy | 2 |
7 files changed, 68 insertions, 5 deletions
diff --git a/.bash_aliases b/.bash_aliases index b745da1..263db80 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -1 +1,4 @@ alias y2j='/usr/bin/python3 -c "import json,sys; from ruamel.yaml import YAML; yaml=YAML(); print(json.dumps(yaml.load(sys.stdin)))"' +alias irc-s='env PATH=.:$PATH irc-slack -H 0.0.0.0 -s wl.zachdecook.com' +alias gitb="git branch | grep '^*' | cut -d' ' -f2" +alias migs='ls resources/sql/*/*$(gitb)*' diff --git a/.bashrc b/.bashrc index dfdbdd4..de86879 100644 --- a/.bashrc +++ b/.bashrc @@ -136,9 +136,15 @@ alias pake='export COLUMNS;./vendor/indeyets/pake/bin/pake' export NODE_OPTIONS="--max_old_space_size=8192" # Zach stuff -mggrep () { TT micro $(git grep -n "$@" | cut -d: -f1,2); }; +mggrep () { TT micro $(git grep -n "$@" | cut -d: -f1,2 | head -n 50); }; -mfi () { TT micro $(echo "$@" | xargs -n1 find . -not -path './vendor/*' -name | head -n 50); }; +ggrep () { git grep -n "$@" | cut -d: -f1,2; }; + +mfi () { + trimmed=$(echo "$@" | xargs -n1 | sed 's/:.*//g') + # TODO: Include the numbers + TT micro $(echo "$trimmed" | xargs -n1 find . -not -path './vendor/*' -name | head -n 50); +}; mfd () { TT micro $(echo "$@" | xargs -n1 fd --exclude=vendor -- | head -n 50); }; @@ -174,3 +180,7 @@ alias mycli_admin='mycli --defaults-group-suffix=_admin' alias mycli_prodsup='mycli --defaults-group-suffix=_ProdSup' eval $(thefuck --alias frick) + +eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" +export PATH="/home/zachariahdecook/.local/bin:$PATH" +export EDITOR=micro diff --git a/.config/micro/settings.json b/.config/micro/settings.json index 40123c2..dd3b59e 100644 --- a/.config/micro/settings.json +++ b/.config/micro/settings.json @@ -2,6 +2,7 @@ "autoclose": false, "autosu": true, "basename": true, + "colorcolumn": 100, "colorscheme": "solarized", "mkparents": true, "parsecursor": true, diff --git a/.gitconfig b/.gitconfig index 8fb78fd..e375392 100644 --- a/.gitconfig +++ b/.gitconfig @@ -9,12 +9,37 @@ grepn = grep -n recommit = commit -C 'HEAD@{1}' mod = !git diff HEAD --relative | diff-so-fancy | grep \"@.*@\" | cut -d\" \" -f2 | grep -v \"^$\" | grep -v \"*\" | uniq: + [core] pager = diff-so-fancy | less --tabs=4 -RFX + #pager = delta +[merge] + conflictstyle = diff3 +[diff] + colorMoved = default + [interactive] diffFilter = diff-so-fancy --patch + #diffFilter = delta --color-only +[add.interactive] + useBuiltin = false # required for git 2.37.0 + [sendemail] smtpserver = smtp.gmail.com smtpuser = zach.decook@bettercarpeople.com smtpencryption = tls smtpserverport = 587 +[color] + ui = true +[color "diff-highlight"] + oldNormal = red bold + oldHighlight = red bold 52 + newNormal = green bold + newHighlight = green bold 22 +[color "diff"] + #meta = yellow + #frag = magenta bold + #commit = yellow bold + old = red bold + new = green bold + whitespace = red reverse diff --git a/.local/bin/emojis.sh b/.local/bin/emojis.sh index 9ba19ad..5e1baba 100755 --- a/.local/bin/emojis.sh +++ b/.local/bin/emojis.sh @@ -6,6 +6,7 @@ input=/usr/share/unicode/emoji/emoji-test.txt prefix=$1 +alias sxmo_dmenu.sh='fzf' topmenu(){ menu=$(grep ' group: ' "$input" | cut -d: -f2 |sed 's/^ //g'|awk 'BEGIN{print "All Emojis"}(1){print}END{print "exit"}'| $prefix sxmo_dmenu.sh -i --header Emojis) @@ -70,7 +71,7 @@ emojis(){ fi ;; * ) - wl-ime-type "$emoji" & + # wtype "$emoji" & printf %s "$emoji" | wl-copy emojis "$menu" "$submenu" ;; diff --git a/.local/bin/mfi.py b/.local/bin/mfi.py new file mode 100755 index 0000000..8cd19cd --- /dev/null +++ b/.local/bin/mfi.py @@ -0,0 +1,25 @@ +#!/usr/bin/env python3 +import sys +import subprocess + +args = sys.argv[1:] +subs = [] +nums = [] +for arg in args: + file = arg.split(':')[0] + r = subprocess.run(['find', '.', '-name', file],stdout=subprocess.PIPE) + subs.append(r) + if ':' in arg: + nums.append(arg.split(':')[1]) + else: + nums.append(0) + +nums.reverse() +args = ['micro'] +for sub in subs: + n = nums.pop() + files = r.stdout.decode().strip().split('\n') + for file in files: + args.append(file+":"+n) + +subprocess.run(args) diff --git a/.local/bin/wl-copy b/.local/bin/wl-copy deleted file mode 100755 index a53757b..0000000 --- a/.local/bin/wl-copy +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -xclip -in -selection clipboard |