diff --git a/.dockerignore b/.dockerignore index 7723660..77c370a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,9 +1,3 @@ .gitignore .dockerignore Dockerfile - -**/plugged -**/completions -**/conf.d -**/fish_variables -**/functions diff --git a/README.md b/README.md index d3881ef..b63acd7 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ My dotfiles include configuration for the following tools: ### Shell -- 🐟 fish (+ fisher) +- zsh ### Editor diff --git a/files/config/fish/.gitignore b/files/config/fish/.gitignore deleted file mode 100644 index 20c132f..0000000 --- a/files/config/fish/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -completions -conf.d -fish_variables diff --git a/files/config/fish/config.fish b/files/config/fish/config.fish index 22d499c..d714361 100644 --- a/files/config/fish/config.fish +++ b/files/config/fish/config.fish @@ -1,19 +1,3 @@ -# Only execute in interactive shell if status is-interactive - - # Fish specific - set fish_greeting - set --global hydro_symbol_prompt "\$" - set --global hydro_symbol_git_dirty "~" - if type -q base16-seti - base16-seti - end - - # Cross-shell setup - if begin; test -e $HOME/.profile; and type -q replay; end - replay "source $HOME/.profile" - end - - pyenv init - | source - + # Commands to run in interactive sessions can go here end diff --git a/files/config/fish/fish_plugins b/files/config/fish/fish_plugins deleted file mode 100644 index 85cb5ec..0000000 --- a/files/config/fish/fish_plugins +++ /dev/null @@ -1,7 +0,0 @@ -jethrokuan/z -jorgebucaran/hydro -jorgebucaran/replay.fish -joseluisq/gitnow -tomyun/base16-fish -PatrickF1/fzf.fish -jorgebucaran/fisher diff --git a/files/config/fish/fish_variables b/files/config/fish/fish_variables new file mode 100644 index 0000000..ad49496 --- /dev/null +++ b/files/config/fish/fish_variables @@ -0,0 +1,32 @@ +# This file contains fish universal variable definitions. +# VERSION: 3.0 +SETUVAR __fish_initialized:3400 +SETUVAR _hydro_git_94575:master\x7e\x20 +SETUVAR fish_color_autosuggestion:555\x1ebrblack +SETUVAR fish_color_cancel:\x2dr +SETUVAR fish_color_command:blue +SETUVAR fish_color_comment:red +SETUVAR fish_color_cwd:green +SETUVAR fish_color_cwd_root:red +SETUVAR fish_color_end:green +SETUVAR fish_color_error:brred +SETUVAR fish_color_escape:brcyan +SETUVAR fish_color_history_current:\x2d\x2dbold +SETUVAR fish_color_host:normal +SETUVAR fish_color_host_remote:yellow +SETUVAR fish_color_normal:normal +SETUVAR fish_color_operator:brcyan +SETUVAR fish_color_param:cyan +SETUVAR fish_color_quote:yellow +SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold +SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_status:red +SETUVAR fish_color_user:brgreen +SETUVAR fish_color_valid_path:\x2d\x2dunderline +SETUVAR fish_key_bindings:fish_default_key_bindings +SETUVAR fish_pager_color_completion:normal +SETUVAR fish_pager_color_description:B3A06D\x1eyellow\x1e\x2di +SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan +SETUVAR fish_pager_color_selected_background:\x2dr diff --git a/files/config/fish/functions/.gitignore b/files/config/fish/functions/.gitignore deleted file mode 100644 index fbe730d..0000000 --- a/files/config/fish/functions/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -# Ignore all -**/* -!.gitignore - -# Keep custom functions -!nvm.fish diff --git a/files/config/fish/functions/nvm.fish b/files/config/fish/functions/nvm.fish deleted file mode 100644 index 8da3971..0000000 --- a/files/config/fish/functions/nvm.fish +++ /dev/null @@ -1,3 +0,0 @@ -function nvm - replay source $NVM_DIR/nvm.sh ';' nvm $argv -end diff --git a/script/install.d/02-fish.sh b/script/install.d/02-fish.sh deleted file mode 100755 index b6e8dca..0000000 --- a/script/install.d/02-fish.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash -fish --version - -current_shell=$(grep "^$USER" /etc/passwd) -current_shell=${current_shell##*:} -fish_shell=$(command -v fish) -if [[ "$current_shell" != "$fish_shell" ]]; then - sudo usermod --shell "$fish_shell" "$USER" -fi - -fisher_location="$XDG_CONFIG_HOME/fish/functions/fisher.fish" -if ! [ -f $fisher_location ]; then - fish -c "curl -sL https://git.io/fisher | source && fisher update" -fi - -fish -c "fisher update" -fish -c "fisher --version" diff --git a/script/install.d/02-zsh.sh b/script/install.d/02-zsh.sh new file mode 100755 index 0000000..c94e36a --- /dev/null +++ b/script/install.d/02-zsh.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +# ----------------------------------------------------------------------------- +# Description: +# Install zsh shell. + + diff --git a/tests/test_binaries.py b/tests/test_binaries.py index fe738ad..d5d6f05 100644 --- a/tests/test_binaries.py +++ b/tests/test_binaries.py @@ -36,7 +36,7 @@ def in_shell_path(shell: Text, binary: Text) -> bool: shells: List[Text] = [ "sh", "bash", - "fish", + "zsh", ] binaries: List[Text] = [