Merge branch 'master' of gitee.com:klesh/dotfiles
This commit is contained in:
commit
7fd30ad7e4
|
@ -21,21 +21,12 @@ esac
|
||||||
sudo systemctl enable docker
|
sudo systemctl enable docker
|
||||||
sudo systemctl start docker
|
sudo systemctl start docker
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# configuration
|
# configuration
|
||||||
sudo usermod -aG docker "$USER"
|
sudo usermod -aG docker "$USER"
|
||||||
|
|
||||||
# completion
|
# set mirror for GREAT CHINA
|
||||||
case "$DEFAULT_SHELL" in
|
if in_china; then
|
||||||
$FISH)
|
sudo mkdir -p /etc/docker
|
||||||
curl -sLo "$HOME/.config/fish/completions/docker.fish" --create-dirs \
|
|
||||||
'https://github.com/docker/cli/raw/master/contrib/completion/fish/docker.fish'
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# set mirror
|
|
||||||
if in_china && [ -d /etc/docker ]; then
|
|
||||||
if [ -f /etc/docker/daemon.json ]; then
|
if [ -f /etc/docker/daemon.json ]; then
|
||||||
# backup
|
# backup
|
||||||
[ ! -f /etc/docker/daemon.bak.json ] && \
|
[ ! -f /etc/docker/daemon.bak.json ] && \
|
||||||
|
|
14
apps/k8s.sh
14
apps/k8s.sh
|
@ -15,11 +15,9 @@ case "$PM" in
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# completion for fish
|
# completion for fish
|
||||||
case "$DEFAULT_SHELL" in
|
if command -v fish 2>/dev/null ; then
|
||||||
"$FISH")
|
[ ! -f "$HOME/.config/fish/completions/docker.fish" ] && \
|
||||||
[ ! -f "$HOME/.config/fish/completions/docker.fish" ] && \
|
curl -Lo "$HOME/.config/fish/completions/docker.fish" --create-dirs \
|
||||||
curl -Lo "$HOME/.config/fish/completions/docker.fish" --create-dirs \
|
'https://github.com/docker/cli/raw/master/contrib/completion/fish/docker.fish'
|
||||||
'https://github.com/docker/cli/raw/master/contrib/completion/fish/docker.fish'
|
fish -c "fisher add evanlucas/fish-kubectl-completions"
|
||||||
fish -c "fisher add evanlucas/fish-kubectl-completions"
|
fi
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
|
@ -53,6 +53,8 @@ if status is-interactive
|
||||||
set -gx LS_COLORS 'ow=34;42;40'
|
set -gx LS_COLORS 'ow=34;42;40'
|
||||||
# ranger highlighting color theme
|
# ranger highlighting color theme
|
||||||
set -gx HIGHLIGHT_OPTIONS --style=solarized-dark
|
set -gx HIGHLIGHT_OPTIONS --style=solarized-dark
|
||||||
|
# dict.sh
|
||||||
|
set -gx D_SELECTOR 'plainsel'
|
||||||
|
|
||||||
# tune git icon for nerdfont
|
# tune git icon for nerdfont
|
||||||
set -g __fish_git_prompt_char_upstream_ahead '>'
|
set -g __fish_git_prompt_char_upstream_ahead '>'
|
||||||
|
|
|
@ -11,7 +11,7 @@ case "$PM" in
|
||||||
sudo add-apt-repository ppa:fish-shell/release-3 -y
|
sudo add-apt-repository ppa:fish-shell/release-3 -y
|
||||||
sudo apt update
|
sudo apt update
|
||||||
sudo apt install fish libnotify-bin xdotool silversearcher-ag dash -y
|
sudo apt install fish libnotify-bin xdotool silversearcher-ag dash -y
|
||||||
git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf
|
[ ! -d ~/.fzf ] && git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf
|
||||||
~/.fzf/install
|
~/.fzf/install
|
||||||
;;
|
;;
|
||||||
pacman)
|
pacman)
|
||||||
|
@ -52,3 +52,32 @@ lnsf "$DIR/config/functions/fisher.fish" "$XDG_CONFIG_HOME/fish/functions/fisher
|
||||||
# for better keybinding: C-o open file with $EDITOR / C-r search history / C-g open with xdg-open
|
# for better keybinding: C-o open file with $EDITOR / C-r search history / C-g open with xdg-open
|
||||||
fish -c "fisher add jethrokuan/fzf"
|
fish -c "fisher add jethrokuan/fzf"
|
||||||
|
|
||||||
|
# set color theme: Old School
|
||||||
|
fish -c '
|
||||||
|
set -L
|
||||||
|
set -U fish_color_normal normal
|
||||||
|
set -U fish_color_command 00FF00
|
||||||
|
set -U fish_color_quote 44FF44
|
||||||
|
set -U fish_color_redirection 7BFF7B
|
||||||
|
set -U fish_color_end FF7B7B
|
||||||
|
set -U fish_color_error A40000
|
||||||
|
set -U fish_color_param 30BE30
|
||||||
|
set -U fish_color_comment 30BE30
|
||||||
|
set -U fish_color_match --background=brblue
|
||||||
|
set -U fish_color_selection white --bold --background=brblack
|
||||||
|
set -U fish_color_search_match bryellow --background=brblack
|
||||||
|
set -U fish_color_history_current --bold
|
||||||
|
set -U fish_color_operator 00a6b2
|
||||||
|
set -U fish_color_escape 00a6b2
|
||||||
|
set -U fish_color_cwd green
|
||||||
|
set -U fish_color_cwd_root red
|
||||||
|
set -U fish_color_valid_path --underline
|
||||||
|
set -U fish_color_autosuggestion 777777
|
||||||
|
set -U fish_color_user brgreen
|
||||||
|
set -U fish_color_host normal
|
||||||
|
set -U fish_color_cancel -r
|
||||||
|
set -U fish_pager_color_completion normal
|
||||||
|
set -U fish_pager_color_description B3A06D yellow
|
||||||
|
set -U fish_pager_color_prefix white --bold --underline
|
||||||
|
set -U fish_pager_color_progress brwhite --background=cyan
|
||||||
|
'
|
||||||
|
|
|
@ -90,13 +90,11 @@ export DMENU_DEFAULT_OPTS='-i -c -fn monospace:13 -nb #222222 -nf #bbbbbb -sb #5
|
||||||
|
|
||||||
# auto startx
|
# auto startx
|
||||||
[ -z "$DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq "1" ] \
|
[ -z "$DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq "1" ] \
|
||||||
&& echo $(date "+%Y%m%d-%H%M%S") '=============== auto start xinit' >> /tmp/xinit.log \
|
|
||||||
&& startx
|
&& startx
|
||||||
EOT
|
EOT
|
||||||
|
|
||||||
|
|
||||||
# config dwm
|
# config dwm
|
||||||
[ -L "$XDG_CONFIG_HOME/dwm/autostart" ] && rm "$XDG_CONFIG_HOME/dwm/autostart"
|
|
||||||
mkdir -p "$XDG_CONFIG_HOME/dwm"
|
mkdir -p "$XDG_CONFIG_HOME/dwm"
|
||||||
cp "$DIR/config/dwm/autostart" "$XDG_CONFIG_HOME/dwm/autostart"
|
lnsf "$DIR/config/dwm/autostart" "$XDG_CONFIG_HOME/dwm/autostart"
|
||||||
lnsf "$DIR/config/autorandr/postswitch" "$XDG_CONFIG_HOME/autorandr/postswitch"
|
lnsf "$DIR/config/autorandr/postswitch" "$XDG_CONFIG_HOME/autorandr/postswitch"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user