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

apps/docker.sh

@@ -7,6 +7,8 @@ DIR=$(readlink -f $(dirname $0))
 # install docker
 case "$PM" in
     apt)
+        # snap docker will intefere native docker.io, must be dealt with
+        sudo snap remove --purge docker
         sudo apt install -y docker.io docker-compose
         ! which pip3 && $ROOT/python/install.sh
         sudo pip3 install docker-compose
@@ -25,6 +27,14 @@ 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
     if [ -f /etc/docker/daemon.json ]; then

deeplearning/install.sh

@@ -9,11 +9,10 @@ $ROOT/python/install.sh
 # install deep learning tools
 case "$PM" in
     apt)
-        # cuda dependencies
+        # cuda
-        sudo apt install linux-headers-$(uname -r)
-
         source /etc/lsb-release
         if [ "$DISTRIB_RELEASE" = "18.04" ] && [ "$(uname -m)" = 'x86_64' ]; then
+            sudo apt install linux-headers-$(uname -r)
             wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-ubuntu1804.pin
             sudo mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600
             sudo apt-key adv --fetch-keys \
@@ -27,6 +26,8 @@ case "$PM" in
             echo 'Unsupported release'
             exit -1
         fi
+
+        # nvidia docker
         distribution=$(. /etc/os-release;echo $ID$VERSION_ID)
         curl -s -L https://nvidia.github.io/nvidia-docker/gpgkey | sudo apt-key add -
         curl -s -L https://nvidia.github.io/nvidia-docker/$distribution/nvidia-docker.list | \

gui/install.sh

@@ -9,8 +9,7 @@ case "$PM" in
         # fonts
         sudo apt install \
             fonts-cascadia-code \
-            fonts-urw-base35 \
+            fonts-noto-cjk \
-            fonts-droid-fallback \
             fonts-symbola \
             gucharmap
         # network manager
@@ -25,13 +24,11 @@ case "$PM" in
         fi
         ;;
     pacman)
-        # fonts, wqy-microhei is required for qt5.15 to display CJK character
+        # fonts
         sudo pacman -S --needed \
             freetype2 \
-            terminus-font \
             ttf-cascadia-code \
-            ttf-droid \
+            noto-fonts-cjk \
-            wqy-microhei \
             gucharmap
         # install symbola for plain emojis(no-color) for st
         yay -S ttf-symbola-free

gui/local.conf

@@ -3,11 +3,11 @@
 <fontconfig>
 	<match target="pattern">
 		<test qual="any" name="family"><string>serif</string></test>
-		<edit name="family" mode="assign" binding="same"><string>Droid Serif</string></edit>
+		<edit name="family" mode="assign" binding="same"><string>Noto Serif CJK SC</string></edit>
 	</match>
 	<match target="pattern">
 		<test qual="any" name="family"><string>sans-serif</string></test>
-		<edit name="family" mode="assign" binding="same"><string>URW Gothic</string></edit>
+		<edit name="family" mode="assign" binding="same"><string>Noto Sans CJK SC</string></edit>
 	</match>
 	<match target="pattern">
 		<test qual="any" name="family"><string>monospace</string></test>

nvim/config/init.vim

@@ -153,6 +153,10 @@ nnoremap <leader>gp :Gpush<CR>
 nnoremap <leader>gg :Gpull<CR>
 nnoremap <leader>gd :Gdiff<CR>
 nnoremap <leader>gb :Gblame<CR>
+nnoremap <leader>gl :Glog<CR>
+nnoremap <leader>gms :Gvdiffsplit!<CR>
+nnoremap <leader>gmh :diffget //2<CR>
+nnoremap <leader>gml :diffget //3<CR>
 
 " ==== ctrlp configuration ====
 let g:ctrlp_user_command = ['.git', 'git ls-files -co --exclude-standard']

python/pip.conf

@@ -1,5 +1,3 @@
 [global]
-trusted-host = mirrors.aliyun.com
 index-url = https://mirrors.aliyun.com/pypi/simple
 #index-url = https://pypi.doubanio.com/simple
-#trusted-host = pypi.doubanio.com

suckless/config/dwm/dwmbar

@@ -10,7 +10,7 @@ function update
   if which mpc
       set music (mpc)
       if string match -r playing "$music[2]"
-        set text $text "喇 $music[1]"
+        set text $text "🎥 $music[1]"
       end
   end
   # volume