update dots bcp

7 files changed, 43 insertions, 188 deletions

diff --git a/.bash_aliases b/.bash_aliases
index 263db80..eb9f081 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -1,3 +1,16 @@
+# basic stuff
+alias mgm='micro $(git diff HEAD --relative | diff-so-fancy | grep "@.*@" | cut -d" " -f2 | grep -v "^$" | grep -v "*" | uniq:)'
+
+# micro git staged
+#alias mgs='micro $(git diff HEAD --staged --relative | diff-so-fancy | grep "@.*@" | cut -d" " -f2 | grep -v "^$" | grep -v "*" | uniq:)'
+
+# Typos
+alias mimcro='micro'
+alias micmro='micro'
+
+## dgs
+alias mycli_admin='mycli --defaults-group-suffix=_admin'
+
 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"
diff --git a/.bashrc b/.bashrc
index de86879..970afa3 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,67 +1,24 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
 # If not running interactively, don't do anything
 case $- in
-    *i*) ;;
-      *) return;;
+*i*)	;;
+*)	return ;;
 esac
 
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=10000
-HISTFILESIZE=20000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# If set, the pattern "**" used in a pathname expansion context will
-# match all files and zero or more directories and subdirectories.
-#shopt -s globstar
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
+if [ -z "$HOST" ] ; then
+	export HOST=${HOSTNAME}
 fi
 
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-    xterm-color|*-256color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
+xtitle () 
+{ 
+	echo -n -e "\033]0;$*\007"
+}
 
-if [ -n "$force_color_prompt" ]; then
-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	# We have color support; assume it's compliant with Ecma-48
-	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	# a case would tend to support setf rather than setaf.)
-	color_prompt=yes
-    else
-	color_prompt=
-    fi
-fi
+cd()
+{
+	builtin cd "$@" && xtitle "$(basename $PWD)"
+}
 
-if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-unset color_prompt force_color_prompt
+export HISTSIZE=10000
 
 # BCP prompt.
 parse_git_branch() {
@@ -69,115 +26,15 @@ parse_git_branch() {
 }
 export PS1="[\t \[\e[0;33m\]\w\[\e[0;35m\]\[\e[0;32m\]\$(parse_git_branch)\[\e[0;35m\]\[\033[00m\]] "
 
-
-# If this is an xterm set the title to dir
-case "$TERM" in
-xterm*|rxvt*)
-    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\W\a\]$PS1"
-    ;;
-*)
-    ;;
-esac
-
-# Zach Set title
-#PS1_SET_TITLE='\[\e]0;\u@\h:\w\a\]'
-#PS1="${PS1_SET_TITLE}${PS1}"
-
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
-    alias grep='grep --color=auto'
-    alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto'
-fi
-
-# colored GCC warnings and errors
-#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-
-# some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-
-# Add an "alert" alias for long running commands.  Use like so:
-#   sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if ! shopt -oq posix; then
-  if [ -f /usr/share/bash-completion/bash_completion ]; then
-    . /usr/share/bash-completion/bash_completion
-  elif [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
-  fi
-fi
-
-
-# BCP stuff
-
-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 | 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); };
-
-
-gg () { git grep -n "$@" | cut -d: -f1,2; };
-fin () { echo "$@" | xargs -n1 find . -not -path './vendor/*' -name | head -n 50; };
-
-
-# basic stuff
-#alias mgm='micro $(git status -s --ignore-submodules -uno | grep -v "^D " | grep -v "^ D" | sed "s/^...//g" | sed "s/[^>]* -> //g")'
-# micro git modified line-wise (open each line in a separate buffer)
-#alias mgml='micro $(git diff HEAD --relative | diff-so-fancy | grep "@" | cut -d" " -f2)'
-# micro git modified
-#alias mgm='micro $(git diff --relative |egrep "^(\+\+\+|@@)" |uniq -w3|sed "s/+++ b/./g" |sed "s/^@@[^+]\++//g" | sed "s/@@.*//g" | paste - - -d:)'
-# but start on a good line                          BCP 
-alias mgm='TT micro $(git diff HEAD --relative | diff-so-fancy | grep "@.*@" | cut -d" " -f2 | grep -v "^$" | grep -v "*" | uniq:)'
-
-# micro git staged
-#alias mgs='micro $(git status -s --ignore-submodules -uno | grep "^M" | sed "s/^...//g" | sed "s/[^>]* -> //g")'
-alias mgs='TT micro $(git diff HEAD --staged --relative | diff-so-fancy | grep "@.*@" | cut -d" " -f2 | grep -v "^$" | grep -v "*" | uniq:)'
-
-
-# TT stuff
-alias mycli='TT mycli'
-#alias micro='TT micro'
-alias senpai='TT senpai'
-
-# Typos
-alias mimcro='TT micro'
-alias micmro='TT micro'
 
-## dgs
-alias mycli_admin='mycli --defaults-group-suffix=_admin'
-alias mycli_prodsup='mycli --defaults-group-suffix=_ProdSup'
+source ~/.bash_aliases
 
 eval $(thefuck --alias frick)
 
diff --git a/.config/fish/conf.d/ansi-colors.fish b/.config/fish/conf.d/ansi-colors.fish
index 15104ce..7212f64 100644
--- a/.config/fish/conf.d/ansi-colors.fish
+++ b/.config/fish/conf.d/ansi-colors.fish
@@ -7,3 +7,5 @@ set -u fish_color_param cyan
 set -u fish_color_comment red
 set -u fish_color_operator brblue --bold
 set -u fish_color_autosuggestion brblack
+
+set -u fish_color_user brgreen
diff --git a/.config/micro/bindings.json b/.config/micro/bindings.json
index 3432690..9b595b1 100644
--- a/.config/micro/bindings.json
+++ b/.config/micro/bindings.json
@@ -10,7 +10,7 @@
     "AltI": "command:decNum",
     "AltL": "command:upper",
     "Alt[": "command:square",
-    "Alt]": "lua:bounce.bounce",
+    "Alt]": "JumpToMatchingBrace",
     "Alti": "command:incNum",
     "Alt{": "command:curly",
     "Ctrl-Down": "SpawnMultiCursorDown",
diff --git a/.config/micro/syntax/php.yaml b/.config/micro/syntax/php.yaml
index 8ffbb48..027e859 100644
--- a/.config/micro/syntax/php.yaml
+++ b/.config/micro/syntax/php.yaml
@@ -55,12 +55,12 @@ rules:
     - preproc: "<!DOCTYPE.+?>"
 
     - default:
-        start: "<<<SQL"
-        end: "SQL;"
+        start: "<<<'?SQL'?"
+        end: "( |^)SQL"
         rules:
           - include: "sql"
     - default:
-        start: "<<<XML"
+        start: "<<<'?XML'?"
         end: "XML;"
         rules:
           - include: "xml"
diff --git a/.gitconfig b/.gitconfig
index e375392..3a514eb 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,44 +2,26 @@
 	name = Zach DeCook
 	email = zach.decook@bettercarpeople.com
 [alias]
-	ds = diff --staged
 	s = status
+	ds = diff --staged
 	uncommit = reset --soft HEAD~1
-	ndiff = !git --no-pager diff
-	grepn = grep -n
 	recommit = commit -C 'HEAD@{1}'
+	grepn = grep -n
 	mod = !git diff HEAD --relative | diff-so-fancy | grep \"@.*@\" | cut -d\" \" -f2 | grep -v \"^$\" | grep -v \"*\" | uniq:
-
+	ndiff = !git --no-pager diff
+	ddiff = -c diff.external=difft -c core.pager="less" diff
+	git = !git
+	gerp = grep
 [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
+[advice]
+	statusHints = false
diff --git a/.local/bin/mfi.py b/.local/bin/mfi.py
index b18f620..332fa04 100755
--- a/.local/bin/mfi.py
+++ b/.local/bin/mfi.py
@@ -20,8 +20,9 @@ for arg in args:
 args = ['micro']
 for file in files:
     if file:
-        n = nums.get(file, nums.get(file.split('/')[-1], 0))
+        n = nums.get(file, nums.get(file.split('/')[-1], nums.get(file.replace("./","",1), 0)))
         args.append(file+":"+str(n))
 
 #print(args)
+#print(nums)
 subprocess.run(args)