From bbd681ad571924ba850a8633734f00c5ca5c856e Mon Sep 17 00:00:00 2001 From: Colin Powell Date: Wed, 16 Jan 2019 07:47:19 -0500 Subject: [PATCH] More fighting with fzf between mac and linux #fishshell --- fish/.config/fish/conf.d/fisher.fish | 1 - fish/.config/fish/conf.d/plugin-direnv_init.fish | 2 +- fish/.config/fish/fish_variables | 1 + fish/.config/fish/functions/fzf_key_bindings.fish | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 fish/.config/fish/conf.d/fisher.fish diff --git a/fish/.config/fish/conf.d/fisher.fish b/fish/.config/fish/conf.d/fisher.fish deleted file mode 100644 index b1e84fd..0000000 --- a/fish/.config/fish/conf.d/fisher.fish +++ /dev/null @@ -1 +0,0 @@ -fisher copy-user-key-bindings diff --git a/fish/.config/fish/conf.d/plugin-direnv_init.fish b/fish/.config/fish/conf.d/plugin-direnv_init.fish index b0488f0..05e155e 100644 --- a/fish/.config/fish/conf.d/plugin-direnv_init.fish +++ b/fish/.config/fish/conf.d/plugin-direnv_init.fish @@ -4,5 +4,5 @@ if type -q direnv eval (direnv export fish) end else - echo "Install direnv first! Check http://direnv.net" ^&1 + echo "Install direnv first! Check http://direnv.net" 2>&1 end diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables index a610a1c..6d9f549 100644 --- a/fish/.config/fish/fish_variables +++ b/fish/.config/fish/fish_variables @@ -57,4 +57,5 @@ SETUVAR fish_pager_color_completion:\x1d SETUVAR fish_pager_color_description:B3A06D\x1eyellow SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan +SETUVAR fish_user_paths:/Users/colinpowell/\x2efzf/bin SETUVAR yimmy_solarized:true diff --git a/fish/.config/fish/functions/fzf_key_bindings.fish b/fish/.config/fish/functions/fzf_key_bindings.fish index ff68d89..65f85a5 120000 --- a/fish/.config/fish/functions/fzf_key_bindings.fish +++ b/fish/.config/fish/functions/fzf_key_bindings.fish @@ -1 +1 @@ -/home/powellc/.fzf/shell/key-bindings.fish \ No newline at end of file +/Users/colinpowell/.fzf/shell/key-bindings.fish \ No newline at end of file