From e861b20070c77ee338cc1d8e4f967c8183694e19 Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Wed, 30 Sep 2020 20:07:51 +0800 Subject: [PATCH 1/7] [misc] use dejavu as serif font and URW Gothic as sans-serif --- gui/install.sh | 4 +++- gui/local.conf | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gui/install.sh b/gui/install.sh index 197614c..5e16fd9 100755 --- a/gui/install.sh +++ b/gui/install.sh @@ -12,6 +12,7 @@ case "$PM" in fonts-cascadia-code \ fonts-wqy-microhei \ fonts-symbola \ + fonts-dejavu-core \ gucharmap # network manager sudo apt install \ @@ -31,9 +32,10 @@ case "$PM" in gsfonts \ ttf-cascadia-code \ wqy-microhei \ + ttf-dejavu \ gucharmap # install symbola for plain emojis(no-color) for st - yay -S ttf-symbola-free + yay -S --needed ttf-symbola-free # clipboard sudo pacman -S --needed \ xclip xsel diff --git a/gui/local.conf b/gui/local.conf index 638cc5f..5b371cc 100644 --- a/gui/local.conf +++ b/gui/local.conf @@ -3,11 +3,11 @@ serif - Noto Serif CJK SC + DejaVu Serif sans-serif - Noto Sans CJK SC + URW Gothic monospace From 6c614150fadd5a41e456f6df1334647fd795589f Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Wed, 30 Sep 2020 23:04:51 +0800 Subject: [PATCH 2/7] [misc] cleanup .xinitrc --- suckless/install.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/suckless/install.sh b/suckless/install.sh index 733d29c..359b75b 100755 --- a/suckless/install.sh +++ b/suckless/install.sh @@ -55,6 +55,8 @@ cd ~/Projects/suckless/dwm && sudo rm -f config.h && sudo make clean install # config xinit to start for dwm rm ~/.xinitrc cat < ~/.xinitrc +#!/bin/sh + export QT_QPA_PLATFORMTHEME="qt5ct" export GTK2_RC_FILES="$HOME/.gtkrc-2.0" @@ -62,24 +64,19 @@ export XMODIFIERS="@im=ibus" export QT_IM_MODULE=ibus export GTK_IM_MODULE=xim - -# xrandr --setprovideroutputsource modesetting NVIDIA-0 -# xrandr --auto - - -xrdb ~/.Xresources - # auto lock after 300 seconds xset s 300 systemd-lock-handler /usr/local/bin/slock -#xsetroot -cursor_name left_ptr - +# setup gnome keyring dbus-update-activation-environment --systemd DISPLAY eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh) export SSH_AUTH_SOCK +# load monitors profile autorandr --change --force + +# restart dwm if it existed without error while :; do ssh-agent dwm 2>/tmp/dwm.log || break done From 359f545ed0a04b1f21471b41ee1f6c130f049d4c Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Thu, 1 Oct 2020 13:41:32 +0800 Subject: [PATCH 3/7] [bugfix] fix /usr/local/share/fonts permission denied error --- gui/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gui/install.sh b/gui/install.sh index 5e16fd9..5eb6548 100755 --- a/gui/install.sh +++ b/gui/install.sh @@ -72,6 +72,7 @@ install-nerdfont () { https://gitee.com/klesh/nerd-fonts.git \ $LOCAL_REPO_PATH sudo 7z x -x!'*Windows*' -aoa $LOCAL_REPO_PATH/$NAME -o/usr/local/share/fonts + sudo chmod +x /usr/local/share/fonts echo $LOCAL_REPO_PATH rm -rf $LOCAL_REPO_PATH } From a8d5be920ace2cadd68ca0d3c0b9aecd5bfe6848 Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Thu, 1 Oct 2020 14:14:54 +0800 Subject: [PATCH 4/7] [feature] delete file from disk --- player/config/ncmpcpp/bindings | 2 ++ player/config/ncmpcpp/config | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/player/config/ncmpcpp/bindings b/player/config/ncmpcpp/bindings index d1bfc3e..3dd55e7 100644 --- a/player/config/ncmpcpp/bindings +++ b/player/config/ncmpcpp/bindings @@ -620,5 +620,7 @@ def_key "f" change_browse_mode def_key "x" delete_playlist_items +def_key "X" + delete_browser_items def_key "P" show_playlist diff --git a/player/config/ncmpcpp/config b/player/config/ncmpcpp/config index 287641e..9fdd7bf 100644 --- a/player/config/ncmpcpp/config +++ b/player/config/ncmpcpp/config @@ -364,7 +364,7 @@ media_library_albums_split_by_date = no # #generate_win32_compatible_filenames = yes # -#allow_for_physical_item_deletion = no +allow_for_physical_item_deletion = yes # ## ## Note: If you set this variable, ncmpcpp will try to get info from last.fm in From 76cd79a537971892aa542ac062b265b7a2a49fcf Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Thu, 8 Oct 2020 00:21:32 +0800 Subject: [PATCH 5/7] [bugfix] NERDCommenter not handling js commenting correctly when ft=vue --- nvim/config/init.vim | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/nvim/config/init.vim b/nvim/config/init.vim index a63bca8..ca45739 100644 --- a/nvim/config/init.vim +++ b/nvim/config/init.vim @@ -166,3 +166,25 @@ let g:ctrlp_user_command = ['.git', 'git ls-files -co --exclude-standard'] color gruvbox set background=dark highlight Normal ctermbg=None + +" ==== NERDCommenter for vue ==== +let g:ft = '' +fu! NERDCommenter_before() + if &ft == 'vue' + let g:ft = 'vue' + let stack = synstack(line('.'), col('.')) + if len(stack) > 0 + let syn = synIDattr((stack)[0], 'name') + if len(syn) > 0 + let syn = tolower(syn) + exe 'setf '.syn + endif + endif + endif +endfu +fu! NERDCommenter_after() + if g:ft == 'vue' + setf vue + g:ft + endif +endfu From a0903cab9c53973844c25e81a99f064f54ba2b83 Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Thu, 8 Oct 2020 00:26:36 +0800 Subject: [PATCH 6/7] [bugfix] unable to preview image --- ranger/config/scope.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ranger/config/scope.sh b/ranger/config/scope.sh index 653ce99..c44a8d3 100755 --- a/ranger/config/scope.sh +++ b/ranger/config/scope.sh @@ -349,7 +349,7 @@ handle_fallback() { MIMETYPE="$( file --dereference --brief --mime-type -- "${FILE_PATH}" )" -drop_bigsize +#drop_bigsize if [[ "${PV_IMAGE_ENABLED}" == 'True' ]]; then handle_image "${MIMETYPE}" fi From ad6f8e9ccb55c1f4ef24d8aac9104336870e228f Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Thu, 8 Oct 2020 23:37:05 +0800 Subject: [PATCH 7/7] [misc] move locking setting to autostart --- suckless/config/dwm/autostart | 1 + suckless/install.sh | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/suckless/config/dwm/autostart b/suckless/config/dwm/autostart index a8c0b27..eabc1d5 100755 --- a/suckless/config/dwm/autostart +++ b/suckless/config/dwm/autostart @@ -10,6 +10,7 @@ $HOME/.config/dunst/launch.sh $HOME/.config/dwm/dwmbar # setup screen locker +xset s 300 killall xss-lock xss-lock --ignore-sleep (which slock) & diff --git a/suckless/install.sh b/suckless/install.sh index 359b75b..e3354a6 100755 --- a/suckless/install.sh +++ b/suckless/install.sh @@ -64,14 +64,9 @@ export XMODIFIERS="@im=ibus" export QT_IM_MODULE=ibus export GTK_IM_MODULE=xim -# auto lock after 300 seconds -xset s 300 -systemd-lock-handler /usr/local/bin/slock - # setup gnome keyring dbus-update-activation-environment --systemd DISPLAY -eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh) -export SSH_AUTH_SOCK +export SSH_AUTH_SOCK=$(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh) # load monitors profile autorandr --change --force