secstate/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use pure theme for #fishshell

Browse Source
This commit is contained in:
Colin Powell
2019-07-30 11:01:36 -04:00
parent a37c01cc6e
commit 224697d780
55 changed files with 914 additions and 1321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
fish/.config/fish/conf.d/.gitnow Normal file
View File

@ -0,0 +1,31 @@
[ keybindings ]
# Alt + S
state = \es
# Alt + E
stage = \ee
# Ctrl + E
unstage = \ce
# Alt + C
commit-all = \ec
# Alt + D
pull = \ed
# Alt + P
push = \ep
# Alt + U
upstream = \eu
# Alt + L
logs = \el
# Alt + F
feature = \ef
# Alt + H
hotfix = \eh

8
fish/.config/fish/conf.d/_pure_init.fish Normal file
View File

@ -0,0 +1,8 @@
# Deactivate the default virtualenv prompt so that we can add our own
set --global --export VIRTUAL_ENV_DISABLE_PROMPT 1
# Whether or not is a fresh session
set --global _pure_fresh_session true
# Register `_pure_prompt_new_line` as an event handler fot `fish_prompt`
functions -q _pure_prompt_new_line

138
fish/.config/fish/conf.d/done.fish Normal file
View File

@ -0,0 +1,138 @@
# MIT License
# Copyright (c) 2016 Francisco Lourenço & Daniel Wehner
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
set -g __done_version 1.8.0
function __done_get_focused_window_id
if type -q lsappinfo
lsappinfo info -only bundleID (lsappinfo front) | cut -d '"' -f4
else if type -q xprop
and test $DISPLAY
xprop -root 32x '\t$0' _NET_ACTIVE_WINDOW | cut -f 2
end
end
function __done_is_tmux_window_active
set -q fish_pid; or set -l fish_pid %self
not tmux list-panes -a -F "#{session_attached} #{window_active} #{pane_pid}" | string match -q "1 0 $fish_pid"
end
function __done_is_process_window_focused
# Return false if the window is not focused
if test $__done_initial_window_id != (__done_get_focused_window_id)
return 1
end
# If inside a tmux session, check if the tmux window is focused
if type -q tmux
and test -n "$TMUX"
__done_is_tmux_window_active
return $status
end
return 0
end
# verify that the system has graphical capabilites before initializing
if test -z "$SSH_CLIENT" # not over ssh
and test -n __done_get_focused_window_id # is able to get window id
set -g __done_initial_window_id ''
set -q __done_min_cmd_duration; or set -g __done_min_cmd_duration 5000
set -q __done_exclude; or set -g __done_exclude 'git (?!push|pull)'
function __done_started --on-event fish_preexec
set __done_initial_window_id (__done_get_focused_window_id)
end
function __done_ended --on-event fish_prompt
set -l exit_status $status
# backwards compatibilty for fish < v3.0
set -q cmd_duration; or set -l cmd_duration $CMD_DURATION
if test $cmd_duration
and test $cmd_duration -gt $__done_min_cmd_duration # longer than notify_duration
and not __done_is_process_window_focused # process pane or window not focused
and not string match -qr $__done_exclude $history[1] # don't notify on git commands which might wait external editor
# Store duration of last command
set -l humanized_duration (echo "$cmd_duration" | humanize_duration)
set -l title "Done in $humanized_duration"
set -l wd (pwd | sed "s,^$HOME,~,")
set -l message "$wd/ $history[1]"
set -l sender $__done_initial_window_id
# workarout terminal notifier bug when sending notifications from inside tmux
# https://github.com/julienXX/terminal-notifier/issues/216
if test $TMUX
set sender "tmux"
end
if test $exit_status -ne 0
set title "Failed ($exit_status) after $humanized_duration"
end
if set -q __done_notification_command
eval $__done_notification_command
else if type -q terminal-notifier # https://github.com/julienXX/terminal-notifier
terminal-notifier -message "$message" -title "$title" -sender "$sender" -activate "$__done_initial_window_id"
else if type -q osascript # AppleScript
osascript -e "display notification \"$message\" with title \"$title\""
else if type -q notify-send # Linux notify-send
set -l urgency
if test $exit_status -ne 0
set urgency "--urgency=critical"
end
notify-send $urgency --icon=terminal --app-name=fish "$title" "$message"
else if type -q notify-desktop # Linux notify-desktop
set -l urgency
if test $exit_status -ne 0
set urgency "--urgency=critical"
end
notify-desktop $urgency --icon=terminal --app-name=fish "$title" "$message"
else # anything else
echo -e "\a" # bell sound
end
end
end
end
function __done_uninstall -e done_uninstall
# Erase all __done_* functions
functions -e __done_ended
functions -e __done_started
functions -e __done_get_focused_window_id
functions -e __done_is_tmux_window_active
functions -e __done_is_process_window_focused
# Erase __done variables
set -e __done_version
end

238
fish/.config/fish/conf.d/gitnow.fish Normal file
View File

@ -0,0 +1,238 @@
# GitNow — Speed up your Git workflow. 🐠
# https://github.com/joseluisq/gitnow
function gitnow -d "Gitnow: Speed up your Git workflow. 🐠" -a xversion
if [ "$xversion" = "-v" ]; or [ "$xversion" = "--version" ]
echo "GitNow version $gitnow_version"
else
__gitnow_manual | command less -r
commandline -f repaint;
end
end
function state -d "Gitnow: Show the working tree status in compact way"
if not __gitnow_is_git_repository; __gitnow_msg_not_valid_repository "state"; return; end
command git status -sb
commandline -f repaint;
end
function stage -d "Gitnow: Stage files in current working directory"
if not __gitnow_is_git_repository; __gitnow_msg_not_valid_repository "stage"; return; end
set -l len (count $argv)
set -l opts .
if test $len -gt 0
set opts $argv
end
command git add $opts
commandline -f repaint;
end
function unstage -d "Gitnow: Unstage files in current working directory"
if not __gitnow_is_git_repository; __gitnow_msg_not_valid_repository "unstage"; return; end
set -l len (count $argv)
set -l opts .
if test $len -gt 0
set opts $argv
end
command git reset $opts
commandline -f repaint;
end
function commit -d "Gitnow: Commit changes to the repository"
if not __gitnow_is_git_repository; __gitnow_msg_not_valid_repository "commit"; return; end
set -l len (count $argv)
if test $len -gt 0
command git commit $argv
else
command git commit
end
commandline -f repaint;
end
function commit-all -d "Gitnow: Add and commit all changes to the repository"
if not __gitnow_is_git_repository; __gitnow_msg_not_valid_repository "commit-all"; return; end
stage
commit .
end
function pull -d "Gitnow: Pull changes from remote server but saving uncommitted changes"
if not __gitnow_is_git_repository; __gitnow_msg_not_valid_repository "pull"; return; end
set -l len (count $argv)
set -l xorigin (__gitnow_current_remote)
set -l xbranch (__gitnow_current_branch_name)
set -l xcmd ""
echo "⚡️ Pulling changes..."
set -l xdefaults --rebase --autostash
if test $len -gt 2
set xcmd $argv
echo "Mode: Manual"
echo "Default flags: $xdefaults"
echo
else
echo "Mode: Auto"
echo "Default flags: $xdefaults"
if test $len -eq 1
set xbranch $argv[1]
end
if test $len -eq 2
set xorigin $argv[1]
set xbranch $argv[2]
end
set xcmd $xorigin $xbranch
set -l xremote_url (command git config --get "remote.$xorigin.url")
echo "Remote URL: $xorigin ($xremote_url)"
echo "Remote branch: $xbranch"
echo
end
command git pull $xcmd $xdefaults
commandline -f repaint;
end
# Git push with --set-upstream
# Shortcut inspired from https://github.com/jamiew/git-friendly
function push -d "Gitnow: Push commit changes to remote repository"
if not __gitnow_is_git_repository; __gitnow_msg_not_valid_repository "push"; return; end
set -l opts $argv
set -l xorigin (__gitnow_current_remote)
set -l xbranch (__gitnow_current_branch_name)
echo "🚀 Pushing changes..."
if test (count $opts) -eq 0
set opts $xorigin $xbranch
set -l xremote_url (command git config --get "remote.$xorigin.url")
echo "Mode: Auto"
echo "Remote URL: $xorigin ($xremote_url)"
echo "Remote branch: $xbranch"
else
echo "Mode: Manual"
end
echo
command git push --set-upstream $opts
commandline -f repaint;
end
function upstream -d "Gitnow: Commit all changes and push them to remote server"
if not __gitnow_is_git_repository; __gitnow_msg_not_valid_repository "upstream"; return; end
commit-all
push
end
function feature -d "GitNow: Creates a new Gitflow feature branch from current branch" -a xbranch
if not __gitnow_is_git_repository; __gitnow_msg_not_valid_repository "feature"; return; end
__gitnow_gitflow_branch "feature" $xbranch
commandline -f repaint;
end
function hotfix -d "GitNow: Creates a new Gitflow hotfix branch from current branch" -a xbranch
if not __gitnow_is_git_repository; __gitnow_msg_not_valid_repository "hotfix"; return; end
__gitnow_gitflow_branch "hotfix" $xbranch
commandline -f repaint;
end
function bugfix -d "GitNow: Creates a new Gitflow bugfix branch from current branch" -a xbranch
if not __gitnow_is_git_repository; __gitnow_msg_not_valid_repository "bugfix"; return; end
__gitnow_gitflow_branch "bugfix" $xbranch
commandline -f repaint;
end
function release -d "GitNow: Creates a new Gitflow release branch from current branch" -a xbranch
if not __gitnow_is_git_repository; __gitnow_msg_not_valid_repository "release"; return; end
__gitnow_gitflow_branch "release" $xbranch
commandline -f repaint;
end
function move -d "GitNow: Switch from current branch to another but stashing uncommitted changes" -a xupstream -a xbranch
if not __gitnow_is_git_repository; __gitnow_msg_not_valid_repository "move"; return; end
if [ "$xupstream" != "-u" ]; and [ "$xupstream" != "--upstream" ]
set xbranch $xupstream
set xupstream ""
end
if test -n "$xbranch"
if [ "$xupstream" = "-u" ]; or [ "$xupstream" = "--upstream" ]
command git stash
command git fetch (__gitnow_current_remote) $xbranch
command git checkout $xbranch
command git stash pop
else
set -l xfound (__gitnow_check_if_branch_exist $xbranch)
if test $xfound -eq 1
if [ "$xbranch" = (__gitnow_current_branch_name) ]
echo "Branch `$xbranch` is the same like current branch. Nothing to do."
else
command git stash
command git checkout $xbranch
command git stash pop
end
else
echo "Branch `$xbranch` was not found. No possible to switch."
echo "Tip: Use -u (--upstream) flag to fetch a remote branch."
end
end
else
echo "Provide a branch name to move."
end
commandline -f repaint;
end
function logs -d "Gitnow: Shows logs in a fancy way"
if not __gitnow_is_git_repository; __gitnow_msg_not_valid_repository "logs"; return; end
set -l args HEAD
if test -n "$argv"
set args $argv
end
command git log $args --color --graph --pretty=format:"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset" --abbrev-commit | command less -r
commandline -f repaint;
end
function github -d "Gitnow: Clone a GitHub repository using SSH"
set -l repo (__gitnow_clone_params $argv)
__gitnow_clone_repo $repo "github"
commandline -f repaint;
end
function bitbucket -d "Gitnow: Clone a Bitbucket Cloud repository using SSH"
set -l repo (__gitnow_clone_params $argv)
__gitnow_clone_repo $repo "bitbucket"
commandline -f repaint;
end

16
fish/.config/fish/conf.d/gitnow_config.fish Normal file
View File

@ -0,0 +1,16 @@
# GitNow — Speed up your Git workflow. 🐠
# https://github.com/joseluisq/gitnow
set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config
set -q fish_config; or set -g fish_config $XDG_CONFIG_HOME/fish
set -q fish_snippets; or set -g fish_snippets "$fish_config/conf.d"
set -q fish_functions; or set -g fish_functions "$fish_config/functions"
set -q GITNOW_CONFIG_FILE; or set -g GITNOW_CONFIG_FILE ~/.gitnow
set -g gitnow_version 2.1.1
source "$fish_functions/__gitnow_functions.fish"
source "$fish_functions/__gitnow_manual.fish"
source "$fish_functions/__gitnow_config_file.fish"
__gitnow_read_config

65
fish/.config/fish/conf.d/pure.fish Normal file
View File

@ -0,0 +1,65 @@
set --universal pure_version 2.1.8 # used for bug report
# Base colors
_pure_set_default pure_color_primary (set_color blue)
_pure_set_default pure_color_info (set_color cyan)
_pure_set_default pure_color_mute (set_color brblack)
_pure_set_default pure_color_success (set_color magenta)
_pure_set_default pure_color_normal (set_color normal)
_pure_set_default pure_color_danger (set_color red)
_pure_set_default pure_color_light (set_color white)
_pure_set_default pure_color_warning (set_color yellow)
_pure_set_default pure_color_dark (set_color black)
# Prompt
_pure_set_default pure_symbol_prompt "❯"
_pure_set_default pure_symbol_reverse_prompt "❮" # used for VI mode
_pure_set_default pure_color_prompt_on_error $pure_color_danger
_pure_set_default pure_color_prompt_on_success $pure_color_success
# Current Working Directory
_pure_set_default pure_color_current_directory $pure_color_primary
# Git
_pure_set_default pure_symbol_git_unpulled_commits "⇣"
_pure_set_default pure_symbol_git_unpushed_commits "⇡"
_pure_set_default pure_symbol_git_dirty "*"
_pure_set_default pure_color_git_unpulled_commits $pure_color_info
_pure_set_default pure_color_git_unpushed_commits $pure_color_info
_pure_set_default pure_color_git_branch $pure_color_mute
_pure_set_default pure_color_git_dirty $pure_color_mute
# SSH info
_pure_set_default pure_color_ssh_hostname $pure_color_mute
_pure_set_default pure_color_ssh_separator $pure_color_mute
_pure_set_default pure_color_ssh_user_normal $pure_color_mute
_pure_set_default pure_color_ssh_user_root $pure_color_light
# Virtualenv for Pyhon
_pure_set_default pure_color_virtualenv $pure_color_mute
# Print current working directory at the beginning of prompt
# true (default): current directory, git, user@hostname (ssh-only), command duration
# false: user@hostname (ssh-only), current directory, git, command duration
_pure_set_default pure_begin_prompt_with_current_directory true
# Show exit code of last command as a separate prompt character (cf. https://github.com/sindresorhus/pure/wiki#show-exit-code-of-last-command-as-a-separate-prompt-character)
# false - single prompt character, default
# true - separate prompt character
_pure_set_default pure_separate_prompt_on_error false
# Max execution time of a process before its run time is shown when it exits
_pure_set_default pure_threshold_command_duration 5
_pure_set_default pure_color_command_duration $pure_color_warning
# Right Prompt variables
_pure_set_default pure_right_prompt ""
_pure_set_default pure_color_right_prompt $pure_color_normal
# VI mode indicator
# true (default): indicate a non-insert mode by reversing the prompt symbol (❮)
# false: indicate vi mode with [I], [N], [V]
_pure_set_default pure_reverse_prompt_symbol_in_vimode true
# Title
_pure_set_default pure_symbol_title_bar_separator "—"

1
fish/.config/fish/config.fish
View File

@ -3,4 +3,5 @@ set -gx PATH ~/.fzf/bin $PATH
fzf_key_bindings
set -gx PATH ~/.asdf/installs/rust/1.36.0/bin $PATH
set -gx PATH ~/.emacs.d/bin $PATH
set -gx EDITOR vim $EDITOR
eval (python -m virtualfish)

2
fish/.config/fish/fish_variables
View File

@ -8,6 +8,7 @@ SETUVAR FZF_TMUX_HEIGHT:40\x25
SETUVAR --export TERM:screen\x2d256color
SETUVAR THEME_EDEN_PROMPT_CHAR:\u00bb
SETUVAR Z_DATA_DIR:/Users/colinpowell/\x2elocal/share/z
SETUVAR __done_min_cmd_duration:5000
SETUVAR __fish_init_2_39_8:\x1d
SETUVAR __fish_init_2_3_0:\x1d
SETUVAR __fish_init_3_x:\x1d
@ -41,3 +42,4 @@ SETUVAR fish_pager_color_description:B3A06D\x1eyellow
SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
SETUVAR fish_user_paths:/Users/colinpowell/\x2efzf/bin
SETUVAR pure_version:2\x2e1\x2e8

5
fish/.config/fish/fishfile
View File

@ -2,4 +2,7 @@ edc/bass
jethrokuan/fzf
2m/fish-gpg-tty
oh-my-fish/plugin-direnv
oh-my-fish/theme-bobthefish
joseluisq/gitnow
fishpkg/fish-git-util
rafaelrinaldi/pure
franciscolourenco/done

32
fish/.config/fish/functions/_pure_format_time.fish Normal file
View File

@ -0,0 +1,32 @@
set fail 1
function _pure_format_time \
--description="Format milliseconds to a human readable format" \
--argument-names milliseconds threshold
if test $milliseconds -lt 0; return $fail; end
set --local seconds (math -s0 "$milliseconds / 1000 % 60")
set --local minutes (math -s0 "$milliseconds / 60000 % 60")
set --local hours (math -s0 "$milliseconds / 3600000 % 24")
set --local days (math -s0 "$milliseconds / 86400000")
set --local time
if test $days -gt 0
set time $time (printf "%sd" $days)
end
if test $hours -gt 0
set time $time (printf "%sh" $hours)
end
if test $minutes -gt 0
set time $time (printf "%sm" $minutes)
end
if test $seconds -gt $threshold
set time $time (printf "%ss" $seconds)
end
echo -e (string join ' ' $time)
end

14
fish/.config/fish/functions/_pure_get_prompt_symbol.fish Normal file
View File

@ -0,0 +1,14 @@
function _pure_get_prompt_symbol \
--description 'Print prompt symbol' \
--argument-names exit_code
set --local prompt_symbol $pure_symbol_prompt
set --local is_vi_mode (string match -r "fish_(vi|hybrid)_key_bindings" $fish_key_bindings)
if test -n "$is_vi_mode" \
-a "$pure_reverse_prompt_symbol_in_vimode" = true \
-a "$fish_bind_mode" != "insert"
set prompt_symbol $pure_symbol_reverse_prompt
end
echo "$prompt_symbol"
end

14
fish/.config/fish/functions/_pure_parse_directory.fish Normal file
View File

@ -0,0 +1,14 @@
function _pure_parse_directory \
--description "Replace '$HOME' with '~'" \
--argument-names max_path_length
set --local folder (string replace $HOME '~' $PWD)
if test -n "$max_path_length";
if test (string length $folder) -gt $max_path_length;
# If path exceeds maximum symbol limit, use default fish path formating function
set folder (prompt_pwd)
end
end
echo $folder
end

4
fish/.config/fish/functions/_pure_parse_git_branch.fish Normal file
View File

@ -0,0 +1,4 @@
function _pure_parse_git_branch --description "Parse current Git branch name"
command git symbolic-ref --short HEAD 2>/dev/null;
or echo (command git show-ref --head -s --abbrev HEAD)[1]
end

11
fish/.config/fish/functions/_pure_print_prompt.fish Normal file
View File

@ -0,0 +1,11 @@
function _pure_print_prompt
set --local prompt
for prompt_part in $argv
if test (_pure_string_width $prompt_part) -gt 0
set prompt "$prompt $prompt_part"
end
end
echo (string trim -l $prompt)
end

10
fish/.config/fish/functions/_pure_prompt.fish Normal file
View File

@ -0,0 +1,10 @@
function _pure_prompt \
--description 'Print prompt symbol' \
--argument-names exit_code
set --local virtualenv (_pure_prompt_virtualenv) # Python virtualenv name
set --local vimode_indicator (_pure_prompt_vimode) # vi-mode indicator
set --local pure_symbol (_pure_prompt_symbol $exit_code)
echo (_pure_print_prompt $virtualenv $vimode_indicator $pure_symbol)
end

6
fish/.config/fish/functions/_pure_prompt_beginning.fish Normal file
View File

@ -0,0 +1,6 @@
function _pure_prompt_beginning
# Clear existing line content
set --local clear_line "\r\033[K"
echo $clear_line
end

11
fish/.config/fish/functions/_pure_prompt_command_duration.fish Normal file
View File

@ -0,0 +1,11 @@
function _pure_prompt_command_duration
set --local command_duration
# Get command execution duration
if test -n "$CMD_DURATION"
set command_duration (_pure_format_time $CMD_DURATION $pure_threshold_command_duration)
end
set --local command_duration_color "$pure_color_command_duration"
echo "$command_duration_color$command_duration"
end

11
fish/.config/fish/functions/_pure_prompt_current_folder.fish Normal file
View File

@ -0,0 +1,11 @@
set fail 1
function _pure_prompt_current_folder --argument-names current_prompt_width
if test -z "$current_prompt_width"; return $fail; end
set --local current_folder (_pure_parse_directory (math $COLUMNS - $current_prompt_width - 1))
set --local current_folder_color "$pure_color_current_directory"
echo "$current_folder_color$current_folder"
end

3
fish/.config/fish/functions/_pure_prompt_ending.fish Normal file
View File

@ -0,0 +1,3 @@
function _pure_prompt_ending
echo "$pure_color_normal "
end

32
fish/.config/fish/functions/_pure_prompt_first_line.fish Normal file
View File

@ -0,0 +1,32 @@
function _pure_prompt_first_line \
--description 'Print contextual information before prompt.'
if not type -fq git # exit if git is not available
return 1
end
set --local prompt (_pure_print_prompt \
(_pure_prompt_ssh) \
(_pure_prompt_git) \
(_pure_prompt_command_duration)
)
set --local prompt_width (_pure_string_width $prompt)
set --local current_folder (_pure_prompt_current_folder $prompt_width)
set --local prompt_components
if test $pure_begin_prompt_with_current_directory = true
set prompt_components \
(_pure_prompt_current_folder $prompt_width) \
(_pure_prompt_git) \
(_pure_prompt_ssh) \
(_pure_prompt_command_duration)
else
set prompt_components \
(_pure_prompt_ssh) \
(_pure_prompt_current_folder $prompt_width) \
(_pure_prompt_git) \
(_pure_prompt_command_duration)
end
echo (_pure_print_prompt $prompt_components)
end

16
fish/.config/fish/functions/_pure_prompt_git.fish Normal file
View File

@ -0,0 +1,16 @@
function _pure_prompt_git \
--description 'Print git repository informations: branch name, dirty, upstream ahead/behind'
set --local is_git_repository (command git rev-parse --is-inside-work-tree 2>/dev/null)
if test -n "$is_git_repository"
set --local git_prompt (_pure_prompt_git_branch)(_pure_prompt_git_dirty)
set --local git_pending_commits (_pure_prompt_git_pending_commits)
if test (_pure_string_width $git_pending_commits) -ne 0
set git_prompt $git_prompt $git_pending_commits
end
echo $git_prompt
end
end

6
fish/.config/fish/functions/_pure_prompt_git_branch.fish Normal file
View File

@ -0,0 +1,6 @@
function _pure_prompt_git_branch
set --local git_branch (_pure_parse_git_branch) # current git branch
set --local git_branch_color "$pure_color_git_branch"
echo "$git_branch_color$git_branch"
end

12
fish/.config/fish/functions/_pure_prompt_git_dirty.fish Normal file
View File

@ -0,0 +1,12 @@
function _pure_prompt_git_dirty
set --local git_dirty_symbol
set --local git_dirty_color
set --local is_git_dirty (command git status --porcelain --ignore-submodules 2>/dev/null)
if test -n "$is_git_dirty" # untracked or un-commited files
set git_dirty_symbol "$pure_symbol_git_dirty"
set git_dirty_color "$pure_color_git_dirty"
end
echo "$git_dirty_color$git_dirty_symbol"
end

23
fish/.config/fish/functions/_pure_prompt_git_pending_commits.fish Normal file
View File

@ -0,0 +1,23 @@
function _pure_prompt_git_pending_commits
set --local git_unpushed_commits
set --local git_unpulled_commits
set --local has_upstream (command git rev-parse --abbrev-ref '@{upstream}' 2>/dev/null)
if test -n "$has_upstream" # check there is an upstream repo configured
and test "$has_upstream" != '@{upstream}' # Fixed #179, dont check the empty repo
command git rev-list --left-right --count 'HEAD...@{upstream}' \
| read --local --array git_status
set --local commit_to_push $git_status[1]
set --local commit_to_pull $git_status[2]
if test $commit_to_push -gt 0 # upstream is behind local repo
set git_unpushed_commits "$pure_color_git_unpushed_commits$pure_symbol_git_unpushed_commits"
end
if test $commit_to_pull -gt 0 # upstream is ahead of local repo
set git_unpulled_commits "$pure_color_git_unpulled_commits$pure_symbol_git_unpulled_commits"
end
end
echo "$git_unpushed_commits$git_unpulled_commits"
end

11
fish/.config/fish/functions/_pure_prompt_new_line.fish Normal file
View File

@ -0,0 +1,11 @@
function _pure_prompt_new_line \
--description "Do not add a line break to a brand new session" \
--on-event fish_prompt
set --local new_line
if test $_pure_fresh_session = false
set new_line "\n"
end
echo -e -n "$new_line"
end

5
fish/.config/fish/functions/_pure_prompt_ssh.fish Normal file
View File

@ -0,0 +1,5 @@
function _pure_prompt_ssh
if test "$SSH_CONNECTION" != ""
echo (_pure_prompt_ssh_user)(_pure_prompt_ssh_separator)(_pure_prompt_ssh_host)
end
end

7
fish/.config/fish/functions/_pure_prompt_ssh_host.fish Normal file
View File

@ -0,0 +1,7 @@
function _pure_prompt_ssh_host
set --query --global hostname
or set --local hostname (hostname -s) # current host name compatible busybox
set --local hostname_color "$pure_color_ssh_hostname"
echo "$hostname_color$hostname"
end

6
fish/.config/fish/functions/_pure_prompt_ssh_separator.fish Normal file
View File

@ -0,0 +1,6 @@
function _pure_prompt_ssh_separator
set --local separator_symbol "@"
set --local separator_symbol_color "$pure_color_ssh_separator"
echo "$separator_symbol_color$separator_symbol"
end

9
fish/.config/fish/functions/_pure_prompt_ssh_user.fish Normal file
View File

@ -0,0 +1,9 @@
function _pure_prompt_ssh_user
set --local username (whoami) # current user name
set --local username_color "$pure_color_ssh_user_normal" # default color
if test "$username" = "root"
set username_color "$pure_color_ssh_user_root" # different color for root
end
echo "$username_color$username"
end

17
fish/.config/fish/functions/_pure_prompt_symbol.fish Normal file
View File

@ -0,0 +1,17 @@
function _pure_prompt_symbol \
--description 'Print prompt symbol' \
--argument-names exit_code
set --local prompt_symbol (_pure_get_prompt_symbol)
set --local command_succeed 0
set --local color_symbol $pure_color_prompt_on_success # default pure symbol color
if test $exit_code -ne $command_succeed
set color_symbol $pure_color_prompt_on_error # different pure symbol color when previous command failed
if test "$pure_separate_prompt_on_error" = true
set color_symbol "$pure_color_prompt_on_error$prompt_symbol$pure_color_prompt_on_success"
end
end
echo "$color_symbol$prompt_symbol"
end

5
fish/.config/fish/functions/_pure_prompt_vimode.fish Normal file
View File

@ -0,0 +1,5 @@
function _pure_prompt_vimode
if test $pure_reverse_prompt_symbol_in_vimode = false
echo (fish_default_mode_prompt)
end
end

8
fish/.config/fish/functions/_pure_prompt_virtualenv.fish Normal file
View File

@ -0,0 +1,8 @@
function _pure_prompt_virtualenv --description "Display virtualenv directory"
if test -n "$VIRTUAL_ENV"
set --local virtualenv (basename "$VIRTUAL_ENV")
set --local virtualenv_color "$pure_color_virtualenv"
echo "$virtualenv_color$virtualenv"
end
end

5
fish/.config/fish/functions/_pure_set_default.fish Normal file
View File

@ -0,0 +1,5 @@
function _pure_set_default -S -a var default
if not set -q $var
set -g $var $default
end
end

9
fish/.config/fish/functions/_pure_string_width.fish Normal file
View File

@ -0,0 +1,9 @@
function _pure_string_width \
--description 'returns raw string length, i.e. ignore ANSI-color' \
--argument-names prompt
set --local empty ''
set --local raw_prompt (string replace --all --regex '\e\[[^m]*m' $empty -- $prompt)
string length -- $raw_prompt
end

133
fish/.config/fish/functions/bobthefish_display_colors.fish
View File

@ -1,133 +0,0 @@
function bobthefish_display_colors -a color_scheme -d 'Print example prompt color schemes'
set -l color_schemes default light \
solarized solarized-light \
base16 base16-light \
gruvbox zenburn \
dracula \
terminal terminal-dark-white \
terminal-light terminal-light-black \
terminal2 terminal2-dark-white \
terminal2-light terminal2-light-black
switch "$color_scheme"
case '--all'
for scheme in $color_schemes
echo
echo "$scheme:"
bobthefish_display_colors $scheme
end
return
case $color_schemes
__bobthefish_colors $color_scheme
case ''
__bobthefish_colors $theme_color_scheme
type -q bobthefish_colors
and bobthefish_colors
case '*'
echo 'usage: bobthefish_display_colors [--all] [color_scheme]'
return
end
__bobthefish_glyphs
echo
set_color normal
__bobthefish_start_segment $color_initial_segment_exit
echo -n exit $nonzero_exit_glyph
set_color -b $color_initial_segment_su
echo -n su $superuser_glyph
set_color -b $color_initial_segment_jobs
echo -n jobs $bg_job_glyph
__bobthefish_finish_segments
set_color normal
echo -n "(<- initial_segment)"
echo
__bobthefish_start_segment $color_path
echo -n /color/path/
set_color -b $color_path_basename
echo -ns basename ' '
__bobthefish_finish_segments
echo
__bobthefish_start_segment $color_path_nowrite
echo -n /color/path/nowrite/
set_color -b $color_path_nowrite_basename
echo -ns basename ' '
__bobthefish_finish_segments
echo
__bobthefish_start_segment $color_path
echo -n /color/path/
set_color -b $color_path_basename
echo -ns basename ' '
__bobthefish_start_segment $color_repo
echo -n "$branch_glyph repo $git_stashed_glyph "
__bobthefish_finish_segments
echo
__bobthefish_start_segment $color_path
echo -n /color/path/
set_color -b $color_path_basename
echo -ns basename ' '
__bobthefish_start_segment $color_repo_dirty
echo -n "$tag_glyph repo_dirty $git_dirty_glyph "
__bobthefish_finish_segments
echo
__bobthefish_start_segment $color_path
echo -n /color/path/
set_color -b $color_path_basename
echo -ns basename ' '
__bobthefish_start_segment $color_repo_staged
echo -n "$detached_glyph repo_staged $git_staged_glyph "
__bobthefish_finish_segments
echo
__bobthefish_start_segment $color_vi_mode_default
echo -ns vi_mode_default ' '
__bobthefish_finish_segments
__bobthefish_start_segment $color_vi_mode_insert
echo -ns vi_mode_insert ' '
__bobthefish_finish_segments
__bobthefish_start_segment $color_vi_mode_visual
echo -ns vi_mode_visual ' '
__bobthefish_finish_segments
echo
__bobthefish_start_segment $color_vagrant
echo -ns $vagrant_running_glyph ' ' vagrant ' '
__bobthefish_finish_segments
echo
__bobthefish_start_segment $color_username
echo -n username
set_color normal
set_color -b $color_hostname[1] $color_hostname[2..-1]
echo -ns @hostname ' '
__bobthefish_finish_segments
echo
__bobthefish_start_segment $color_rvm
echo -ns $ruby_glyph rvm ' '
__bobthefish_finish_segments
__bobthefish_start_segment $color_virtualfish
echo -ns $virtualenv_glyph virtualfish ' '
__bobthefish_finish_segments
__bobthefish_start_segment $color_virtualgo
echo -ns $go_glyph virtualgo ' '
__bobthefish_finish_segments
__bobthefish_start_segment $color_desk
echo -ns $desk_glyph desk ' '
__bobthefish_finish_segments
echo -e "\n"
end

5
fish/.config/fish/functions/ffup.fish Normal file
View File

@ -0,0 +1,5 @@
function ffup
pushd ~/src/ff/fifteen5
docker-compose up -d
popd
end

10
fish/.config/fish/functions/fish_greeting.fish
View File

@ -1,10 +1,2 @@
function fish_greeting -d "What's up, fish?"
set_color $fish_color_autosuggestion
uname -nmsr
# TODO: `command -q -s` only works on fish 2.5+, so hold off on that for now
command -s uptime >/dev/null
and uptime
set_color normal
function fish_greeting
end

7
fish/.config/fish/functions/fish_mode_prompt.fish
View File

@ -1,9 +1,2 @@
# This is handled inside fish_mode_prompt (see `__bobthefish_prompt_vi`)
#
# If you want to override this with your own mode prompt, disable bobthefish's
# built-in mode prompt in your fish config:
#
# set -g theme_display_vi no
function fish_mode_prompt
end

1070
fish/.config/fish/functions/fish_prompt.fish
View File

File diff suppressed because it is too large Load Diff

80
fish/.config/fish/functions/fish_right_prompt.fish
View File

@ -1,79 +1,5 @@
# You can override some default right prompt options in your config.fish:
# set -g theme_date_format "+%a %H:%M"
function fish_right_prompt \
--description "Let user override prompt"
function __bobthefish_cmd_duration -S -d 'Show command duration'
[ "$theme_display_cmd_duration" = "no" ]
and return
[ -z "$CMD_DURATION" -o "$CMD_DURATION" -lt 100 ]
and return
if [ "$CMD_DURATION" -lt 5000 ]
echo -ns $CMD_DURATION 'ms'
else if [ "$CMD_DURATION" -lt 60000 ]
__bobthefish_pretty_ms $CMD_DURATION s
else if [ "$CMD_DURATION" -lt 3600000 ]
set_color $fish_color_error
__bobthefish_pretty_ms $CMD_DURATION m
else
set_color $fish_color_error
__bobthefish_pretty_ms $CMD_DURATION h
end
set_color $fish_color_normal
set_color $fish_color_autosuggestion
[ "$theme_display_date" = "no" ]
or echo -ns ' ' $__bobthefish_left_arrow_glyph
end
function __bobthefish_pretty_ms -S -a ms -a interval -d 'Millisecond formatting for humans'
set -l interval_ms
set -l scale 1
switch $interval
case s
set interval_ms 1000
case m
set interval_ms 60000
case h
set interval_ms 3600000
set scale 2
end
switch $FISH_VERSION
case 2.0.\* 2.1.\* 2.2.\* 2.3.\*
# Fish 2.3 and lower doesn't know about the -s argument to math.
math "scale=$scale;$ms/$interval_ms" | string replace -r '\\.?0*$' $interval
case 2.\*
# Fish 2.x always returned a float when given the -s argument.
math -s$scale "$ms/$interval_ms" | string replace -r '\\.?0*$' $interval
case \*
math -s$scale "$ms/$interval_ms"
echo -ns $interval
end
end
function __bobthefish_timestamp -S -d 'Show the current timestamp'
[ "$theme_display_date" = "no" ]
and return
set -q theme_date_format
or set -l theme_date_format "+%c"
echo -n ' '
date $theme_date_format
end
function fish_right_prompt -d 'bobthefish is all about the right prompt'
set -l __bobthefish_left_arrow_glyph \uE0B3
if [ "$theme_powerline_fonts" = "no" ]
set __bobthefish_left_arrow_glyph '<'
end
set_color $fish_color_autosuggestion
__bobthefish_cmd_duration
__bobthefish_timestamp
set_color normal
printf "%s%s%s" $pure_color_right_prompt "$pure_right_prompt" $pure_color_normal
end

44
fish/.config/fish/functions/fish_title.fish
View File

@ -1,34 +1,16 @@
# You can override some default title options in your config.fish:
# set -g theme_title_display_process no
# set -g theme_title_display_path no
# set -g theme_title_display_user yes
# set -g theme_title_use_abbreviated_path no
function fish_title \
--description "Set title to current folder and shell name" \
--argument-names last_command
function __bobthefish_title_user -S -d 'Display actual user if different from $default_user'
if [ "$theme_title_display_user" = 'yes' ]
if [ "$USER" != "$default_user" -o -n "$SSH_CLIENT" ]
set -l IFS .
hostname | read -l hostname __
echo -ns (whoami) '@' $hostname ' '
end
end
end
function fish_title
__bobthefish_title_user
if [ "$theme_title_display_process" = 'yes' ]
echo $_
[ "$theme_title_display_path" != 'no' ]
and echo ' '
end
if [ "$theme_title_display_path" != 'no' ]
if [ "$theme_title_use_abbreviated_path" = 'no' ]
echo $PWD
else
prompt_pwd
end
set --local basename (string replace -r '^.*/' '' -- $PWD)
set --local current_folder (_pure_parse_directory)
set --local current_command (status current-command 2>/dev/null; or echo $_)
set --local prompt "$basename: $last_command $pure_symbol_title_bar_separator $current_command"
if test -z "$last_command"
set prompt "$current_folder $pure_symbol_title_bar_separator $current_command"
end
echo $prompt
end

8
fish/.config/fish/functions/git_ahead.fish Normal file
View File

@ -0,0 +1,8 @@
function git_ahead -a ahead behind diverged none
command git rev-list --count --left-right "@{upstream}...HEAD" 2>/dev/null | command awk "
/^0\t0/ { print \"$none\" ? \"$none\" : \"\"; exit 0 }
/^[0-9]+\t0/ { print \"$behind\" ? \"$behind\" : \"-\"; exit 0 }
/^0\t[0-9]+/ { print \"$ahead\" ? \"$ahead\" : \"+\"; exit 0 }
// { print \"$diverged\" ? \"$diverged\" : \"±\"; exit 0 }
"
end

15
fish/.config/fish/functions/git_branch_name.fish Normal file
View File

@ -0,0 +1,15 @@
function git_branch_name -d "Get the name of the current Git branch, tag or sha1"
set -l branch_name (command git symbolic-ref --short HEAD 2>/dev/null)
if test -z "$branch_name"
set -l tag_name (command git describe --tags --exact-match HEAD 2>/dev/null)
if test -z "$tag_name"
command git rev-parse --short HEAD 2>/dev/null
else
printf "%s\n" "$tag_name"
end
else
printf "%s\n" "$branch_name"
end
end

3
fish/.config/fish/functions/git_is_detached_head.fish Normal file
View File

@ -0,0 +1,3 @@
function git_is_detached_head -d "Test if the repository is in a detached HEAD state"
git_is_repo; and not command git symbolic-ref HEAD 2>/dev/null > /dev/null
end

3
fish/.config/fish/functions/git_is_dirty.fish Normal file
View File

@ -0,0 +1,3 @@
function git_is_dirty -d "Test if there are changes not staged for commit"
git_is_repo; and not command git diff --no-ext-diff --quiet --exit-code 2>/dev/null
end

3
fish/.config/fish/functions/git_is_empty.fish Normal file
View File

@ -0,0 +1,3 @@
function git_is_empty -d "Test if a repository is empty"
git_is_repo; and test -z (command git rev-list -n 1 --all 2>/dev/null)
end

5
fish/.config/fish/functions/git_is_repo.fish Normal file
View File

@ -0,0 +1,5 @@
function git_is_repo -d "Test if the current directory is a Git repository"
if not command git rev-parse --git-dir > /dev/null 2>/dev/null
return 1
end
end

3
fish/.config/fish/functions/git_is_staged.fish Normal file
View File

@ -0,0 +1,3 @@
function git_is_staged -d "Test if there are changes staged for commit"
git_is_repo; and not command git diff --cached --no-ext-diff --quiet --exit-code 2>/dev/null
end

3
fish/.config/fish/functions/git_is_stashed.fish Normal file
View File

@ -0,0 +1,3 @@
function git_is_stashed -d "Test if there are changes in the Git stash"
command git rev-parse --verify --quiet refs/stash > /dev/null 2>/dev/null
end

3
fish/.config/fish/functions/git_is_tag.fish Normal file
View File

@ -0,0 +1,3 @@
function git_is_tag -d "Test if HEAD is on top of a tag (can be simple, annotated or signed)"
git_is_detached_head; and command git describe --tags --exact-match HEAD 2>/dev/null > /dev/null
end

3
fish/.config/fish/functions/git_is_touched.fish Normal file
View File

@ -0,0 +1,3 @@
function git_is_touched -d "Test if there are any changes in the working tree"
git_is_staged; or git_is_dirty
end

3
fish/.config/fish/functions/git_repository_root.fish Normal file
View File

@ -0,0 +1,3 @@
function git_repository_root -d "Get the top level directory of the current git repository"
git_is_repo; and command git rev-parse --show-toplevel
end

15
fish/.config/fish/functions/git_untracked_files.fish Normal file
View File

@ -0,0 +1,15 @@
function git_untracked_files -d "Get the number of untracked files in a repository"
git_is_repo; and command git ls-files --others --exclude-standard | command awk '
BEGIN {
n = 0
}
{ n++ }
END {
print n
exit !n
}
'
end

19
fish/.config/fish/functions/humanize_duration.fish Normal file
View File

@ -0,0 +1,19 @@
function humanize_duration -d "Make a time interval human readable"
command awk '
function hmTime(time, stamp) {
split("h:m:s:ms", units, ":")
for (i = 2; i >= -1; i--) {
if (t = int( i < 0 ? time % 1000 : time / (60 ^ i * 1000) % 60 )) {
stamp = stamp t units[sqrt((i - 2) ^ 2) + 1] " "
}
}
if (stamp ~ /^ *$/) {
return "0ms"
}
return substr(stamp, 1, length(stamp) - 1)
}
{
print hmTime($0)
}
'
end

9
ssh/.ssh/config
View File

@ -7,6 +7,15 @@ Host *
AddKeysToAgent yes
IdentityFile ~/.ssh/1904_powellc
# Work GitHub account:
Host work-github.com
HostName github.com
User git
IdentityFile ~/.ssh/id_ed25519_15five
PreferredAuthentications publickey
PasswordAuthentication no
IdentitiesOnly yes
Host sdf.org
User secstate