Increase DPI, various fish functions

5 years ago · 1ef5633357
15 changed files with 495 additions and 38 deletions
--- a/aliases/key_aliases.tmpl
+++ b/aliases/key_aliases.tmpl
@ -16,8 +16,10 @@ ru "xrdb ~/.Xresources && grep wallpaper ~/.cache/wal/colors.sh | cut -d\' -f2 |

 dua "sudo du -h --apparent-size | sort -h"
 # list file sizes in megabytes with depth 1
-duh "sudo du -d 1 -h --apparent-size | sort -h"
-dum "sudo du -d 1 -m --apparent-size | sort -h"
+# duh "sudo du -d 1 -h --apparent-size | sort -h"
+# dum "sudo du -d 1 -m --apparent-size | sort -h"
+duh "du -d 1 -h --apparent-size | sort -h"
+dum "du -d 1 -m --apparent-size | sort -h"
 m "man"
 tld "tldr"

@ -39,7 +41,7 @@ xrs "xrandr -s 0"
 vgb "sudo nvim /etc/default/grub"
 mkgb "sudo grub-mkconfig -o /boot/grub/grub.cfg"

-ba "bat"
+a "bat"
 # ba "bat *"
 grep "grep --color=auto -n"
 grpr "grep -r"
@ -87,6 +89,7 @@ udm "udisksctl mount -b"
 udmb "udisksctl mount -b /dev/sdc2"
 udu "udisksctl unmount -b"
 udub "udisksctl unmount -b /dev/sdc2"
+
 # ]]] mounting # 

 tc "touch"
@ -97,11 +100,13 @@ vdr "vidir --verbose"
 {{ if not (eq .linux_os "termux") }}
 l "lsd -F --group-dirs first"
 la "lsd -AF --group-dirs first"
-ll "lsd -AlF --group-dirs first --size short"
+ll "lsd -lF --group-dirs first --size short"
+lla "lsd -AlF --group-dirs first --size short"
 {{ else }}
 l "ls"
 la "ls -a"
-ll "ls -al"
+ll "ls -l"
+lla "ls -al"
 {{ end }}
 cwd "echo (pwd) | xclip -selection clipboard"
 smv "sudo mv"
@ -133,7 +138,7 @@ nbu "cd /run/media/kevin/backup-hd/{{ .chezmoi.fullHostname }}/tar && lsd -l"
 s "systemctl suspend"
 x "exit"
 so "xset dpms force off"
-sd "systemctl poweroff"
+sd "tmux kill-server; systemctl poweroff"
 rb "systemctl reboot"
 lo "i3-msg exit"
 xm "xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE"
@ -190,8 +195,6 @@ yau "yay -Sy"
 yadl "yay -Syuw --answerclean=None --answerdiff=None --answeredit=None"
 # sync and update
 yaug "yay -Syu --answerclean=None --answerdiff=None --answeredit=None"
-# export packages
-xya "yay -Qqne > ~/{{ .chezmoi.os }}-config/txt/{{ .chezmoi.fullHostname }}-pkgs.txt && yay -Qqme > ~/{{ .chezmoi.os }}-config/txt/{{ .chezmoi.fullHostname }}-aur.txt "

 # ]]] yay #
 #]]]
@ -250,19 +253,24 @@ id "identify"
 # applications  [[[ #

 # silent="> /dev/null 2>&1& "
-a "antimicro"
+am "antimicro"
 # buku [[[ #

-b "buku"
-bd "buku -za ''"
+# b "buku"
+bd "buku -za '"
 bh "buku -h | bat"
 bi "buku --immutable 1 -zu"
 bo "buku -o"
+bp "buku -p"
 br "buku -zd"
 brp "buku --replace"
 bs "buku --deep -n5 -s"
+bsq "sqlitebrowser ~/.local/share/buku/bookmarks.db &"
 bsv "bukuserver run --host 127.0.0.1 --port 5001"
-bw "buku -zw --immutable 1"
+bt "buku --deep -n5 -t"
+bu "buku -zu"
+but "buku -zu --tag"
+bw "buku --immutable 1 -zw"

 # ]]] buku #
 chr "google-chrome"
@ -292,7 +300,7 @@ p3 "python3"
 pdft "pdftotext"
 pipes "pipes.sh -t 3"
 py "python"
-qc "qalc ''"
+qc "qalc '"
 qcg "qalculate-gtk"
 r "ranger"
 rbg "ranger --selectfile (grep wallpaper ~/.cache/wal/colors.sh | cut -d\' -f2)"
@ -306,10 +314,13 @@ stp "termdown"
 # sw "swex"
 t "tmux"#[[[
 ta "tmux a -t"
+tac "tmux a -t config"
+taj "tmux a -t journal"
 tal "tmux a"
 tk "tmux kill-server"
 tl "tmux ls"
 tn "tmux new -s"
+tnb "tmux new -s backup"
 tnc "tmux new -s config"
 tnj "tmux new -s journal"
 #]]]
@ -366,10 +377,12 @@ wt "watson status"
 # log/report [[[ #

 wl "watson log -Gcd"
-wla "watson log -Gca -T"
+wla "watson log -Gca -p"
+wlat "watson log -Gca -T"
 ww "watson log -Gc"
 wr "watson report -Gcd"
-wra "watson report -Gca -T"
+wra "watson report -Gca -p"
+wrat "watson report -Gca -T"
 wrw "watson report -Gc"

 # ]]] log/report #
@ -481,10 +494,11 @@ gc "git commit -S"
 gcu "git commit"
 gca "git add -A && git commit --amend --no-edit -S"
 gcam "git add -A && git commit --amend -S"
-gcap "git add -A && git commit --amend --no-edit -S && gpsf"
+gcap "git add -A && git commit --amend --no-edit -S && git push --force"

 psgi "git add -A && git commit -m 'Update' -S && git push"
 gps "git push"
+gpsg "git push gitea"
 gpsi "git config credential.helper store && git push"
 # gpsn "git push --set-upstream origin master"
 gpsn "eval (git push 2>&1 | tail -n 2)"
@ -537,7 +551,8 @@ upip "pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xa
 ureq "pip freeze > requirements.txt"

 # show last history scan
-hlg "tail -n 5 $spv_dir/src/api/management/commands/update-history.log"
+hlg "psql -d spotifyvis -a -f /home/kevin/coding/spotify-lib-vis/src/scripts/history.sql | rg 2019 | tac"
+slg "tail -n 5 $spv_dir/src/api/management/commands/update-history.log"
 # scan history
 # hs "$spv_dir/src/update-history.sh && cat $spv_dir/src/api/management/commands/update-history.log | tail -n 1"
 # removes all but newest file
@ -545,6 +560,8 @@ hlg "tail -n 5 $spv_dir/src/api/management/commands/update-history.log"

 snw "spotify-now -i '%artist - %title'"

+svd "pg_dump spotifyvis > spotifyvis.bak"
+
 # ]]] spotify-lib-vis #

 shc "shellcheck"
--- a/aliases/key_files.tmpl
+++ b/aliases/key_files.tmpl
@ -7,7 +7,7 @@ a ~/linux-config/aliases/key_aliases.tmpl
 d ~/linux-config/aliases/key_dirs.tmpl
 dw ~/dwm/config.def.h
 f ~/linux-config/aliases/key_files.tmpl
-hs ~/.local/share/fish/fish_history
+h ~/.local/share/fish/fish_history
 p ~/linux-config/txt/pacman-pkgs/pacman-pkgs.txt
 r ~/linux-config/dot_config/ranger/rc.conf.tmpl
 sr ~/linux-config/configs/ranger/shortcuts.conf
@ -25,12 +25,12 @@ z ~/linux-config/aliases/zsh_aliases

 # cdn [[[ #

-bid ~/coding/project-ideas/blog.md
+bid ~/Documents/journal/todo/blog.md
 ci ~/linux-config/txt/ideas.md
 cm ./commit-msg.txt
 cmt /tmp/commit-msg.txt
 hlg ~/coding/spotify-lib-vis/src/api/management/commands/update-history.log
-id ~/coding/project-ideas/ideas.md
+id ~/Documents/journal/todo/ideas.md
 ig ./.gitignore
 jn ~/Documents/journal/todo/8.md
 jt ~/Documents/journal/todo/todo.md
--- a/dot_Xresources.tmpl
+++ b/dot_Xresources.tmpl
@ -1,12 +1,25 @@
+/* dpi [[[ */
+
+Xft.dpi: 135
+Xft.autohint: 0
+Xft.lcdfilter:  lcddefault
+Xft.hintstyle:  hintfull
+Xft.hinting: 1
+Xft.antialias: 1
+Xft.rgba: rgb
+
+/* ]]]  dpi */
+
 /* font [[[ */

 {{ if eq .chezmoi.fullHostname "x1-carbon" }}
 URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=11
 ! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=12
 {{ else }}
-URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=15
+! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=15
 ! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=14
 ! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=13.5
+URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=12
 {{ end }}
 ! URxvt.font: xft:Hack:size=18

--- a/dot_config/fish/config.fish.tmpl
+++ b/dot_config/fish/config.fish.tmpl
@ -22,10 +22,11 @@ set -U mfs_dir "/home/kevin/coding/mf-site"
 source /home/kevin/coding/spotify-lib-vis/src/scripts/api-keys-fish.sh
 {{ end }}

-set -x PATH $PATH ~/.local/bin ~/scripts ~/scripts/colors ~/go/bin ~/.minetest/minetest/bin
+set -x PATH $PATH ~/.local/bin ~/scripts ~/scripts/colors ~/go/bin ~/.minetest/minetest/bin ~/.gem/ruby/2.6.0/bin
 set -x CLASSPATH $CLASSPATH /home/kevin/java/*.jar
 set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH /usr/local/lib /usr/local/lib64
 set -x PKG_CONFIG_PATH $PKG_CONFIG_PATH /usr/lib/pkgconfig
+set -x HASTE_SERVER https://pste.gq

 {{ if eq .linux_os "termux" }}
 # set SPACEFISH_PROMPT_ORDER time user dir host git package node docker ruby golang php rust haskell julia aws conda pyenv kubecontext exec_time line_sep battery jobs exit_code vi_mode char
@ -88,9 +89,10 @@ abbr xf "fish_config"

 abbr ! "sudo !!"
 abbr ag "grep-aliases"
-abbr bf "buku-fzf"
-abbr bff "buku-fzf fq"
+abbr b "buku-fzf"
+abbr bf "buku-fzf fq"
 abbr bq "benq-brightness"
+abbr bupp "backup-phone-pics"
 abbr cpc "copy cat"
 abbr cpe "copy echo"
 abbr cpp "copy echo (pwd)"
@ -98,6 +100,7 @@ abbr cff "create-fish-function"
 abbr def "define"
 abbr ev "evince-silent"
 # abbr fbg "find-bg"
+abbr fvft "find-vim-filetype"
 abbr fzv "fzf-vim"
 # git [[[ #

@ -110,11 +113,12 @@ abbr gro "git-replace-origin"

 # ]]] git #
 abbr hs "scan-history"
-abbr hst "$EDITOR ~/.local/share/fish/fish_history"
 abbr mn "man-vim"
 abbr mat "math"
 abbr pgr "grep-pdf"
 abbr pgrf "grep-pdf-file"
+abbr png "git-push-new-gitea"
+abbr pst "pastebin"
 abbr rf "refresh-config"
 abbr rs "redshift-set"
 abbr shrm "shred-rm"
@ -122,7 +126,7 @@ abbr thes "thesaurus"
 abbr ut "unix-timestamp"
 abbr uzr "unzip-rm"
 abbr vsnp "vim-snippet"
-abbr fvft "find-vim-filetype"
+abbr xya "export-pkgs"

 # school [[[ #

--- a/dot_config/fish/functions/backup-phone-pics.fish
+++ b/dot_config/fish/functions/backup-phone-pics.fish
@ -0,0 +1,4 @@
+function backup-phone-pics
+    rsync -rave 'ssh -p 8022' 192.168.0.12:/data/data/com.termux/files/home/storage/dcim/Camera /mnt/linux-files/Pictures/pixel
+    and rsync -rave 'ssh -p 8022' 192.168.0.12:/data/data/com.termux/files/home/storage/pictures/ /mnt/linux-files/Pictures/pixel/pictures
+end
--- a/dot_config/fish/functions/buku-fzf.fish
+++ b/dot_config/fish/functions/buku-fzf.fish
@ -1,9 +1,13 @@
 function buku-fzf
    # buku -p -f 5 | awk -F '\t' 'BEGIN { OFS=FS }; { $2=substr($2, 1, 90); print }' | column -t -s (printf '\t') | fzf --multi | awk '{ print $1 }'
-    if test $argv[1] = "fq"
-        set ids (buku -t fq -f4 | awk -F '\t' 'BEGIN { OFS=FS }; { sub(/https?:\/\/(www\.)?/, "", $2); $2=substr($2, 1, 45); $3=substr($3, 1, 50); print }' | column -t -s (printf '\t') | fzf --multi --tiebreak end | awk '{ print $1 }')
+    # if test (count $argv) -ge 1 -a "$argv[1]" = "fq"
+        # set ids (buku -t fq -f4 | awk -F '\t' 'BEGIN { OFS=FS }; { sub(/https?:\/\/(www\.)?/, "", $2); $2=substr($2, 1, 45); $3=substr($3, 1, 50); print }' | column -t -s (printf '\t') | fzf --multi --tiebreak end | awk '{ print $1 }')
+    if test (count $argv) -eq 1
+        # TODO: column width? #
+        set ids (buku -t + "$argv" -f4 | awk -F '\t' 'BEGIN { OFS=FS }; { sub(/https?:\/\/(www\.)?/, "", $2); $2=substr($2, 1, 45); $3=substr($3, 1, 50); print }' | column -t -s (printf '\t') | fzf --multi --tiebreak end | awk '{ print $1 }')
+        # echo buku -t + "$argv" -f4
    else
-        set ids (buku -p -f4 | awk -F '\t' 'BEGIN { OFS=FS }; { sub(/https?:\/\/(www\.)?/, "", $2); $2=substr($2, 1, 45); $3=substr($3, 1, 45); print }' | column -t -s (printf '\t') | fzf --multi --tiebreak end | awk '{ print $1 }')
+        set ids (buku -p -f4 | awk -F '\t' 'BEGIN { OFS=FS }; { sub(/https?:\/\/(www\.)?/, "", $2); $2=substr($2, 1, 45); $3=substr($3, 1, 50); print }' | column -t -s (printf '\t') | fzf --multi --tiebreak end | awk '{ print $1 }')
    end

    for id in $ids
--- a/dot_config/fish/functions/export-pkgs.fish
+++ b/dot_config/fish/functions/export-pkgs.fish
@ -0,0 +1,5 @@
+function export-pkgs
+    yay -Qqne > ~/linux-config/txt/(hostname)-pkgs.txt 
+    and yay -Qqme > ~/linux-config/txt/(hostname)-aur.txt 
+    and yay -Qqe > ~/linux-config/txt/(hostname)-all.txt 
+end
--- a/dot_config/fish/functions/git/git-push-new-gitea.fish
+++ b/dot_config/fish/functions/git/git-push-new-gitea.fish
@ -0,0 +1,4 @@
+function git-push-new-gitea
+    git remote add gitea git@git.ataraxy.tk:Kevin-Mok/$argv[1].git
+    and git push --set-upstream gitea master
+end
--- a/dot_config/fish/functions/pastebin.fish
+++ b/dot_config/fish/functions/pastebin.fish
@ -1,3 +1,5 @@
 function pastebin
-    cat $argv[1] | curl -F 'sprunge=<-' http://sprunge.us
+    # cat $argv[1] | curl -F 'sprunge=<-' http://sprunge.us
+    # set -x HASTE_SERVER https://pste.gq
+    cat $argv[1] | haste --raw
 end
--- a/dot_config/i3/config.tmpl
+++ b/dot_config/i3/config.tmpl
@ -40,7 +40,7 @@ bindsym Mod4+Return exec /home/kevin/scripts/dmenu-history -nb "$fg" -nf "$bg" -
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.
 # bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
-bindsym Mod4+b layout tabbed; exec zathura
+# bindsym Mod4+b layout tabbed; exec zathura
 bindsym Mod4+c exec $browser
 # bindsym Mod4+e exec notify-send "HPS Word Count" "$(pdftotext /home/kevin/school/latex-notes/hps/essay.pdf - | wc -w)"
 bindsym Mod4+e exec emacs
@ -232,7 +232,7 @@ bindsym Control+Shift+l move right

 # split in horizontal orientation
 bindsym $mod+b split h
-bindsym Mod4+$mod+b split h; exec $term
+bindsym Control+$mod+b split h; exec $term

 # split in vertical orientation
 bindsym $mod+v split v
@ -286,6 +286,12 @@ set $ws3 "3 "
 # set $ws3 "3 "
 workspace $ws3 output $main
 bindsym $mod+F3 workspace $ws3; exec $browser
+# bindsym Mod4+b workspace $ws3; layout stacked; exec urxvt -e fish -c "buku-fzf"
+# bindsym Mod4+$mod+b workspace $ws3; layout stacked; exec urxvt -e fish -c "buku-fzf fq"
+# bindsym Mod4+b layout stacked; exec urxvt -e fish -c "buku-fzf"
+# bindsym Mod4+$mod+b layout stacked; exec urxvt -e fish -c "buku-fzf fq"
+bindsym Mod4+b layout tabbed; exec urxvt -e fish -c "buku-fzf"
+bindsym Mod4+$mod+b layout tabbed; exec urxvt -e fish -c "buku-fzf fq"

 set $ws4 "4 "
 workspace $ws4 output $secondary
@ -451,8 +457,8 @@ bar {
  {{ if eq .chezmoi.fullHostname "x1-carbon" }}
  font pango:$sb_font 17
  {{ else }}
-  font pango:$sb_font 21
  # font pango:$sb_font 19
+  font pango:$sb_font 17
  {{ end }}
  colors {
    # 0 (transparent) -> 255 (opaque) in hex
@ -481,8 +487,8 @@ bar {
  {{ if eq .chezmoi.fullHostname "x1-carbon" }}
  font pango:$sb_font 18
  {{ else }}
-  font pango:$sb_font 25
-  # font pango:$sb_font 20
+  # font pango:$sb_font 22
+  font pango:$sb_font 20
  {{ end }}
  # output $main
  i3bar_command i3bar -t
--- a/dot_config/ranger/executable_scope.sh
+++ b/dot_config/ranger/executable_scope.sh
@ -93,7 +93,7 @@ handle_extension() {

 		# JSON
        json)
-            jq --color-output . "${FILE_PATH}" && exit 5
+            jq --color-output '.' "${FILE_PATH}" && exit 5
            python -m json.tool -- "${FILE_PATH}" && exit 5
            
        # txt)
--- a/dot_vimrc.tmpl
+++ b/dot_vimrc.tmpl
@ -64,7 +64,8 @@ autocmd FileType *css,htmldjango,html,javascript,json,lisp,markdown,tex,text,yam
 autocmd BufNewFile,BufRead *.gd set expandtab!
 autocmd Filetype go set expandtab! sw=4
 " autocmd Filetype markdown set commentstring=<!---\ %s\ -->
-autocmd Filetype markdown map <F8> :LivedownToggle<CR>
+" autocmd Filetype markdown map <F8> :LivedownToggle<CR>
+autocmd Filetype markdown map <F8> :InstantMarkdownPreview<CR>
 autocmd Filetype markdown nnoremap <Tab> <Esc>>>A
 autocmd Filetype markdown inoremap <S-Tab> <Esc><<A
 autocmd Filetype markdown inoremap < <Esc><<A
@ -262,6 +263,7 @@ Plug 'dag/vim-fish'
 " live preview Markdown"
 " Plug 'shime/vim-livedown'
 Plug 'suan/vim-instant-markdown', {'for': 'markdown'}
+  let g:instant_markdown_autostart = 0
 " git helper
 Plug 'tpope/vim-fugitive'
 " auto reload file
@ -321,6 +323,9 @@ colorscheme gotham256

 " normal mappings [[[ "

+nnoremap <ScrollWheelUp> <C-U>
+nnoremap <ScrollWheelDown> <C-D>
+
 " visual select across lines by default "
 nnoremap v <C-V>
 " last macro "
--- a/txt/nzxt-all.txt
+++ b/txt/nzxt-all.txt
@ -0,0 +1,388 @@
+acestream-engine
+acestream-player
+alsa-utils
+android-file-transfer
+antimicro
+apache
+arch-install-scripts
+arno-iptables-firewall
+asp
+aurvote
+autoconf
+automake
+bash
+bat
+bc
+bear
+biber
+bison
+bookworm
+broadcom-wl
+browserpass
+bukuserver
+bzip2
+calcurse
+certbot
+chezmoi
+chromium
+chromium-widevine
+cliqz-bin
+cloc
+cmake
+cmatrix
+colordiff
+compton-tryone-git
+coreutils
+cowsay
+cronie
+cryptsetup
+curseradio-git
+dateutils
+device-mapper
+dhcpcd
+dialog
+diffutils
+discord
+dmenu
+doxygen
+dragon-drag-and-drop-git
+dunst
+e2fsprogs
+electrum
+emacs
+encfs
+evince
+fakeroot
+fd
+feh
+ffcast
+file
+filesystem
+findutils
+firefox
+fish
+flashplugin
+flashplugin-focusfix
+flex
+fortune-mod
+fzf
+gawk
+gcc
+gcc-libs
+gdb
+gettext
+gimp
+git
+glibc
+godot-bin
+gradle
+grep
+grub
+gzip
+habitctl-git
+hdf5
+heroku-cli
+hexyl
+highlight
+htop-vim-git
+hugo
+i3-gaps-rounded
+i3blocks-git
+i3status
+imv
+imwheel
+inetutils
+iniparser
+inotify-tools
+insomnia
+intellij-idea-community-edition
+iproute2
+iputils
+irrlicht
+jfsutils
+jmtpfs
+jp2a
+junit
+kitty
+less
+lib32-nvidia-utils
+libavutil-52
+libreoffice-still
+licenses
+linux
+linux-firmware
+linux-headers
+linux-kevin
+linux-kevin-headers
+linux-nzxt
+linux-nzxt-headers
+logrotate
+lolcat
+lsd
+lsof
+lua-cjson
+lvm2
+lxappearance
+make
+man-db
+man-pages
+mdadm
+meld
+mongodb-bin
+mongodb-tools-bin
+mono
+mono-basic
+mosh
+mpv
+nano
+ncdu
+neofetch
+neomutt
+neovim
+nerd-fonts-dejavu-complete
+nerd-fonts-hack
+netctl
+nnn
+noto-fonts
+ntfs-3g
+ntp
+numlockx
+nvidia-dkms
+nvidia-settings
+nx3-all
+openshot
+openssh
+os-prober
+p7zip
+pacman
+pacman-contrib
+pandoc
+pass
+patch
+pciutils
+pcmanfm
+pdfgrep
+peaclock
+peek
+perl
+perl-image-exiftool
+pgadmin4
+pipes.sh
+pkgconf
+postgresql
+procps-ng
+psmisc
+pulseaudio
+pycp
+pyside2
+python-dbus
+python-numpy
+python-pip
+python-pywal
+python-setuptools
+python-tinydb
+qalculate-gtk
+qdirstat
+qemu
+qrencode
+qt5-3d
+qt5-charts
+qt5-connectivity
+qt5-datavis3d
+qt5-doc
+qt5-examples
+qt5-gamepad
+qt5-graphicaleffects
+qt5-imageformats
+qt5-lottie
+qt5-networkauth
+qt5-purchasing
+qt5-quickcontrols
+qt5-quickcontrols2
+qt5-remoteobjects
+qt5-script
+qt5-scxml
+qt5-serialbus
+qt5-serialport
+qt5-speech
+qt5-tools
+qt5-translations
+qt5-virtualkeyboard
+qt5-wayland
+qt5-webengine
+qt5-webglplugin
+qt5-websockets
+qt5-webview
+qt5-xmlpatterns
+ranger
+redshift
+reiserfsprogs
+riot-desktop
+ripgrep
+robo3t-bin
+rsync
+rxvt-unicode-patched
+s-nail
+sc-im
+scrot
+sdcv
+sed
+shadow
+shellcheck
+simple-mtpfs
+sl
+slack-desktop-dark
+smartmontools
+spatialindex
+spotify
+spotify-now-git
+sqlitebrowser
+sshfs
+sshpass
+steam
+steam-native-runtime
+steamos-xpad-dkms
+stow
+subtitleeditor
+sudo
+surf
+sxiv
+sysfsutils
+sysstat
+systemd-numlockontty
+systemd-sysvcompat
+tar
+termdown
+texinfo
+texlive-core
+texlive-local-adjustbox
+texlive-local-algorithmicx
+texlive-local-algorithms
+texlive-local-biblatex
+texlive-local-biblatex-apa
+texlive-local-capt-of
+texlive-local-collectbox
+texlive-local-csquotes
+texlive-local-elocalloc
+texlive-local-enumitem
+texlive-local-environ
+texlive-local-fontawesome
+texlive-local-footmisc
+texlive-local-forest
+texlive-local-gfsdidot
+texlive-local-ifmtarg
+texlive-local-inlinedef
+texlive-local-logreq
+texlive-local-multirow
+texlive-local-numprint
+texlive-local-pgfopts
+texlive-local-pgfplots
+texlive-local-siunitx
+texlive-local-sourcesanspro
+texlive-local-tcolorbox
+texlive-local-tikz-qtree
+texlive-local-titlesec
+texlive-local-tkz-base
+texlive-local-tkz-euclide
+texlive-local-trimspaces
+texlive-local-was
+texlive-local-xifthen
+texlive-localmanager-git
+the_silver_searcher
+thunderbird
+tidy
+time
+tmux
+tor
+transmission-cli
+transmission-gtk
+trizen
+ttf-dejavu
+ttf-font-awesome
+ttf-joypixels
+ttf-ubuntu-font-family
+udisks2
+unrar
+unzip
+urxvt-resize-font-git
+usbutils
+util-linux
+valgrind
+vi
+vidir
+vim
+virtualbox
+vlc
+vtk
+w3m
+weechat-vimode-git
+wego
+which
+wireless_tools
+wkhtmltopdf
+wpa_actiond
+wpa_supplicant
+xautomation
+xbindkeys
+xclip
+xdotool
+xf86-input-evdev
+xf86-input-keyboard
+xf86-input-mouse
+xf86-input-synaptics
+xf86-input-vmmouse
+xf86-input-void
+xf86-video-amdgpu
+xf86-video-ati
+xf86-video-dummy
+xf86-video-fbdev
+xf86-video-intel
+xf86-video-openchrome
+xf86-video-qxl
+xf86-video-vesa
+xf86-video-vmware
+xf86-video-voodoo
+xfsprogs
+xorg-bdftopcf
+xorg-iceauth
+xorg-luit
+xorg-mkfontscale
+xorg-server
+xorg-sessreg
+xorg-smproxy
+xorg-x11perf
+xorg-xbacklight
+xorg-xcmsdb
+xorg-xcursorgen
+xorg-xdpyinfo
+xorg-xdriinfo
+xorg-xev
+xorg-xgamma
+xorg-xhost
+xorg-xinit
+xorg-xinput
+xorg-xkbevd
+xorg-xkbutils
+xorg-xkill
+xorg-xlsatoms
+xorg-xlsclients
+xorg-xpr
+xorg-xprop
+xorg-xrandr
+xorg-xrefresh
+xorg-xset
+xorg-xsetroot
+xorg-xvinfo
+xorg-xwd
+xorg-xwininfo
+xorg-xwud
+xvkbd
+yad
+yay
+youtube-dl
+youtube-viewer
+zathura
+zathura-pdf-mupdf
+zbar
+zip
+zsh
--- a/txt/nzxt-aur.txt
+++ b/txt/nzxt-aur.txt
@ -4,15 +4,16 @@ antimicro
 arno-iptables-firewall
 aurvote
 bear
+bukuserver
 chromium-widevine
 cliqz-bin
 compton-tryone-git
 curseradio-git
-discord
 dragon-drag-and-drop-git
 ffcast
 flashplugin-focusfix
 godot-bin
+habitctl-git
 heroku-cli
 htop-vim-git
 i3-gaps-rounded
--- a/txt/nzxt-pkgs.txt
+++ b/txt/nzxt-pkgs.txt
@ -31,6 +31,7 @@ device-mapper
 dhcpcd
 dialog
 diffutils
+discord
 dmenu
 doxygen
 dunst
@ -80,6 +81,7 @@ irrlicht
 jfsutils
 jp2a
 junit
+kitty
 less
 lib32-nvidia-utils
 libreoffice-still
@ -176,6 +178,7 @@ qt5-xmlpatterns
 ranger
 redshift
 reiserfsprogs
+riot-desktop
 ripgrep
 rsync
 s-nail
@ -193,6 +196,7 @@ sshpass
 steam
 steam-native-runtime
 stow
+subtitleeditor
 sudo
 surf
 sxiv