From 3b4c9a9fa744cce02f17eebe1335610c955cc569 Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Mon, 2 May 2016 16:27:59 +0200 Subject: change my fish setup to use fisherman 1) remove my plugin submodules and let fisherman handle them 2) add fishfile 3) remove my prompt -> use bobthefish 4) change setup.py + targets are now lists containing tuples of file paths or functions + add fish_config functions that downloads and installs fisherman + other little cosmetic tweaks --- config/fish/config.fish | 12 ------ config/fish/fink | 1 - config/fish/fishfile | 4 ++ config/fish/functions/fish_prompt.fish | 77 ---------------------------------- config/fish/mark | 1 - config/fish/wd | 1 - 6 files changed, 4 insertions(+), 92 deletions(-) delete mode 160000 config/fish/fink create mode 100644 config/fish/fishfile delete mode 100644 config/fish/functions/fish_prompt.fish delete mode 160000 config/fish/mark delete mode 160000 config/fish/wd (limited to 'config') diff --git a/config/fish/config.fish b/config/fish/config.fish index 4252aa7..736f8bd 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -6,18 +6,6 @@ set fish_completion_path $HOME/.dotfiles/config/fish/completions $fish_completio # add git-alias subdirectory to functions path set fish_function_path $HOME/.dotfiles/config/fish/functions/git-alias $fish_function_path -# include wd -set fish_function_path $HOME/.dotfiles/config/fish/wd/functions $fish_function_path -set fish_complete_path $HOME/.dotfiles/config/fish/wd/completions $fish_complete_path - -# include mark -set fish_function_path $HOME/.dotfiles/config/fish/mark/functions $fish_function_path -set fish_complete_path $HOME/.dotfiles/config/fish/mark/completions $fish_complete_path - -# include fink -set fish_function_path $HOME/.dotfiles/config/fish/fink/functions $fish_function_path -set fish_complete_path $HOME/.dotfiles/config/fish/fink/completions $fish_complete_path - # include cargo binaries if type -q multirust for p in $HOME/.multirust/toolchains/*/cargo/bin diff --git a/config/fish/fink b/config/fish/fink deleted file mode 160000 index 7746ab5..0000000 --- a/config/fish/fink +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7746ab547f266c59b24bc987cf7f24398a0ed25e diff --git a/config/fish/fishfile b/config/fish/fishfile new file mode 100644 index 0000000..69c7b70 --- /dev/null +++ b/config/fish/fishfile @@ -0,0 +1,4 @@ +fisherman/bobthefish +fischerling/fink +fischerling/mark +fischerling/plugin-wd diff --git a/config/fish/functions/fish_prompt.fish b/config/fish/functions/fish_prompt.fish deleted file mode 100644 index 0a39fe7..0000000 --- a/config/fish/functions/fish_prompt.fish +++ /dev/null @@ -1,77 +0,0 @@ -function fish_prompt --description 'Write out the prompt' - - set -l last_status $status - - # Just calculate these once, to save a few cycles when displaying the prompt - if not set -q __fish_prompt_hostname - set -g __fish_prompt_hostname (hostname|cut -d . -f 1) - end - - if not set -q __fish_prompt_normal - set -g __fish_prompt_normal (set_color normal) - end - - if not set -q -g __fish_classic_git_functions_defined - set -g __fish_classic_git_functions_defined - - function __fish_repaint_user --on-variable fish_color_user --description "Event handler, repaint when fish_color_user changes" - if status --is-interactive - set -e __fish_prompt_user - commandline -f repaint ^/dev/null - end - end - - function __fish_repaint_host --on-variable fish_color_host --description "Event handler, repaint when fish_color_host changes" - if status --is-interactive - set -e __fish_prompt_host - commandline -f repaint ^/dev/null - end - end - - function __fish_repaint_status --on-variable fish_color_status --description "Event handler; repaint when fish_color_status changes" - if status --is-interactive - set -e __fish_prompt_status - commandline -f repaint ^/dev/null - end - end - end - - set -l delim '>' - - switch $USER - - case root - - if not set -q __fish_prompt_cwd - if set -q fish_color_cwd_root - set -g __fish_prompt_cwd (set_color $fish_color_cwd_root) - else - set -g __fish_prompt_cwd (set_color $fish_color_cwd) - end - end - - case '*' - - if not set -q __fish_prompt_cwd - set -g __fish_prompt_cwd (set_color $fish_color_cwd) - end - - end - - set -l prompt_status - if test $last_status -ne 0 - if not set -q __fish_prompt_status - set -g __fish_prompt_status (set_color $fish_color_status) - end - set prompt_status "$__fish_prompt_status [$last_status]$__fish_prompt_normal" - end - - if not set -q __fish_prompt_user - set -g __fish_prompt_user (set_color $fish_color_user) - end - if not set -q __fish_prompt_host - set -g __fish_prompt_host (set_color $fish_color_host) - end - - echo -n -s "$__fish_prompt_user" "$USER" "$__fish_prompt_normal" @ "$__fish_prompt_host" "$__fish_prompt_hostname" "$__fish_prompt_normal" ' ' "$__fish_prompt_cwd" (prompt_pwd) (__fish_git_prompt) "$__fish_prompt_normal" "$prompt_status" "$delim" ' ' -end diff --git a/config/fish/mark b/config/fish/mark deleted file mode 160000 index 552edcc..0000000 --- a/config/fish/mark +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 552edcc7f97b8eddbd6a97481b4d04f0704748ce diff --git a/config/fish/wd b/config/fish/wd deleted file mode 160000 index e9788d4..0000000 --- a/config/fish/wd +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e9788d4c5deae7567338c810c6d3ba130faa9a66 -- cgit v1.2.3