Merge branch 'master' of gitee.com:klesh/dotfiles

apps/docker.sh

@@ -21,21 +21,12 @@ esac
 sudo systemctl enable docker
 sudo systemctl start docker
 
-
-
 # configuration
 sudo usermod -aG docker "$USER"
 
-# completion
-case "$DEFAULT_SHELL" in
-    $FISH)
-        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
+# set mirror for GREAT CHINA
+if in_china; then
+    sudo mkdir -p /etc/docker
     if [ -f /etc/docker/daemon.json ]; then
         # backup
         [ ! -f /etc/docker/daemon.bak.json ] && \

apps/k8s.sh

@@ -15,11 +15,9 @@ case "$PM" in
 esac
 
 # completion for fish
-case "$DEFAULT_SHELL" in
-    "$FISH")
-        [ ! -f "$HOME/.config/fish/completions/docker.fish" ] && \
-            curl -Lo "$HOME/.config/fish/completions/docker.fish" --create-dirs \
-            'https://github.com/docker/cli/raw/master/contrib/completion/fish/docker.fish'
-        fish -c "fisher add evanlucas/fish-kubectl-completions"
-        ;;
-esac
+if command -v fish 2>/dev/null ; then
+    [ ! -f "$HOME/.config/fish/completions/docker.fish" ] && \
+        curl -Lo "$HOME/.config/fish/completions/docker.fish" --create-dirs \
+        'https://github.com/docker/cli/raw/master/contrib/completion/fish/docker.fish'
+    fish -c "fisher add evanlucas/fish-kubectl-completions"
+fi

fish/config/config.fish

@@ -53,6 +53,8 @@ if status is-interactive
     set -gx LS_COLORS 'ow=34;42;40'
     # ranger highlighting color theme
     set -gx HIGHLIGHT_OPTIONS --style=solarized-dark
+    # dict.sh
+    set -gx D_SELECTOR 'plainsel'
 
     # tune git icon for nerdfont
     set -g __fish_git_prompt_char_upstream_ahead '>'

fish/install.sh

@@ -11,7 +11,7 @@ case "$PM" in
         sudo add-apt-repository ppa:fish-shell/release-3 -y
         sudo apt update
         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
         ;;
     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
 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
+'

suckless/install.sh

@@ -90,13 +90,11 @@ export DMENU_DEFAULT_OPTS='-i -c -fn monospace:13 -nb #222222 -nf #bbbbbb -sb #5
 
 # auto startx
 [ -z "$DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq "1" ] \
-    && echo $(date "+%Y%m%d-%H%M%S") '=============== auto start xinit' >> /tmp/xinit.log \
     && startx
 EOT
 
 
 # config dwm
-[ -L "$XDG_CONFIG_HOME/dwm/autostart" ] && rm "$XDG_CONFIG_HOME/dwm/autostart"
 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"