diff options
-rwxr-xr-x | bat/install | 51 | ||||
-rw-r--r-- | bat/shell/keybindings.bash | 65 | ||||
-rw-r--r-- | bat/shell/keybindings.zsh | 77 | ||||
-rwxr-xr-x | bat/uninstall | 9 | ||||
-rw-r--r-- | zsh/completions.zsh | 3 | ||||
-rw-r--r-- | zshrc | 1 |
6 files changed, 0 insertions, 206 deletions
diff --git a/bat/install b/bat/install deleted file mode 100755 index 6f20f5e..0000000 --- a/bat/install +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env bash - -# general installer for sharkdp's rust based applications - -USAGE="Usage: ${0##*/} <app>" -APPS="Apps: bat, hyperfine, hexyl, fd, vivid, pastel, lscolors, diskus" - -app=$1 - -if [[ -z $app || $app == "help" ]]; then - echo $USAGE >&2 - echo $APPS >&2 - exit 0 -fi - -if [[ "$app" == "list" ]]; then - echo $USAGE >&2 - exit 0 -fi - -if [ ! "$(which $app)" ]; then - current_version=0.0.0 - echo "$app: not installed" -else - current_version=$($app --version | grep -oE "[0-9\.]+") - echo "$app: found $current_version" -fi - -latest_version=$(curl -s "https://github.com/sharkdp/${app}/releases/latest" | grep -oE '[0-9]+.[0-9\.]+') - -if [ "$2" ]; then - latest_version=$2 -fi - -if [[ "$current_version" == "$latest_version" ]]; then - echo "$app: up-to-date" -else - echo "$app: new version found $latest_version" - echo "$app: downloading..." - - arch="$(uname -m)" - filename="${app}-v${latest_version}-${arch}-unknown-linux-musl" - - curl -fsSLo "${filename}.tar.gz" "https://github.com/sharkdp/${app}/releases/download/v${latest_version}/${filename}.tar.gz" - tar -zxvf "${filename}.tar.gz" "${filename}/${app}" - - mv "${filename}/${app}" "${HOME}/.local/bin/" - - rm -r "${filename}" - rm "${filename}.tar.gz" -fi diff --git a/bat/shell/keybindings.bash b/bat/shell/keybindings.bash deleted file mode 100644 index c227c29..0000000 --- a/bat/shell/keybindings.bash +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env bash -is_in_git_repo() { - git rev-parse HEAD > /dev/null 2>&1 -} - -fzf-down() { - fzf --height 50% --min-height 20 --border --bind ctrl-/:toggle-preview "$@" -} - -_gf() { - is_in_git_repo || return - git -c color.status=always status --short | - fzf-down -m --ansi --nth 2..,.. \ - --preview '(git diff --color=always -- {-1} | sed 1,4d; cat {-1})' | - cut -c4- | sed 's/.* -> //' -} - -_gb() { - is_in_git_repo || return - git branch -a --color=always | grep -v '/HEAD\s' | sort | - fzf-down --ansi --multi --tac --preview-window right:70% \ - --preview 'git log --oneline --graph --date=short --color=always --pretty="format:%C(auto)%cd %h%d %s" $(sed s/^..// <<< {} | cut -d" " -f1)' | - sed 's/^..//' | cut -d' ' -f1 | - sed 's#^remotes/##' -} - -_gt() { - is_in_git_repo || return - git tag --sort -version:refname | - fzf-down --multi --preview-window right:70% \ - --preview 'git show --color=always {}' -} - -_gh() { - is_in_git_repo || return - git log --date=short --format="%C(green)%C(bold)%cd %C(auto)%h%d %s (%an)" --graph --color=always | - fzf-down --ansi --no-sort --reverse --multi --bind 'ctrl-s:toggle-sort' \ - --header 'Press CTRL-S to toggle sort' \ - --preview 'grep -o "[a-f0-9]\{7,\}" <<< {} | xargs git show --color=always' | - grep -o "[a-f0-9]\{7,\}" -} - -_gr() { - is_in_git_repo || return - git remote -v | awk '{print $1 "\t" $2}' | uniq | - fzf-down --tac \ - --preview 'git log --oneline --graph --date=short --pretty="format:%C(auto)%cd %h%d %s" {1}' | - cut -d$'\t' -f1 -} - -_gs() { - is_in_git_repo || return - git stash list | fzf-down --reverse -d: --preview 'git show --color=always {1}' | - cut -d: -f1 -} - -if [[ $- =~ i ]]; then - bind '"\er": redraw-current-line' - bind '"\C-g\C-f": "$(_gf)\e\C-e\er"' - bind '"\C-g\C-b": "$(_gb)\e\C-e\er"' - bind '"\C-g\C-t": "$(_gt)\e\C-e\er"' - bind '"\C-g\C-h": "$(_gh)\e\C-e\er"' - bind '"\C-g\C-r": "$(_gr)\e\C-e\er"' - bind '"\C-g\C-s": "$(_gs)\e\C-e\er"' -fi
\ No newline at end of file diff --git a/bat/shell/keybindings.zsh b/bat/shell/keybindings.zsh deleted file mode 100644 index 0a6c631..0000000 --- a/bat/shell/keybindings.zsh +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env zsh - -### Key bindings for git with fzf (https://junegunn.kr/2016/07/fzf-git/) - -is_in_git_repo() { - git rev-parse HEAD > /dev/null 2>&1 -} - -fzf-down() { - fzf --height 50% --min-height 20 --border --bind ctrl-/:toggle-preview "$@" -} - -_gf() { - is_in_git_repo || return - git -c color.status=always status --short | - fzf-down -m --ansi --nth 2..,.. \ - --preview '(git diff --color=always -- {-1} | sed 1,4d; cat {-1})' | - cut -c4- | sed 's/.* -> //' -} - -_gb() { - is_in_git_repo || return - git branch -a --color=always | grep -v '/HEAD\s' | sort | - fzf-down --ansi --multi --tac --preview-window right:70% \ - --preview 'git log --oneline --graph --date=short --color=always --pretty="format:%C(auto)%cd %h%d %s" $(sed s/^..// <<< {} | cut -d" " -f1)' | - sed 's/^..//' | cut -d' ' -f1 | - sed 's#^remotes/##' -} - -_gt() { - is_in_git_repo || return - git tag --sort -version:refname | - fzf-down --multi --preview-window right:70% \ - --preview 'git show --color=always {}' -} - -_gh() { - is_in_git_repo || return - git log --date=short --format="%C(green)%C(bold)%cd %C(auto)%h%d %s (%an)" --graph --color=always | - fzf-down --ansi --no-sort --reverse --multi --bind 'ctrl-s:toggle-sort' \ - --header 'Press CTRL-S to toggle sort' \ - --preview 'grep -o "[a-f0-9]\{7,\}" <<< {} | xargs git show --color=always' | - grep -o "[a-f0-9]\{7,\}" -} - -_gr() { - is_in_git_repo || return - git remote -v | awk '{print $1 "\t" $2}' | uniq | - fzf-down --tac \ - --preview 'git log --oneline --graph --date=short --pretty="format:%C(auto)%cd %h%d %s" {1}' | - cut -d$'\t' -f1 -} - -_gs() { - is_in_git_repo || return - git stash list | fzf-down --reverse -d: --preview 'git show --color=always {1}' | - cut -d: -f1 -} - -join-lines() { - local item - while read item; do - echo -n "${(q)item} " - done -} - -bind-git-helper() { - local c - for c in $@; do - eval "fzf-g$c-widget() { local result=\$(_g$c | join-lines); zle reset-prompt; LBUFFER+=\$result }" - eval "zle -N fzf-g$c-widget" - eval "bindkey '^g^$c' fzf-g$c-widget" - done -} - -bind-git-helper f b t r h s -unset -f bind-git-helper
\ No newline at end of file diff --git a/bat/uninstall b/bat/uninstall deleted file mode 100755 index c1262cf..0000000 --- a/bat/uninstall +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -app=$1 - -if [ "$(which $app)" ]; then - current_version=$($app --version | grep -oE "[0-9\.]+") - echo "$app: uninstalling $current_version" - sudo apt remove $app -fi
\ No newline at end of file diff --git a/zsh/completions.zsh b/zsh/completions.zsh deleted file mode 100644 index 9b9facc..0000000 --- a/zsh/completions.zsh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env zsh - -fpath=("${HOME}/dotfiles/cheat.sh/shell/" $fpath) @@ -10,7 +10,6 @@ source $DOTFILES/zsh/plugins.zsh [ -n "${WSL_DISTRO_NAME+1}" ] && source $DOTFILES/shell/gpg.sh source $DOTFILES/shell/aliases.sh source $DOTFILES/zsh/setopt.zsh -source $DOTFILES/zsh/completions.zsh source $DOTFILES/zsh/keybindings.zsh eval "$(starship init zsh)" |