M bash/.bashrc → bash/.bashrc

@@ -1,8 +1,8 @@ 
 # better history syncing
 shopt -s histappend
 export HISTCONTROL=ignoreboth:erasedups
-HISTSIZE=1000
-HISTFILESIZE=2000
+HISTSIZE=40000
+HISTFILESIZE=40000
 
 # cool options for cool kids
 shopt -s \
@@ -23,10 +23,19 @@ bind 'set colored-stats on'
 bind 'set completion-display-width 1'
 bind 'TAB:menu-complete'
 
+# fzy reverse search
+__fzy_history() {
+    ch="$(fc -l | fzy | cut -f2)"
+    : "${ch#"${ch%%[![:space:]]*}"}"
+    printf "$_"
+}
+
+bind -x '"\C-r": READLINE_LINE=$(__fzy_history); READLINE_POINT="${#READLINE_LINE}"'
+
 complete -cf doas
 
 # z
-# source ~/leet/z/z.sh
+. /usr/local/etc/profile.d/z.sh
 
 for i in ~/.bashrc.d/[0-9]*; do
     . "$i"

M bash/.bashrc.d/04-exports.bash → bash/.bashrc.d/04-exports.bash

@@ -10,9 +10,9 @@ export PATH=$PATH:$HOME/.nimble/bin
 export PATH=$PATH:$HOME/.local/bin
 export PATH=$PATH:/usr/local/go/bin
 export PATH=$PATH:/usr/local/pgsql/bin
-export PW_DIR=~/passwords
+export PW_DIR=~/.pw
 export PW_KEY=x@icyphox.sh
-export _Z_CMD="j"
+export _Z_CMD="n"
 export MOZ_ACCELERATED=1
 export CFLAGS="-O3 -pipe -march=native"
 export CXXFLAGS="-O3 -pipe -march=native"

M bash/.bashrc.d/99-prompt.bash → bash/.bashrc.d/99-prompt.bash

@@ -9,7 +9,7 @@ gry="\e[94m"
 rst="\e[0m"
 
 git_branch() {
-    [[ -d "$PWD/.git" ]] && {
+    [[ "$(git rev-parse --is-inside-work-tree 2> /dev/null)" = "true" ]] && {
         local git_status="$(git status 2> /dev/null)"
         local on_branch="On branch ([^${IFS}]*)"
         local on_commit="HEAD detached at ([^${IFS}]*)"
@@ -35,7 +35,6 @@ elif [[ $git_status =~ $on_commit ]]; then
             local commit=${BASH_REMATCH[1]}
             printf '%b' "$color $commit $rst"
         fi
-    
     }
 }
 

M darwin/com.googlecode.iterm2.plist → darwin/com.googlecode.iterm2.plist

@@ -758,6 +758,8 @@ <real>1</real>
 			</dict>
 			<key>Blend</key>
 			<real>0.55625704735824744</real>
+			<key>Blink Allowed</key>
+			<true/>
 			<key>Blinking Cursor</key>
 			<false/>
 			<key>Blur</key>
@@ -850,7 +852,7 @@ </dict>
 			<key>Guid</key>
 			<string>1FA48ED0-C56C-4189-9FCE-54B76BFD9373</string>
 			<key>Horizontal Spacing</key>
-			<real>1</real>
+			<real>0.91000000000000003</real>
 			<key>Idle Code</key>
 			<integer>0</integer>
 			<key>Initial Text</key>
@@ -1169,7 +1171,7 @@ <string>Monaco 12</string>
 			<key>Non-ASCII Anti Aliased</key>
 			<true/>
 			<key>Normal Font</key>
-			<string>Menlo-Regular 14</string>
+			<string>SFMono-Regular 14</string>
 			<key>Option Key Sends</key>
 			<integer>2</integer>
 			<key>Prompt Before Closing 2</key>
@@ -1235,7 +1237,7 @@ <true/>
 			<key>Use Non-ASCII Font</key>
 			<false/>
 			<key>Vertical Spacing</key>
-			<real>1.0600000000000001</real>
+			<real>1.0900000000000001</real>
 			<key>Visual Bell</key>
 			<true/>
 			<key>Window Type</key>