mirror of
https://github.com/Phantop/dotfiles
synced 2024-10-02 06:59:04 +00:00
Fish: Remove fishd, update pure, universal $D
This commit is contained in:
parent
e977705cb5
commit
2b6a4721b2
1
.config/fish/.gitignore
vendored
Normal file
1
.config/fish/.gitignore
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
fishd.*
|
|
@ -1,5 +1,7 @@
|
||||||
# PATHS #
|
# 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 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 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
|
set -gx ENV .profile
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# This file contains fish universal variable definitions.
|
# This file contains fish universal variable definitions.
|
||||||
# VERSION: 3.0
|
# VERSION: 3.0
|
||||||
|
SETUVAR --export D:/mnt/LocalDiskD
|
||||||
SETUVAR __fish_init_2_39_8:\x1d
|
SETUVAR __fish_init_2_39_8:\x1d
|
||||||
SETUVAR __fish_init_2_3_0:\x1d
|
SETUVAR __fish_init_2_3_0:\x1d
|
||||||
SETUVAR __fish_init_3_x:\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_description:B3A06D\x1eyellow
|
||||||
SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
|
SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
|
||||||
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
|
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
|
||||||
SETUVAR pure_version:1\x2e13\x2e0
|
SETUVAR pure_version:2\x2e1\x2e0
|
||||||
|
|
|
@ -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
|
|
|
@ -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
|
|
Loading…
Reference in a new issue