Recovery branch

.gitignore

@@ -1,2 +1,3 @@
 git/gitconfig.local.symlink
 Brewfile.lock.json
+todo/completion.zsh

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "external/zsh-syntax-highlighting"]
+	path = external/zsh-syntax-highlighting
+	url = https://github.com/zsh-users/zsh-syntax-highlighting.git
+[submodule "external/zsh-completions"]
+	path = external/zsh-completions
+	url = https://github.com/zsh-users/zsh-completions.git
+[submodule "external/zsh-history-substring-search"]
+	path = external/zsh-history-substring-search
+	url = https://github.com/zsh-users/zsh-history-substring-search.git
+[submodule "external/zsh-autosuggestions"]
+	path = external/zsh-autosuggestions
+	url = https://github.com/zsh-users/zsh-autosuggestions.git

README.md

@@ -50,7 +50,7 @@ There's a few special files in the hierarchy.
 Run this:
 
 ```sh
-git clone https://github.com/holman/dotfiles.git ~/.dotfiles
+git clone https://github.com/bhillmann/dotfiles.git ~/.dotfiles
 cd ~/.dotfiles
 script/bootstrap
 ```

bin/e

@@ -1,16 +1,33 @@
-#!/bin/sh
-#
-# Quick shortcut to an editor.
-#
-# This means that as I travel back and forth between editors, hey, I don't have
-# to re-learn any arcane commands. Neat.
-#
-# USAGE:
-#
-#   $ e
-#   # => opens the current directory in your editor
-#
-#   $ e .
-#   $ e /usr/local
-#   # => opens the specified directory in your editor
-exec "$EDITOR" "${1:-.}"
+#!/bin/bash -eux
+exec vim "$@"
+# # Wrapper script to invoke interactive emacs commands in a daemon instance.
+
+# # These days many people don't suspect it,
+# # but Emacs got server ('emacs' binary) and client ('emacsclient') parts.
+# # Launching server (i.e. default 'emacs' command) evaluates the config
+# # and could potentially take seconds if it's very heavy
+# # Launching the client however is lightning fast. It's just a matter of creating a window.
+
+
+# ARGS=(
+#  # This trick gives you best of two worlds: if there is an Emacs daemon running,
+#  # it just connects to it. Otherwise, it spawns a daemon first and then connects to it.
+#  # Without this setting if you didn't have a daemon running, the command would fail.
+#  -a ''
+
+#  # open a new fram on the current terminal  
+# #  -nw
+#  # spawn new GUI window, otherwise it tries to launch client in terminal
+#  --create-frame 
+#  --frame-parameters="'(fullscreen . maximized)"
+
+# #   # process rest of arguments as elisp code
+# #  --eval
+# #   # bring focus to the window
+# #  '(select-frame-set-input-focus (selected-frame))'
+# )
+
+# # without any extra args it just invokes the daemon instance, otherwise executes the args
+# exec emacsclient "${ARGS[@]}" \
+#                  "$@"          # pass through whatever else you are trying to run
+

bin/fif

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# alternative using ripgrep-all (rga) combined with fzf-tmux preview
+# implementation below makes use of "open" on macOS, which can be replaced by other commands if needed.
+# allows to search in PDFs, E-Books, Office documents, zip, tar.gz, etc. (see https://github.com/phiresky/ripgrep-all)
+# find-in-file - usage: fif <searchTerm> or fif "string with spaces" or fif "regex"
+#fif() {
+#    if [ ! "$#" -gt 0 ]; then echo "Need a string to search for!"; return 1; fi
+#    read -r file line column <<< "$(rg --column --line-number --no-messages --hidden --ignore-case --no-heading --files-with-matches "$1" | fzf --preview "echo {} | cut -d ":" -f1" -0 -1 | awk -F: '{print $1, $2, $3}')"
+#    echo $column
+#    if [[ -n $file ]]
+#    then
+#        e +$line:$column $file
+#    fi
+#}
+
+
+# using ripgrep combined with preview
+# find-in-file - usage: fif <searchTerm>
+fif() {
+    if [ ! "$#" -gt 0 ]; then echo "Need a string to search for!"; return 1; fi
+    file=$(rg --column --line-number --ignore-case --no-messages --hidden --files-with-matches "$1" | fzf --preview "bat --style=changes --wrap never --color always {} | rg --ignore-case --pretty --context 10 '$1' {}" -0 -1)
+    if [[ -n $file ]]
+    then
+        e $file
+    fi
+}
+
+#fif() {
+#    if [ ! "$#" -gt 0 ]; then echo "Need a string to search for!"; return 1; fi
+#    local file
+#    echo "$@"
+#    file="$(rga --max-count=1 --ignore-case --files-with-matches --no-messages "$@" | fzf-tmux +m --preview="rga --ignore-case --pretty --context 10 '"$@"' {}")" && open "$file"
+#}
+
+fif "$@"
+#echo "$line"
+#echo $file
+#echo $line
+#[[ -n $selected ]] && e $selected

bin/fzf-log

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+hash=$(git log --color=always --format="%C(auto)%h%d %s %C(black)%C(bold)%cr" "$@" |  fzf | awk '{print $1}')
+echo $hash | xclip
+git showtool $hash

bin/git-copy-branch-name

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh
 #
 # Copy the current branch name to the clipboard.
 
 branch=$(git rev-parse --abbrev-ref HEAD)
 echo $branch
-echo $branch | tr -d '\n' | tr -d ' ' | pbcopy
+echo $branch | tr -d '\n' | tr -d ' ' | xclip

bin/monitor

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+optirun intel-virtual-output

bin/s

@@ -0,0 +1,2 @@
+#!/bin/bash -eux
+exec e "(spacemacs/defer-until-after-user-config #'my/search)"

bin/sc

@@ -0,0 +1,2 @@
+#!/bin/bash -eux
+exec e "(spacemacs/defer-until-after-user-config #'my/search-code)"

bin/tm

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+	[[ -n "$TMUX" ]] && change="switch-client" || change="attach-session"
+	if [ $1 ]; then
+		tmux $change -t "$1" 2>/dev/null || (tmux new-session -d -s $1 && tmux $change -t "$1"); return
+	fi   
+	session=$(tmux list-sessions -F "#{session_name}" 2>/dev/null | fzf --exit-0) &&  tmux $change -t "$session" || echo "No sessions found." 

bin/zssh

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+ssh "$@" -t zsh