feat: convert fish -> zsh
This commit is contained in:
@@ -1,9 +1,3 @@
|
|||||||
.gitignore
|
.gitignore
|
||||||
.dockerignore
|
.dockerignore
|
||||||
Dockerfile
|
Dockerfile
|
||||||
|
|
||||||
**/plugged
|
|
||||||
**/completions
|
|
||||||
**/conf.d
|
|
||||||
**/fish_variables
|
|
||||||
**/functions
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ My dotfiles include configuration for the following tools:
|
|||||||
|
|
||||||
### Shell
|
### Shell
|
||||||
|
|
||||||
- 🐟 fish (+ fisher)
|
- zsh
|
||||||
|
|
||||||
### Editor
|
### Editor
|
||||||
|
|
||||||
|
|||||||
3
files/config/fish/.gitignore
vendored
3
files/config/fish/.gitignore
vendored
@@ -1,3 +0,0 @@
|
|||||||
completions
|
|
||||||
conf.d
|
|
||||||
fish_variables
|
|
||||||
@@ -1,19 +1,3 @@
|
|||||||
# Only execute in interactive shell
|
|
||||||
if status is-interactive
|
if status is-interactive
|
||||||
|
# Commands to run in interactive sessions can go here
|
||||||
# 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
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
jethrokuan/z
|
|
||||||
jorgebucaran/hydro
|
|
||||||
jorgebucaran/replay.fish
|
|
||||||
joseluisq/gitnow
|
|
||||||
tomyun/base16-fish
|
|
||||||
PatrickF1/fzf.fish
|
|
||||||
jorgebucaran/fisher
|
|
||||||
32
files/config/fish/fish_variables
Normal file
32
files/config/fish/fish_variables
Normal file
@@ -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
|
||||||
6
files/config/fish/functions/.gitignore
vendored
6
files/config/fish/functions/.gitignore
vendored
@@ -1,6 +0,0 @@
|
|||||||
# Ignore all
|
|
||||||
**/*
|
|
||||||
!.gitignore
|
|
||||||
|
|
||||||
# Keep custom functions
|
|
||||||
!nvm.fish
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
function nvm
|
|
||||||
replay source $NVM_DIR/nvm.sh ';' nvm $argv
|
|
||||||
end
|
|
||||||
@@ -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"
|
|
||||||
7
script/install.d/02-zsh.sh
Executable file
7
script/install.d/02-zsh.sh
Executable file
@@ -0,0 +1,7 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
# Description:
|
||||||
|
# Install zsh shell.
|
||||||
|
|
||||||
|
|
||||||
@@ -36,7 +36,7 @@ def in_shell_path(shell: Text, binary: Text) -> bool:
|
|||||||
shells: List[Text] = [
|
shells: List[Text] = [
|
||||||
"sh",
|
"sh",
|
||||||
"bash",
|
"bash",
|
||||||
"fish",
|
"zsh",
|
||||||
]
|
]
|
||||||
|
|
||||||
binaries: List[Text] = [
|
binaries: List[Text] = [
|
||||||
|
|||||||
Reference in New Issue
Block a user