From 3526dc90ade4fee751858991eafe0f26c83c57fe Mon Sep 17 00:00:00 2001
From: Colin Powell <colin@onec.me>
Date: Mon, 6 Jan 2020 15:44:08 -0500
Subject: [PATCH] Updates

---
 emacs/.config/doom/+org.el                    |  6 ++---
 fish/.config/fish/conf.d/pure.fish            | 22 +++---------------
 fish/.config/fish/fish_variables              | 23 ++++++++++++++++++-
 .../functions/_pure_parse_git_branch.fish     |  2 +-
 fish/.config/fish/functions/_pure_prompt.fish |  3 ++-
 .../_pure_prompt_command_duration.fish        |  2 +-
 .../_pure_prompt_current_folder.fish          |  2 +-
 .../functions/_pure_prompt_git_branch.fish    |  2 +-
 .../functions/_pure_prompt_git_dirty.fish     |  2 +-
 .../_pure_prompt_git_pending_commits.fish     |  8 +++++--
 .../fish/functions/_pure_prompt_ssh_host.fish |  2 +-
 .../functions/_pure_prompt_ssh_separator.fish |  2 +-
 .../fish/functions/_pure_prompt_ssh_user.fish |  5 ++--
 .../fish/functions/_pure_prompt_symbol.fish   | 11 +++++----
 .../functions/_pure_prompt_virtualenv.fish    |  2 +-
 .../fish/functions/_pure_set_default.fish     |  7 ++++--
 fish/.config/starship.toml                    |  4 ++--
 x/.config/mimeapps.list                       |  6 ++++-
 18 files changed, 66 insertions(+), 45 deletions(-)

diff --git a/emacs/.config/doom/+org.el b/emacs/.config/doom/+org.el
index ab9556f..4cad3a2 100644
--- a/emacs/.config/doom/+org.el
+++ b/emacs/.config/doom/+org.el
@@ -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
diff --git a/fish/.config/fish/conf.d/pure.fish b/fish/.config/fish/conf.d/pure.fish
index 29b3236..ec91e35 100644
--- a/fish/.config/fish/conf.d/pure.fish
+++ b/fish/.config/fish/conf.d/pure.fish
@@ -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 (❮)
diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables
index 09beebd..f1048b8 100644
--- a/fish/.config/fish/fish_variables
+++ b/fish/.config/fish/fish_variables
@@ -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
diff --git a/fish/.config/fish/functions/_pure_parse_git_branch.fish b/fish/.config/fish/functions/_pure_parse_git_branch.fish
index 44bad07..a666f2a 100644
--- a/fish/.config/fish/functions/_pure_parse_git_branch.fish
+++ b/fish/.config/fish/functions/_pure_parse_git_branch.fish
@@ -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
diff --git a/fish/.config/fish/functions/_pure_prompt.fish b/fish/.config/fish/functions/_pure_prompt.fish
index de3ea13..3f67704 100644
--- a/fish/.config/fish/functions/_pure_prompt.fish
+++ b/fish/.config/fish/functions/_pure_prompt.fish
@@ -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
diff --git a/fish/.config/fish/functions/_pure_prompt_command_duration.fish b/fish/.config/fish/functions/_pure_prompt_command_duration.fish
index 0e465e2..803d129 100644
--- a/fish/.config/fish/functions/_pure_prompt_command_duration.fish
+++ b/fish/.config/fish/functions/_pure_prompt_command_duration.fish
@@ -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
diff --git a/fish/.config/fish/functions/_pure_prompt_current_folder.fish b/fish/.config/fish/functions/_pure_prompt_current_folder.fish
index ad0c695..981f705 100644
--- a/fish/.config/fish/functions/_pure_prompt_current_folder.fish
+++ b/fish/.config/fish/functions/_pure_prompt_current_folder.fish
@@ -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
diff --git a/fish/.config/fish/functions/_pure_prompt_git_branch.fish b/fish/.config/fish/functions/_pure_prompt_git_branch.fish
index 3d39d65..dce0c4d 100644
--- a/fish/.config/fish/functions/_pure_prompt_git_branch.fish
+++ b/fish/.config/fish/functions/_pure_prompt_git_branch.fish
@@ -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
diff --git a/fish/.config/fish/functions/_pure_prompt_git_dirty.fish b/fish/.config/fish/functions/_pure_prompt_git_dirty.fish
index a134ed8..3a48b96 100644
--- a/fish/.config/fish/functions/_pure_prompt_git_dirty.fish
+++ b/fish/.config/fish/functions/_pure_prompt_git_dirty.fish
@@ -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"
diff --git a/fish/.config/fish/functions/_pure_prompt_git_pending_commits.fish b/fish/.config/fish/functions/_pure_prompt_git_pending_commits.fish
index aa4ce80..c9e1d87 100644
--- a/fish/.config/fish/functions/_pure_prompt_git_pending_commits.fish
+++ b/fish/.config/fish/functions/_pure_prompt_git_pending_commits.fish
@@ -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
 
diff --git a/fish/.config/fish/functions/_pure_prompt_ssh_host.fish b/fish/.config/fish/functions/_pure_prompt_ssh_host.fish
index 4932799..f888cae 100644
--- a/fish/.config/fish/functions/_pure_prompt_ssh_host.fish
+++ b/fish/.config/fish/functions/_pure_prompt_ssh_host.fish
@@ -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
diff --git a/fish/.config/fish/functions/_pure_prompt_ssh_separator.fish b/fish/.config/fish/functions/_pure_prompt_ssh_separator.fish
index d5c452d..1995550 100644
--- a/fish/.config/fish/functions/_pure_prompt_ssh_separator.fish
+++ b/fish/.config/fish/functions/_pure_prompt_ssh_separator.fish
@@ -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
diff --git a/fish/.config/fish/functions/_pure_prompt_ssh_user.fish b/fish/.config/fish/functions/_pure_prompt_ssh_user.fish
index 2577db8..fda8320 100644
--- a/fish/.config/fish/functions/_pure_prompt_ssh_user.fish
+++ b/fish/.config/fish/functions/_pure_prompt_ssh_user.fish
@@ -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"
diff --git a/fish/.config/fish/functions/_pure_prompt_symbol.fish b/fish/.config/fish/functions/_pure_prompt_symbol.fish
index ee3c4a5..94487d3 100644
--- a/fish/.config/fish/functions/_pure_prompt_symbol.fish
+++ b/fish/.config/fish/functions/_pure_prompt_symbol.fish
@@ -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
diff --git a/fish/.config/fish/functions/_pure_prompt_virtualenv.fish b/fish/.config/fish/functions/_pure_prompt_virtualenv.fish
index 4ff9728..16c6ef1 100644
--- a/fish/.config/fish/functions/_pure_prompt_virtualenv.fish
+++ b/fish/.config/fish/functions/_pure_prompt_virtualenv.fish
@@ -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
diff --git a/fish/.config/fish/functions/_pure_set_default.fish b/fish/.config/fish/functions/_pure_set_default.fish
index 53f599b..070ca90 100644
--- a/fish/.config/fish/functions/_pure_set_default.fish
+++ b/fish/.config/fish/functions/_pure_set_default.fish
@@ -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
diff --git a/fish/.config/starship.toml b/fish/.config/starship.toml
index baf39ce..25dc923 100644
--- a/fish/.config/starship.toml
+++ b/fish/.config/starship.toml
@@ -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 = "🏳"
diff --git a/x/.config/mimeapps.list b/x/.config/mimeapps.list
index 153e986..d22499b 100644
--- a/x/.config/mimeapps.list
+++ b/x/.config/mimeapps.list
@@ -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