From 2b6a4721b26317ba5c059b1b363cd44a4db3f169 Mon Sep 17 00:00:00 2001 From: Phantop Date: Wed, 20 Feb 2019 19:03:28 -0500 Subject: [PATCH] Fish: Remove fishd, update pure, universal $D --- .config/fish/.gitignore | 1 + .config/fish/config.fish | 4 ++- .config/fish/fish_variables | 3 +- .config/fish/fishd.aperture | 31 ------------------- .../functions/_pure_prompt_git_arrows.fish | 24 -------------- 5 files changed, 6 insertions(+), 57 deletions(-) create mode 100644 .config/fish/.gitignore delete mode 100644 .config/fish/fishd.aperture delete mode 100644 .config/fish/functions/_pure_prompt_git_arrows.fish diff --git a/.config/fish/.gitignore b/.config/fish/.gitignore new file mode 100644 index 0000000..f3d97e4 --- /dev/null +++ b/.config/fish/.gitignore @@ -0,0 +1 @@ +fishd.* diff --git a/.config/fish/config.fish b/.config/fish/config.fish index df2a4f5..52e2fb6 100755 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,5 +1,7 @@ # PATHS # -set -gx D /mnt/LocalDiskD +if test (hostname) = aperture + set -Ux D /mnt/LocalDiskD +end set -gx ANDROID_HOME $D/Installs/Android/sdk set -gx fish_user_paths ~/.local/bin /usr/bin /usr/local/bin /bin /usr/sbin /usr/local/sbin /sbin $PLAN9/bin $ANDROID_HOME/platform-tools set -gx ENV .profile diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 6b95313..8bada37 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -1,5 +1,6 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 +SETUVAR --export D:/mnt/LocalDiskD SETUVAR __fish_init_2_39_8:\x1d SETUVAR __fish_init_2_3_0:\x1d SETUVAR __fish_init_3_x:\x1d @@ -30,4 +31,4 @@ 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 +SETUVAR pure_version:2\x2e1\x2e0 diff --git a/.config/fish/fishd.aperture b/.config/fish/fishd.aperture deleted file mode 100644 index 93eb0b8..0000000 --- a/.config/fish/fishd.aperture +++ /dev/null @@ -1,31 +0,0 @@ -# This file is automatically generated by the fish. -# Do NOT edit it directly, your changes will be overwritten. -SET __fish_init_2_39_8:\x1d -SET __fish_init_2_3_0:\x1d -SET fish_color_autosuggestion:555\x1ebrblack -SET fish_color_cancel:\x2dr -SET fish_color_command:\x2d\x2dbold -SET fish_color_comment:red -SET fish_color_cwd:green -SET fish_color_cwd_root:red -SET fish_color_end:brmagenta -SET fish_color_error:brred -SET fish_color_escape:bryellow\x1e\x2d\x2dbold -SET fish_color_history_current:\x2d\x2dbold -SET fish_color_host:normal -SET fish_color_match:\x2d\x2dbackground\x3dbrblue -SET fish_color_normal:normal -SET fish_color_operator:bryellow -SET fish_color_param:cyan -SET fish_color_quote:yellow -SET fish_color_redirection:brblue -SET fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack -SET fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack -SET fish_color_user:brgreen -SET fish_color_valid_path:\x2d\x2dunderline -SET fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell -SET fish_key_bindings:fish_default_key_bindings -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 diff --git a/.config/fish/functions/_pure_prompt_git_arrows.fish b/.config/fish/functions/_pure_prompt_git_arrows.fish deleted file mode 100644 index a3a5e7b..0000000 --- a/.config/fish/functions/_pure_prompt_git_arrows.fish +++ /dev/null @@ -1,24 +0,0 @@ -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