Mercurial > dotfiles
comparison fish/config.fish @ 414:72365ec18f54
Merge changes
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Thu, 18 Jan 2018 16:27:32 -0800 |
parents | c6da0c9f40ae |
children | 61f343a2aaff |
comparison
equal
deleted
inserted
replaced
413:4a2468f72e44 | 414:72365ec18f54 |
---|---|
28 if type -q git | 28 if type -q git |
29 set -g -x __local_has_git | 29 set -g -x __local_has_git |
30 end | 30 end |
31 if type -q hg | 31 if type -q hg |
32 set -g -x __local_has_hg | 32 set -g -x __local_has_hg |
33 end | |
34 if test -e $HOME/.local/bin/fast-hg-bookmark | |
35 set -g -x __local_has_fast_hg_bookmark | |
33 end | 36 end |
34 | 37 |
35 # }}} | 38 # }}} |
36 | 39 |
37 # Aliases {{{ | 40 # Aliases {{{ |
69 echo '○' | 72 echo '○' |
70 end | 73 end |
71 end | 74 end |
72 | 75 |
73 function hg_prompt | 76 function hg_prompt |
74 if set -q __local_has_hg | 77 if set -q __local_has_hg |
78 and set -q __local_has_fast_hg_bookmark | |
75 set_color magenta | 79 set_color magenta |
76 printf '%s' (fast-hg-bookmark 2>/dev/null) | 80 printf '%s' (fast-hg-bookmark 2>/dev/null) |
77 set_color normal | 81 set_color normal |
78 end | 82 end |
79 end | 83 end |
143 | 147 |
144 alias md 'mkdir -p' | 148 alias md 'mkdir -p' |
145 | 149 |
146 # }}} | 150 # }}} |
147 | 151 |
148 # Virtualenv wrapper for Fish {{{ | |
149 | |
150 #eval (python -m virtualfish) | |
151 | |
152 #set -g VIRTUALFISH_COMPAT_ALIASES # uncomment for virtualenvwrapper-style commands | |
153 #. $HOME/.config/fish/virtualfish/virtual.fish | |
154 # optional plugins | |
155 #. path/to/auto_activation.fish | |
156 #. path/to/global_requirements.fish | |
157 #. path/to/projects.fish | |
158 | |
159 # }}} | |
160 | |
161 # Local Settings {{{ | 152 # Local Settings {{{ |
162 | 153 |
163 if test -s $HOME/.config/fish/local.fish | 154 if test -s $HOME/.config/fish/local.fish |
164 . $HOME/.config/fish/local.fish | 155 . $HOME/.config/fish/local.fish |
165 end | 156 end |
157 #eval (/usr/local/bin/python -m virtualfish) | |
166 | 158 |
167 # }}} | 159 # }}} |
168 | 160 |