Switching back to zsh.

This commit is contained in:
2018-12-05 23:26:44 -05:00
parent e9ff356068
commit 85134e5f4d
7 changed files with 6 additions and 66 deletions

View File

@@ -1,31 +0,0 @@
# Fish git prompt
set __fish_git_prompt_showdirtystate 'yes'
set __fish_git_prompt_color_branch yellow
# Status Chars
set __fish_git_prompt_char_dirtystate '✗'
function fish_prompt
set last_status $status
set_color blue
printf '%s ' (date "+%H:%M:%S")
set_color cyan
printf '%s' (prompt_pwd)
set_color normal
printf '%s ' (__fish_git_prompt)
if test $last_status -eq 0
set_color green
else
set_color red
end
printf '➤ '
set_color normal
end
# no startup message
function fish_greeting
end

View File

@@ -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

View File

@@ -1 +0,0 @@
../../vimrc

View File

@@ -2,10 +2,10 @@
DOTFILES=$(pwd)
ln -s $DOTFILES/config ~/.config
ln -si $DOTFILES/agignore ~/.agignore
ln -si $DOTFILES/gitconfig ~/.gitconfig
ln -si $DOTFILES/profile ~/.profile
ln -si $DOTFILES/tmux.conf ~/.tmux.conf
ln -si $DOTFILES/vimrc ~/.vimrc
ln -si $DOTFILES/vimrc.bundles ~/.vimrc.bundles
ln -si $DOTFILES/zshrc ~/.zshrc

View File

@@ -1,3 +1,4 @@
[ -n "$PROFILE" ] && return || readonly PROFILE=1
export PATH="$HOME/.cargo/bin:$PATH"
# for haskell
export PATH="$HOME/Library/Python/2.7/bin:$PATH"

1
vimrc
View File

@@ -100,7 +100,6 @@ cnoremap w!! %!sudo tee > /dev/null %
autocmd BufRead,BufNewFile *.fdoc set filetype=yaml
" md is markdown
autocmd BufRead,BufNewFile *.md set filetype=markdown
autocmd BufRead,BufNewFile *.md set spell
autocmd FileType javascript setlocal expandtab shiftwidth=2 softtabstop=2
autocmd FileType html setlocal expandtab shiftwidth=2 softtabstop=2
autocmd FileType css setlocal expandtab shiftwidth=2 softtabstop=2

3
zshrc Normal file
View File

@@ -0,0 +1,3 @@
[[ -s "$HOME/.profile" ]] && source "$HOME/.profile" # Load the default .profile