--- a/fish/config.fish Sat Feb 01 13:52:51 2020 -0500
+++ b/fish/config.fish Sat Feb 01 15:23:02 2020 -0500
@@ -144,21 +144,34 @@
# }}}
# Prompt {{{
-set normal (set_color normal)
-set magenta (set_color magenta)
-set yellow (set_color yellow)
-set green (set_color green)
-set cyan (set_color cyan)
-set gray (set_color -o black)
+if status --is-interactive
+ set normal (set_color normal)
+ set magenta (set_color magenta)
+ set yellow (set_color yellow)
+ set green (set_color green)
+ set cyan (set_color cyan)
+ set gray (set_color -o black)
-set hg_promptstring "\
+ set hg_promptstring "\
< on $magenta<branch>$normal>\
< at $cyan<bookmark>$normal>\
$green<status|modified|unknown><update>$normal\
" 2>/dev/null
+ if test -n "$SSH_CLIENT"
+ or test -n "$SSH_TTY"
+ set host_color (set_color cyan)
+ set want_vcs_prompts 0
+ else
+ set host_color (set_color yellow)
+ set want_vcs_prompts 1
+ end
+end
+
function hg_prompt
- hg prompt --angle-brackets $hg_promptstring 2>/dev/null
+ if test -z "$NOVCSPROMPT"
+ hg prompt --angle-brackets $hg_promptstring 2>/dev/null
+ end
end
function git_prompt
@@ -177,14 +190,6 @@
echo $PWD | sed -e "s|^$HOME|~|"
end
-if test -n "$SSH_CLIENT"
- or test -n "$SSH_TTY"
- set host_color (set_color cyan)
- set want_vcs_prompts 0
-else
- set host_color (set_color yellow)
- set want_vcs_prompts 1
-end
function fish_prompt
set last_status $status
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/remote/bin/e Sat Feb 01 15:23:02 2020 -0500
@@ -0,0 +1,1 @@
+../../bin/e
\ No newline at end of file
--- a/servers/bash_profile Sat Feb 01 13:52:51 2020 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-shopt -s expand_aliases
-
-export PATH=~/bin:~/dotfiles/bin:$PATH
-
-alias l='ls -1 --color=auto'
-alias ll='ls -la1 --color=auto'
-alias h='hg'
-alias g='git'
-alias pj='python -m json.tool'
-alias ..='cd ..'
-alias ...='cd ../..'
-alias ....='cd ../../..'
-alias .....='cd ../../../..'
-alias ......='cd ../../../../..'
-alias nvim=vim
-
-function psg() {
- ps auxww | grep --color=always $* | grep -v grep | collapse | cuts -f 2,11-
-}
-
-export EDITOR=vim
-
-D=$'\e[37m'
-PINK=$'\e[35m'
-GREEN=$'\e[32m'
-ORANGE=$'\e[33m'
-
-export PS1='\n${PINK}\u ${D}at ${ORANGE}\h ${D}in ${GREEN}\w${D}\n$ '
--- a/servers/bin/collapse Sat Feb 01 13:52:51 2020 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../../bin/collapse
\ No newline at end of file
--- a/servers/bin/cuts Sat Feb 01 13:52:51 2020 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../../bin/cuts
\ No newline at end of file
--- a/servers/bin/f Sat Feb 01 13:52:51 2020 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../../bin/f
\ No newline at end of file