From 700ab0f41abd947cef4a7c970e703dc7964bed3e Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Sun, 27 Sep 2020 18:04:33 +0800 Subject: [PATCH 1/7] [feature] fish completion for docker --- apps/docker.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/docker.sh b/apps/docker.sh index 01b44b1..0f9020b 100755 --- a/apps/docker.sh +++ b/apps/docker.sh @@ -25,6 +25,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 From bd4cc7c5d60bfff2913108e1e6d77b6999d2277d Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Sun, 27 Sep 2020 18:05:12 +0800 Subject: [PATCH 2/7] [bugfix] linux-header only required by 18.04 --- deeplearning/install.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/deeplearning/install.sh b/deeplearning/install.sh index 424e15b..ca5db8d 100755 --- a/deeplearning/install.sh +++ b/deeplearning/install.sh @@ -9,11 +9,10 @@ $ROOT/python/install.sh # install deep learning tools case "$PM" in apt) - # cuda dependencies - sudo apt install linux-headers-$(uname -r) - + # cuda 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 | \ From a3234d22ab7a0b8b9de0976ab73ed85e43c2b012 Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Sun, 27 Sep 2020 18:05:55 +0800 Subject: [PATCH 3/7] [misc] comment out unnecessary trusted-host --- python/pip.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/python/pip.conf b/python/pip.conf index 67ba8d9..da741b7 100644 --- a/python/pip.conf +++ b/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 From d9686024b86c154a8277ee0063ebcceab1319b1a Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Mon, 28 Sep 2020 11:16:59 +0800 Subject: [PATCH 4/7] [feature] add hotkey for confliction merging --- nvim/config/init.vim | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nvim/config/init.vim b/nvim/config/init.vim index aee53b7..8b4d281 100644 --- a/nvim/config/init.vim +++ b/nvim/config/init.vim @@ -153,6 +153,10 @@ nnoremap gp :Gpush nnoremap gg :Gpull nnoremap gd :Gdiff nnoremap gb :Gblame +nnoremap gl :Glog +nnoremap gms :Gvdiffsplit! +nnoremap gmh :diffget //2 +nnoremap gml :diffget //3 " ==== ctrlp configuration ==== let g:ctrlp_user_command = ['.git', 'git ls-files -co --exclude-standard'] From 832d98f6932f9939ce0615ff7b533cdea1acfc82 Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Mon, 28 Sep 2020 12:07:52 +0800 Subject: [PATCH 5/7] [bugfix] fix confliction between snap docker and apt docker.io --- apps/docker.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/docker.sh b/apps/docker.sh index 0f9020b..8c3b6c1 100755 --- a/apps/docker.sh +++ b/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 From 03d61699f9df2e60394388a5c4dbc8bad92a997f Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Tue, 29 Sep 2020 11:56:49 +0800 Subject: [PATCH 6/7] [bugfix] unable to display korean/japanese --- gui/install.sh | 9 +++------ gui/local.conf | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/gui/install.sh b/gui/install.sh index d743be5..58e31ab 100755 --- a/gui/install.sh +++ b/gui/install.sh @@ -9,8 +9,7 @@ case "$PM" in # fonts sudo apt install \ fonts-cascadia-code \ - fonts-urw-base35 \ - fonts-droid-fallback \ + fonts-noto-cjk \ 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 \ - wqy-microhei \ + noto-fonts-cjk \ gucharmap # install symbola for plain emojis(no-color) for st yay -S ttf-symbola-free diff --git a/gui/local.conf b/gui/local.conf index 52755de..638cc5f 100644 --- a/gui/local.conf +++ b/gui/local.conf @@ -3,11 +3,11 @@ serif - Droid Serif + Noto Serif CJK SC sans-serif - URW Gothic + Noto Sans CJK SC monospace From 260748f61e841409dc629ced54a4dfee4c796bf0 Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Tue, 29 Sep 2020 12:09:35 +0800 Subject: [PATCH 7/7] [misc] MovieCamera icon for recording status --- suckless/config/dwm/dwmbar | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/suckless/config/dwm/dwmbar b/suckless/config/dwm/dwmbar index b197f1a..9936dcc 100755 --- a/suckless/config/dwm/dwmbar +++ b/suckless/config/dwm/dwmbar @@ -7,7 +7,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