From ed63863dfffd094b13d32d6b9a9b61f792f76734 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Tue, 5 Dec 2017 11:42:45 -0800 Subject: [PATCH] uhhh --- .gitmodules | 9 -- .zshrc | 4 - atom/.atom/config.cson | 7 ++ fish/.config/fish/config.fish | 6 +- fish/.config/fish/fishline | 1 - fish/.config/fish/fishline_colors.fish | 99 ++++++++++++++++++++ fish/.config/fish/functions/fish_prompt.fish | 6 +- 7 files changed, 116 insertions(+), 16 deletions(-) delete mode 100644 .gitmodules delete mode 160000 fish/.config/fish/fishline create mode 100644 fish/.config/fish/fishline_colors.fish diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 1acc3ad..0000000 --- a/.gitmodules +++ /dev/null @@ -1,9 +0,0 @@ -[submodule "fish/.config/fish/--force"] - path = fish/.config/fish/--force - url = https://github.com/0rax/fishline.git/ -[submodule "fish/.config/fish/fishline"] - path = fish/.config/fish/fishline - url = https://github.com/0rax/fishline.git/ -[submodule "fishline"] - path = fish/.config/fish/fishline - url = https://github.com/drewcassidy/fishline diff --git a/.zshrc b/.zshrc index 8329d3c..ef39441 100644 --- a/.zshrc +++ b/.zshrc @@ -4,13 +4,9 @@ export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting export PATH="$PATH:$HOME/Scripts" export PKG_CONFIG_PATH="/Library/Frameworks/Mono.framework/Versions/4.6.2/lib/pkgconfig":$PKG_CONFIG_PATH -export POWERLINEHOME="/Users/drewcassidy/Library/Python/2.7/lib/python/site-packages/powerline" - # added by travis gem [ -f /Users/drewcassidy/.travis/travis.sh ] && source /Users/drewcassidy/.travis/travis.sh -. $POWERLINEHOME/bindings/zsh/powerline.zsh - HISTFILE=~/.histfile HISTSIZE=1000 SAVEHIST=1000 diff --git a/atom/.atom/config.cson b/atom/.atom/config.cson index 0a273c0..8838547 100644 --- a/atom/.atom/config.cson +++ b/atom/.atom/config.cson @@ -27,10 +27,17 @@ scrollPastEnd: true showIndentGuide: true tabLength: 4 + "exception-reporting": + userId: "c6ecdfe6-c496-4331-937d-5bb16acf637e" + "markdown-preview": {} "tree-view": hideIgnoredNames: true squashDirectoryNames: true "vim-mode-plus": + blackholeRegisteredOperators: [ + "delete*" + "substitute*" + ] keymapYToYankToLastCharacterOfLine: true ".css.scss.source": editor: diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index 23f9464..b121682 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -1,4 +1,8 @@ # setup FishLine -set FLINE_PATH $HOME/.config/fish/fishline +set FLINE_PATH "$HOME/.config/fish/fishline" source $FLINE_PATH/init.fish +source $FLINE_PATH/../fishline_colors.fish + +set FLCLR_USER_BG blue +set FLCLR_USER_FG white diff --git a/fish/.config/fish/fishline b/fish/.config/fish/fishline deleted file mode 160000 index bddf62a..0000000 --- a/fish/.config/fish/fishline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bddf62a3237d5f011b4a844b2fa78473d653caff diff --git a/fish/.config/fish/fishline_colors.fish b/fish/.config/fish/fishline_colors.fish new file mode 100644 index 0000000..acf574b --- /dev/null +++ b/fish/.config/fish/fishline_colors.fish @@ -0,0 +1,99 @@ +#!/usr/bin/env fish +# -*- mode:fish; tab-width:4 -*- + +set __gray1 235 +set __gray2 236 +set __gray3 239 +set __gray4 240 +set __gray5 241 +set __gray6 244 +set __gray7 245 +set __gray8 247 +set __gray9 250 +set __gray10 252 + + +# Color for PWD and FULLPWD segment +set FLCLR_PWD_BG_HOME brblack +set FLCLR_PWD_FG_HOME normal +set FLCLR_PWD_BG black +set FLCLR_PWD_FG normal +set FLCLR_FULLPWD_BG $FLCLR_PWD_BG +set FLCLR_FULLPWD_FG $FLCLR_PWD_FG + +# Color for STATUS segment +set FLCLR_STATUS_BG red +set FLCLR_STATUS_FG normal + +# Color for WRITE segment +set FLCLR_WRITE_BG red +set FLCLR_WRITE_FG normal + +# Color for ARROW segment +set FLCLR_ARROW_BG white +set FLCLR_ARROW_FG black + +# Color for ROOT segment +set FLCLR_ROOT_BG_USER white +set FLCLR_ROOT_FG_USER black +set FLCLR_ROOT_BG_ROOT red +set FLCLR_ROOT_FG_ROOT normal + +# Color for VFISH segment +set FLCLR_VFISH_BG green +set FLCLR_VFISH_FG black + +# Color for CONDA segment +set FLCLR_CONDA_BG $FLCLR_VFISH_BG +set FLCLR_CONDA_FG $FLCLR_VFISH_FG + +# Color for GIT segment +set FLCLR_GIT_BG_CLEAN green +set FLCLR_GIT_FG_CLEAN black +set FLCLR_GIT_BG_DIRTY yellow +set FLCLR_GIT_FG_DIRTY black +set FLCLR_GIT_BG_DETACHED red +set FLCLR_GIT_FG_DETACHED normal + +# Color for CLOCK segment +set FLCLR_CLOCK_BG white +set FLCLR_CLOCK_FG black + +# Color for USER and USERHOST segments +set FLCLR_USER_BG cyan +set FLCLR_USER_FG normal +set FLCLR_USERHOST_BG cyan +set FLCLR_USERHOST_FG normal + +# Color for JOBS segment +set FLCLR_JOBS_BG yellow +set FLCLR_JOBS_FG normal + +# Color for EXECTIME segment +set FLCLR_EXECTIME_BG red +set FLCLR_EXECTIME_FG black + +# Color for SCREEN segment +set FLCLR_SCREEN_BG cyan +set FLCLR_SCREEN_FG white + +# Color for VIMODE segment +set FLCLR_VIMODE_DEFAULT_BG green +set FLCLR_VIMODE_DEFAULT_FG black +set FLCLR_VIMODE_INSERT_BG white +set FLCLR_VIMODE_INSERT_FG black +set FLCLR_VIMODE_REPLACE_BG red +set FLCLR_VIMODE_REPLACE_FG normal +set FLCLR_VIMODE_VISUAL_BG orange +set FLCLR_VIMODE_VISUAL_FG normal + +# Color for SEPARATOR segment +set FLCLR_SEPARATOR_BG black +set FLCLR_SEPARATOR_FG white + +# Color for FISH segment +set FLCLR_FISH yellow + +# Color for FISH segment when not using Powerline glyph in your theme +set FLCLR_FISH_FG yellow +set FLCLR_FISH_BG normal diff --git a/fish/.config/fish/functions/fish_prompt.fish b/fish/.config/fish/functions/fish_prompt.fish index 7e5a37f..c9f5cbe 100644 --- a/fish/.config/fish/functions/fish_prompt.fish +++ b/fish/.config/fish/functions/fish_prompt.fish @@ -1,3 +1,7 @@ function fish_prompt - fishline -s $status USER PWD GIT ROOT + fishline -s 0 -l USER PWD WRITE SPACE +end + +function fish_right_prompt + fishline -s $status -r SIGSTATUS GIT end