From f80b502b464e3c613d15e8d11629535856c372a6 Mon Sep 17 00:00:00 2001 From: Phantop Date: Sat, 12 Jan 2019 20:35:22 -0500 Subject: [PATCH] Remove Android Studio, update pure, set better vi word wrap, whatsapp function --- .AndroidStudio3.1 | 1 - .android | 1 - .config/fish/conf.d/fisher.fish | 1 - .config/fish/config.fish | 3 +- .config/fish/fish_variables | 33 +++++++++++++++++ .config/fish/fishd.aperture | 10 ----- .config/fish/functions/__format_time.fish | 27 -------------- .../functions/__parse_current_folder.fish | 3 -- .../fish/functions/__parse_git_branch.fish | 4 -- .../fish/functions/__pure_set_default.fish | 5 --- .../functions/_pure_prompt_git_arrows.fish | 24 ++++++++++++ .config/fish/functions/fish_right_prompt.fish | 6 ++- .config/fish/functions/ta.fish | 4 +- .config/fish/functions/whatsapp.fish | 4 ++ .config/nvim/init.vim | 37 ++++++++++--------- .gradle | 1 - .symlinks/.AndroidStudio3.1 | 1 - .symlinks/.android | 1 - .symlinks/.gradle | 1 - 19 files changed, 87 insertions(+), 80 deletions(-) delete mode 120000 .AndroidStudio3.1 delete mode 120000 .android delete mode 100644 .config/fish/conf.d/fisher.fish create mode 100644 .config/fish/fish_variables mode change 100755 => 100644 .config/fish/fishd.aperture delete mode 100644 .config/fish/functions/__format_time.fish delete mode 100644 .config/fish/functions/__parse_current_folder.fish delete mode 100644 .config/fish/functions/__parse_git_branch.fish delete mode 100644 .config/fish/functions/__pure_set_default.fish create mode 100644 .config/fish/functions/_pure_prompt_git_arrows.fish create mode 100644 .config/fish/functions/whatsapp.fish delete mode 120000 .gradle delete mode 120000 .symlinks/.AndroidStudio3.1 delete mode 120000 .symlinks/.android delete mode 120000 .symlinks/.gradle diff --git a/.AndroidStudio3.1 b/.AndroidStudio3.1 deleted file mode 120000 index 0e994bf..0000000 --- a/.AndroidStudio3.1 +++ /dev/null @@ -1 +0,0 @@ -.symlinks/.AndroidStudio3.1 \ No newline at end of file diff --git a/.android b/.android deleted file mode 120000 index 437ce35..0000000 --- a/.android +++ /dev/null @@ -1 +0,0 @@ -.symlinks/.android \ No newline at end of file diff --git a/.config/fish/conf.d/fisher.fish b/.config/fish/conf.d/fisher.fish deleted file mode 100644 index b1e84fd..0000000 --- a/.config/fish/conf.d/fisher.fish +++ /dev/null @@ -1 +0,0 @@ -fisher copy-user-key-bindings diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 8c818d0..0f6c5b3 100755 --- a/.config/fish/config.fish +++ b/.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 # diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables new file mode 100644 index 0000000..6b95313 --- /dev/null +++ b/.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 diff --git a/.config/fish/fishd.aperture b/.config/fish/fishd.aperture old mode 100755 new mode 100644 index be9feae..93eb0b8 --- a/.config/fish/fishd.aperture +++ b/.config/fish/fishd.aperture @@ -1,16 +1,7 @@ # This file is automatically generated by the fish. # Do NOT edit it directly, your changes will be overwritten. -SET_EXPORT ANDROID_HOME:/mnt/LocalDiskD/Source/android/sdk -SET_EXPORT D:/mnt/LocalDiskD -SET_EXPORT EDITOR:nvim -SET_EXPORT FZF_DEFAULT_COMMAND:ff -SET GOPATH:\x2ego -SET_EXPORT PAGER:nvim\x20\x2dc\x20\x27set\x20ft\x3dman\x27\x20\x2d -SET_EXPORT PATH:/usr/local/bin\x1e/mnt/LocalDiskD/Source/android/sdk/platform\x2dtools/\x1e/sbin\x1e/bin\x1e/usr/sbin\x1e/usr/bin\x1e/snap/bin\x1e/mnt/LocalDiskD/Source/plan9port/bin -SET_EXPORT PLAN9:\x1d SET __fish_init_2_39_8:\x1d SET __fish_init_2_3_0:\x1d -SET e:/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/home/glados/\x2elocal/bin SET fish_color_autosuggestion:555\x1ebrblack SET fish_color_cancel:\x2dr SET fish_color_command:\x2d\x2dbold @@ -38,4 +29,3 @@ SET fish_pager_color_completion:\x1d SET fish_pager_color_description:B3A06D\x1eyellow SET fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SET fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan -SET_EXPORT fish_user_paths:/usr/local/bin\x1e/usr/sbin\x1e/sbin\x1e/mnt/LocalDiskD/Source/android/sdk/platform\x2dtools diff --git a/.config/fish/functions/__format_time.fish b/.config/fish/functions/__format_time.fish deleted file mode 100644 index 1831dbf..0000000 --- a/.config/fish/functions/__format_time.fish +++ /dev/null @@ -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 diff --git a/.config/fish/functions/__parse_current_folder.fish b/.config/fish/functions/__parse_current_folder.fish deleted file mode 100644 index 3a1bcef..0000000 --- a/.config/fish/functions/__parse_current_folder.fish +++ /dev/null @@ -1,3 +0,0 @@ -function __parse_current_folder -d "Replace '$HOME' with '~'" - string replace $HOME '~' $PWD -end diff --git a/.config/fish/functions/__parse_git_branch.fish b/.config/fish/functions/__parse_git_branch.fish deleted file mode 100644 index a0d7532..0000000 --- a/.config/fish/functions/__parse_git_branch.fish +++ /dev/null @@ -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 diff --git a/.config/fish/functions/__pure_set_default.fish b/.config/fish/functions/__pure_set_default.fish deleted file mode 100644 index 9830458..0000000 --- a/.config/fish/functions/__pure_set_default.fish +++ /dev/null @@ -1,5 +0,0 @@ -function __pure_set_default -S -a var default - if not set -q $var - set -g $var $default - end -end diff --git a/.config/fish/functions/_pure_prompt_git_arrows.fish b/.config/fish/functions/_pure_prompt_git_arrows.fish new file mode 100644 index 0000000..a3a5e7b --- /dev/null +++ b/.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 diff --git a/.config/fish/functions/fish_right_prompt.fish b/.config/fish/functions/fish_right_prompt.fish index 89f92ac..dee0158 100644 --- a/.config/fish/functions/fish_right_prompt.fish +++ b/.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 diff --git a/.config/fish/functions/ta.fish b/.config/fish/functions/ta.fish index f5f5b87..0554a32 100644 --- a/.config/fish/functions/ta.fish +++ b/.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 diff --git a/.config/fish/functions/whatsapp.fish b/.config/fish/functions/whatsapp.fish new file mode 100644 index 0000000..d8d355a --- /dev/null +++ b/.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 diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index f3efca5..6962bbf 100755 --- a/.config/nvim/init.vim +++ b/.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 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 diff --git a/.gradle b/.gradle deleted file mode 120000 index 9456f65..0000000 --- a/.gradle +++ /dev/null @@ -1 +0,0 @@ -.symlinks/.gradle \ No newline at end of file diff --git a/.symlinks/.AndroidStudio3.1 b/.symlinks/.AndroidStudio3.1 deleted file mode 120000 index 5ea78e5..0000000 --- a/.symlinks/.AndroidStudio3.1 +++ /dev/null @@ -1 +0,0 @@ -/mnt/LocalDiskD/Source/android/android-studio \ No newline at end of file diff --git a/.symlinks/.android b/.symlinks/.android deleted file mode 120000 index faed6d0..0000000 --- a/.symlinks/.android +++ /dev/null @@ -1 +0,0 @@ -/mnt/LocalDiskD/Source/android/android-studio/.android \ No newline at end of file diff --git a/.symlinks/.gradle b/.symlinks/.gradle deleted file mode 120000 index 807d7c5..0000000 --- a/.symlinks/.gradle +++ /dev/null @@ -1 +0,0 @@ -/mnt/LocalDiskD/Source/android/gradle \ No newline at end of file