This commit is contained in:
Colin Powell
2020-01-06 15:44:08 -05:00
parent e390105c5d
commit 3526dc90ad
18 changed files with 66 additions and 45 deletions

View File

@ -16,11 +16,11 @@
org-agenda-window-setup 'only-window
org-pretty-entities t
org-log-done 'time
org-contacts-files '("~/org/contacts.org")
;org-contacts-files '("~/org/contacts.org")
; attempt to return todo function to spacemacs
evil-org-key-theme '(textobjects navigation additional insert todo)
;evil-org-key-theme '(textobjects navigation additional insert todo)
;; show actually italicized text instead of /italicized text/
org-agenda-block-separator ""
;org-agenda-block-separator ""
org-fontify-whole-heading-line t
org-fontify-done-headline t
org-fontify-quote-and-verse-blocks t

View File

@ -1,4 +1,4 @@
set --universal pure_version 2.3.1 # used for bug report
set --universal pure_version 2.4.2 # used for bug report
# Base colors
_pure_set_default pure_color_primary (set_color blue)
@ -14,30 +14,15 @@ _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_enable_git true
_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
# Number of running jobs
_pure_set_default pure_show_jobs false
# Print current working directory at the beginning of prompt
# true (default): current directory, git, user@hostname (ssh-only), command duration
@ -51,7 +36,6 @@ _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
# VI mode indicator
# true (default): indicate a non-insert mode by reversing the prompt symbol ()

View File

@ -42,4 +42,25 @@ 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\x2e3\x2e1
SETUVAR pure_begin_prompt_with_current_directory:true
SETUVAR pure_color_danger:\x1b\x5b31m
SETUVAR pure_color_dark:\x1b\x5b30m
SETUVAR pure_color_info:\x1b\x5b36m
SETUVAR pure_color_light:\x1b\x5b37m
SETUVAR pure_color_mute:\x1b\x5b90m
SETUVAR pure_color_normal:\x1b\x5b30m\x1b\x5bm
SETUVAR pure_color_primary:\x1b\x5b34m
SETUVAR pure_color_success:\x1b\x5b35m
SETUVAR pure_color_warning:\x1b\x5b33m
SETUVAR pure_enable_git:true
SETUVAR pure_reverse_prompt_symbol_in_vimode:true
SETUVAR pure_separate_prompt_on_error:false
SETUVAR pure_show_jobs:false
SETUVAR pure_symbol_git_dirty:\x2a
SETUVAR pure_symbol_git_unpulled_commits:\u21e3
SETUVAR pure_symbol_git_unpushed_commits:\u21e1
SETUVAR pure_symbol_prompt:\u276f
SETUVAR pure_symbol_reverse_prompt:\u276e
SETUVAR pure_symbol_title_bar_separator:\u2014
SETUVAR pure_threshold_command_duration:5
SETUVAR pure_version:2\x2e4\x2e2

View File

@ -1,4 +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]
or command git name-rev --name-only HEAD 2>/dev/null
end

View File

@ -2,9 +2,10 @@ function _pure_prompt \
--description 'Print prompt symbol' \
--argument-names exit_code
set --local jobs (_pure_prompt_jobs)
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)
echo (_pure_print_prompt $jobs $virtualenv $vimode_indicator $pure_symbol)
end

View File

@ -5,7 +5,7 @@ function _pure_prompt_command_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"
set --local command_duration_color (_pure_get_var pure_color_command_duration $pure_color_warning)
echo "$command_duration_color$command_duration"
end

View File

@ -5,7 +5,7 @@ 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"
set --local current_folder_color (_pure_get_var pure_color_current_directory $pure_color_primary)
echo "$current_folder_color$current_folder"
end

View File

@ -1,6 +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"
set --local git_branch_color (_pure_get_var pure_color_git_branch $pure_color_mute)
echo "$git_branch_color$git_branch"
end

View File

@ -11,7 +11,7 @@ function _pure_prompt_git_dirty
)
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"
set git_dirty_color (_pure_get_var pure_color_git_dirty $pure_color_mute)
end
echo "$git_dirty_color$git_dirty_symbol"

View File

@ -11,11 +11,15 @@ function _pure_prompt_git_pending_commits
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"
set --local git_unpushed_commits_color \
(_pure_get_var pure_color_git_unpushed_commits $pure_color_info)
set git_unpushed_commits "$git_unpushed_commits_color$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"
set --local git_unpulled_commits_color \
(_pure_get_var pure_color_git_unpulled_commits $pure_color_info)
set git_unpulled_commits "$git_unpulled_commits_color$pure_symbol_git_unpulled_commits"
end
end

View File

@ -1,7 +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"
set --local hostname_color (_pure_get_var pure_color_ssh_hostname $pure_color_mute)
echo "$hostname_color$hostname"
end

View File

@ -1,6 +1,6 @@
function _pure_prompt_ssh_separator
set --local separator_symbol "@"
set --local separator_symbol_color "$pure_color_ssh_separator"
set --local separator_symbol_color (_pure_get_var pure_color_ssh_separator $pure_color_mute)
echo "$separator_symbol_color$separator_symbol"
end

View File

@ -1,8 +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
set --local username_color (_pure_get_var pure_color_ssh_user_normal $pure_color_mute) # default color
if test "$username" = "root"
set username_color "$pure_color_ssh_user_root" # different color for root
set username_color (_pure_get_var pure_color_ssh_user_root $pure_color_light) # different color for root
end
echo "$username_color$username"

View File

@ -3,15 +3,18 @@ function _pure_prompt_symbol \
--argument-names exit_code
set --local prompt_symbol (_pure_get_prompt_symbol)
set --local symbol_color_success (_pure_get_var pure_color_prompt_on_success $pure_color_success)
set --local symbol_color_error (_pure_get_var pure_color_prompt_on_error $pure_color_danger)
set --local command_succeed 0
set --local color_symbol $pure_color_prompt_on_success # default pure symbol color
set --local symbol_color $symbol_color_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
set symbol_color $symbol_color_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"
set symbol_color "$symbol_color_error$prompt_symbol$symbol_color_success"
end
end
echo "$color_symbol$prompt_symbol"
echo "$symbol_color$prompt_symbol"
end

View File

@ -1,7 +1,7 @@
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"
set --local virtualenv_color (_pure_get_var pure_color_virtualenv $pure_color_mute)
echo "$virtualenv_color$virtualenv"
end

View File

@ -1,5 +1,8 @@
function _pure_set_default -S -a var default
function _pure_set_default \
--description 'Set default value for configuration variable' \
--argument-names var default
if not set -q $var
set -g $var $default
set --universal $var $default
end
end

View File

@ -2,7 +2,7 @@
add_newline = false
[hostname]
ssh_only = false
ssh_only = true
disabled = false
style = "bold green"
@ -16,7 +16,7 @@ style = "bold dimmed green"
[git_branch]
symbol = "🌱 "
truncation_length = 8
truncation_symbol = ""
truncation_symbol = "~"
[git_status]
conflicted = "🏳"

View File

@ -1,4 +1,8 @@
[Default Applications]
application/epub+zip=com.github.johnfactotum.Foliate.desktop
x-scheme-handler/http=qutebrowser.desktop
x-scheme-handler/http=org.qutebrowser.qutebrowser.desktop
x-www-browser=qutebrowser.desktop
text/html=org.qutebrowser.qutebrowser.desktop
x-scheme-handler/https=org.qutebrowser.qutebrowser.desktop
x-scheme-handler/about=org.qutebrowser.qutebrowser.desktop
x-scheme-handler/unknown=org.qutebrowser.qutebrowser.desktop