Remove Android Studio, update pure, set better vi word wrap, whatsapp function

.AndroidStudio3.1

@@ -1 +0,0 @@
-.symlinks/.AndroidStudio3.1

.android

@@ -1 +0,0 @@
-.symlinks/.android

.config/fish/conf.d/fisher.fish

@@ -1 +0,0 @@
-fisher copy-user-key-bindings

.config/fish/config.fish

@@ -1,7 +1,6 @@
 # PATHS #
 set -gx D /mnt/LocalDiskD
-set -gx ANDROID_HOME $D/Source/android/sdk
-set -gx fish_user_paths ~/.local/bin $ANDROID_HOME/platform-tools /usr/bin /usr/local/bin /bin /usr/sbin /usr/local/sbin /sbin $PLAN9/bin
+set -gx fish_user_paths ~/.local/bin /usr/bin /usr/local/bin /bin /usr/sbin /usr/local/sbin /sbin $PLAN9/bin
 set -gx ENV .profile
 
 # PROGRAM SETTINGS #

.config/fish/fish_variables

@@ -0,0 +1,33 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR __fish_init_2_39_8:\x1d
+SETUVAR __fish_init_2_3_0:\x1d
+SETUVAR __fish_init_3_x:\x1d
+SETUVAR fish_color_autosuggestion:555\x1ebrblack
+SETUVAR fish_color_cancel:\x2dr
+SETUVAR fish_color_command:\x2d\x2dbold
+SETUVAR fish_color_comment:red
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:brmagenta
+SETUVAR fish_color_error:brred
+SETUVAR fish_color_escape:bryellow\x1e\x2d\x2dbold
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:bryellow
+SETUVAR fish_color_param:cyan
+SETUVAR fish_color_quote:yellow
+SETUVAR fish_color_redirection:brblue
+SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell
+SETUVAR fish_key_bindings:fish_default_key_bindings
+SETUVAR fish_pager_color_completion:\x1d
+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 pure_version:1\x2e13\x2e0

.config/fish/functions/__format_time.fish

@@ -1,27 +0,0 @@
-function __format_time -d "Format milliseconds to a human readable format"
-  set -l milliseconds $argv[1]
-  set -l seconds (math "$milliseconds / 1000 % 60")
-  set -l minutes (math "$milliseconds / 60000 % 60")
-  set -l hours (math "$milliseconds / 3600000 % 24")
-  set -l days (math "$milliseconds / 86400000")
-  set -l time
-  set -l threshold $argv[2]
-
-  if test $days -gt 0
-    set time (command printf "$time%sd " $days)
-  end
-
-  if test $hours -gt 0
-    set time (command printf "$time%sh " $hours)
-  end
-
-  if test $minutes -gt 0
-    set time (command printf "$time%sm " $minutes)
-  end
-
-  if test $seconds -gt $threshold
-    set time (command printf "$time%ss " $seconds)
-  end
-
-  echo -e $time
-end

.config/fish/functions/__parse_current_folder.fish

@@ -1,3 +0,0 @@
-function __parse_current_folder -d "Replace '$HOME' with '~'"
-  string replace $HOME '~' $PWD
-end

.config/fish/functions/__parse_git_branch.fish

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

.config/fish/functions/__pure_set_default.fish

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

.config/fish/functions/_pure_prompt_git_arrows.fish

@@ -0,0 +1,24 @@
+function _pure_prompt_git_arrows
+    set --local git_arrows
+    set --local git_arrows_color
+
+    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
+        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_arrows "$pure_symbol_git_arrow_up"
+        end
+
+        if test $commit_to_pull -gt 0  # upstream is ahead of local repo
+            set git_arrows "$git_arrows$pure_symbol_git_arrow_down"
+        end
+
+        set git_arrows_color "$pure_color_git_arrows"
+    end
+
+    echo "$git_arrows_color$git_arrows"
+end

.config/fish/functions/fish_right_prompt.fish

@@ -1,3 +1,5 @@
-# Removes right prompt
-function fish_right_prompt
+function fish_right_prompt \
+    --description "Let user override prompt"
+
+    printf "%s%s%s" $pure_color_right_prompt "$pure_right_prompt" $pure_color_normal
 end

.config/fish/functions/ta.fish

@@ -1,4 +1,4 @@
-# Defined in /tmp/fish.FDoq61/ta.fish @ line 2
+# Defined in /tmp/fish.SPzkH4/ta.fish @ line 2
 function ta
-	tmux attach -t (math 0 + "0$argv[1]") $argv[2..-1]
+	tmux attach -t (math 0 + "0$argv")
 end

.config/fish/functions/whatsapp.fish

@@ -0,0 +1,4 @@
+# Defined in /tmp/fish.xGPqez/whatsapp.fish @ line 1
+function whatsapp
+	epiphany web.whatsapp.com
+end

.config/nvim/init.vim

@@ -1,26 +1,27 @@
-set number
-set ruler
-set nowrap
-set textwidth=0 wrapmargin=0 tw=0
-set mouse=a
-set autoindent
-set smartindent
-set expandtab
-set shiftwidth=4
-set formatoptions+=j
-set cursorline
-set clipboard=unnamedplus
-set autoread
+se number
+se ruler
+se nowrap
+se textwidth=0 wrapmargin=0 tw=0
+se lbr
+se mouse=a
+se autoindent
+se smartindent
+se expandtab
+se shiftwidth=4
+se formatoptions+=j
+se cursorline
+se clipboard=unnamedplus
+se autoread
 syntax enable
 filetype plugin indent on
 
 map <F7> mzgg=G`z
 
-set background=dark
+se background=dark
 colorscheme dracula
-set termguicolors                    " Enable GUI colors for the terminal to get truecolor
+se termguicolors                    " Enable GUI colors for the terminal to get truecolor
 
-autocmd FileType * set tw=0
+autocmd FileType * se tw=0
 
-set ignorecase
-set smartcase
+se ignorecase
+se smartcase

.gradle

@@ -1 +0,0 @@
-.symlinks/.gradle

.symlinks/.AndroidStudio3.1

@@ -1 +0,0 @@
-/mnt/LocalDiskD/Source/android/android-studio

.symlinks/.android

@@ -1 +0,0 @@
-/mnt/LocalDiskD/Source/android/android-studio/.android

.symlinks/.gradle

@@ -1 +0,0 @@
-/mnt/LocalDiskD/Source/android/gradle