2022

3 files changed, 24 insertions, 26 deletions

diff --git a/.vimrc b/.vimrc
index 1ed5b65..35db1fc 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,5 +1,5 @@
-set nocompatible              " be iMproved, required
-filetype off                  " required
+set nocompatible    " be iMproved, required
+filetype on         " required
 
 set timeoutlen=1000
 set ttimeoutlen=5
@@ -69,3 +69,11 @@ nnoremap <leader>c :Cmus<CR>
 
 nnoremap <leader>p :PencilToggle<CR>
 let g:pencil#map#suspend_af = 'K'
+let g:pencil#textwidth = 74
+augroup pencil
+    autocmd!
+    autocmd FileType markdown,mkd call pencil#init()
+    autocmd FileType text         call pencil#init()
+augroup END
+
+nnoremap <leader>a :ALEToggle<CR>
diff --git a/.zshrc b/.zshrc
index 9c113d2..45f3f3f 100644
--- a/.zshrc
+++ b/.zshrc
@@ -39,7 +39,7 @@ bright () {
 }
 
 mnt-cryfs () {
-    cryfs "$HOME/.local/share/plasma-vault/$1.enc" "$HOME/Vaults/$1"
+    cryfs "/data/Vaults/$1.enc" "$HOME/Vaults/$1"
 }
 
 umnt-cryfs () {
@@ -55,7 +55,6 @@ export QT_IM_MODULE=ibus
 # SSH
 alias mrf="mosh root@fkfd.me"
 alias mff="mosh fred@fkfd.me"
-alias sf="sftp node@fkfd.me:/home/node/fkfd/public/comics/"
 alias tilde="mosh fkfd@tilde.town -ssh='ssh -i ~/.ssh/id_rsa'"
 
 # file privileges
@@ -63,31 +62,26 @@ alias gimme="sudo chown -R $USER ./ && sudo chmod -R +rw ./*"
 alias lemme="sudo chmod +x"
 
 # embedded
-export IDF_PATH="$HOME/esp/esp-idf"
-alias espup="ampy -p /dev/ttyUSB0 put"
-alias espls="ampy -p /dev/ttyUSB0 ls"
 alias ard="arduino-cli"
 
 # python
 alias py="python"
-alias pipi="sudo pip install -i https://pypi.tuna.tsinghua.edu.cn/simple"
 alias venv="source ./venv/bin/activate"
 
 # tools
 alias ytdl="youtube-dl --proxy socks5://localhost:1080/"
-alias v="vim"
+alias ytdlp="yt-dlp --proxy socks5://localhost:1080/"
+alias v="nvim"
 alias c="cat"
 alias ls="exa"
-alias v2="(v2ray -config ~/.v2ray.json&)"
-alias uv="(v2ray -config ~/.v2ray.json&) & (python -m utab&)"
 alias dormshare="sudo python -m http.server -b 192.168.8.88 80"
 
 alias tlmgr="/usr/share/texmf-dist/scripts/texlive/tlmgr.pl --usermode"
 
-alias tile="montage -tile 1x -geometry +0+0"
+alias catpic="montage -tile 1x -geometry +0+0"
 
 # fun
-alias rickroll="vlc -f '/home/fkfd/Videos/Rick Astley - Never Gonna Give You Up (Official Music Video).mkv'"
+alias rickroll="vlc -f '/data/Videos/Rick Astley - Never Gonna Give You Up (Official Music Video).mkv'"
 
 # disable beep in x11
 set -B 0
diff --git a/sway/config b/sway/config
index 1fd2221..485e664 100644
--- a/sway/config
+++ b/sway/config
@@ -24,18 +24,18 @@ output eDP-1 {
     pos 0 0
 }
 
-output HDMI-A-0 {
+output HDMI-A-1 {
     # AOC 27" 2560x1440
     bg ~/Pictures/wallpapers/breach.png fill
     pos 0 0
 }
 
-output HDMI-A-1 {
-    # HP 20" 900x1600
-    bg ~/Pictures/wallpapers/umji_login_900x1600.png fill
-    pos 1920 0
-    transform 270
-}
+# output HDMI-A-1 {
+#     # HP 20" 900x1600
+#     bg ~/Pictures/wallpapers/umji_login_900x1600.png fill
+#     pos 1920 0
+#     transform 270
+# }
 
 # Example configuration:
 #   output HDMI-A-1 resolution 1920x1080 position 1920,0
@@ -215,11 +215,7 @@ bar {
 include /etc/sway/config.d/*
 
 # capslock <-> esc
-input 1:1:AT_Translated_Set_2_keyboard {
-    xkb_options caps:swapescape
-}
-
-input 1452:591:Keychron_K8 {
+input type:keyboard {
     xkb_options caps:swapescape
 }
 
@@ -247,7 +243,7 @@ seat seat0 xcursor_theme breeze_cursors 24
 
 # quick application launching
 bindsym $mod+m exec qutebrowser
-bindsym $mod+e exec dolphin
+bindsym $mod+e exec QT_QPA_PLATFORMTHEME=qt5ct dolphin
 
 # kde wallet
 exec --no-startup-id /usr/lib/pam_kwallet_init