From a9907709be2adc34a9d49e9ef1f3a05662719a9a Mon Sep 17 00:00:00 2001 From: foo-dogsquared Date: Thu, 16 Jan 2020 03:45:48 +0800 Subject: [PATCH] Update the config for zsh, UltiSnips snippets, and the package list --- aur-packages.txt | 4 +- bin/commit-pkglist | 3 +- packages.txt | 125 +++++++++++++----------- vim/.vim/own-snippets/asciidoc.snippets | 2 +- vim/.vim/own-snippets/nroff.snippets | 38 ++++++- zsh/.zshrc | 2 +- 6 files changed, 105 insertions(+), 69 deletions(-) diff --git a/aur-packages.txt b/aur-packages.txt index 5d6bde1..d26caa3 100644 --- a/aur-packages.txt +++ b/aur-packages.txt @@ -1,9 +1,9 @@ mantablockscreen 0.3-1 nerd-fonts-complete 2.0.0-5 otf-stix 2.0.2-1 -polybar 3.4.1-1 +polybar 3.4.2-1 screenkey 0.9-1 tdrop-git 0.3.0.r4.gf4f0f34-1 ttf-iosevka 2.3.3-1 xorg-server-xdmx 1.20.6-1 -yay 9.4.2-1 +yay 9.4.3-1 diff --git a/bin/commit-pkglist b/bin/commit-pkglist index b736445..db5871f 100644 --- a/bin/commit-pkglist +++ b/bin/commit-pkglist @@ -5,5 +5,6 @@ DOTFILES_DIRECTORY="$HOME/dotfiles" -git add "$DOTFILES_DIRECTORY/packages.txt" "$DOTFILES_DIRECTORY/aur-packages.txt" +cd "$DOTFILES_DIRECTORY" +git add "packages.txt" "aur-packages.txt" git commit -m "Update package lists as of $(date +%F)" \ No newline at end of file diff --git a/packages.txt b/packages.txt index 367b408..25a7450 100644 --- a/packages.txt +++ b/packages.txt @@ -2,14 +2,15 @@ 0ad-data a23.1-1 adobe-source-sans-pro-fonts 3.006-1 adobe-source-serif-pro-fonts 3.001-1 -alacritty 0.4.0-1 +alacritty 0.4.1-1 alsa-plugins 1.2.1-1 alsa-utils 1.2.1-1 -amd-ucode 20191215.eefb5f7-1 +amd-ucode 20191220.6871bff-1 arc-gtk-theme 20190917-1 arc-icon-theme 20161122-2 ardour 5.12-13 -asciidoctor 2.0.10-1 +asciidoctor 2.0.10-2 +audacious 3.10.1-2 autoconf 2.69-6 automake 1.16.1-2 base 2-2 @@ -20,27 +21,29 @@ blender 17:2.81.a-3 bspwm 0.9.9-1 bzip2 1.0.8-3 carla 2.0.0-1 -chromium 79.0.3945.88-1 -clang 9.0.0-3 +chromium 79.0.3945.117-1 +clang 9.0.1-1 code 1.41.1-1 -cool-retro-term 1.1.1-1 coreutils 8.31-3 cronie 1.5.5-1 cryptsetup 2.2.2-1 -device-mapper 2.02.186-4 -dhcpcd 8.1.2-1 +device-mapper 2.02.186-5 +dhcpcd 8.1.5-1 diffutils 3.7-3 dmenu 4.9-1 +docker 1:19.03.5-1 dunst 1.4.1-1 -e2fsprogs 1.45.4-2 +e2fsprogs 1.45.5-1 efibootmgr 16-2 +emacs 26.3-1 entr 4.3-1 fakeroot 1.24-2 feh 3.3-2 -file 5.37-5 +file 5.38-1 filesystem 2019.10-2 findutils 4.7.0-2 -firefox 71.0-1 +firefox 72.0.1-1 +firefox-developer-edition 73.0b4-1 flex 2.6.4-3 freeglut 3.2.1-1 gawk 5.0.1-2 @@ -49,29 +52,30 @@ gcc-libs 9.2.0-4 gdb 8.3.1-4 gettext 0.20.1-3 gimp 2.10.14-1 -git 2.24.1-2 +git 2.25.0-1 glava 1.6.3-1 glibc 2.30-3 -go 2:1.13.5-1 +go 2:1.13.6-1 +gource 0.51-1 graphviz 2.42.3-1 -grep 3.3-3 -groff 1.22.4-2 +grep 3.4-1 +groff 1.22.4-3 gvfs 1.42.2-1 gzip 1.10-3 htop 2.2.0-2 -hugo 0.61.0-1 +hugo 0.62.2-1 i3-gaps 4.17.1-1 i3blocks 1.5-3 i3status 2.13-2 inetutils 1.9.4-8 -inkscape 0.92.4-9 -iproute2 5.4.0-1 +inkscape 0.92.4-10 +iproute2 5.4.0-2 iputils 20190709-2 jack2 1.9.14-1 jdk-openjdk 13.0.1.u9-1 jfsutils 1.1.15-7 jre-openjdk 13.0.1.u9-1 -kcharselect 19.12.0-1 +kcharselect 19.12.1-1 keybase 5.1.1-1 kicad 5.1.5-1 kicad-library 5.1.5-1 @@ -79,14 +83,14 @@ krita 4.2.8.2-2 less 551-3 libtool 2.4.6+42+gb88cebd5-8 licenses 20191011-2 -linux 5.4.6.arch1-1 -linux-firmware 20191215.eefb5f7-1 -lldb 9.0.0-2 -llvm 9.0.0-4 -lmms 1.2.1-2 +linux 5.4.11.arch1-1 +linux-firmware 20191220.6871bff-1 +lldb 9.0.1-1 +llvm 9.0.1-1 +lmms 1.2.1-3 logrotate 3.15.1-2 -lolcat 100.0.0-1 -lvm2 2.02.186-4 +lolcat 100.0.0-2 +lvm2 2.02.186-5 lxappearance 0.6.3-2 lxsession 1:0.5.4-1 m4 1.4.18-3 @@ -96,26 +100,27 @@ man-db 2.9.0-1 man-pages 5.04-2 mdadm 4.1-2 moreutils 0.63-1 -nano 4.6-1 +musescore 3.3.4-1 +nano 4.7-1 ncmpcpp 0.8.2-10 neofetch 6.1.0-1 neovim 0.4.3-1 netctl 1.20-2 -networkmanager 1.22.0-1 -nnn 2.8.1-1 -nodejs 13.5.0-1 -noto-fonts 20190926-3 -npm 6.12.1-1 +networkmanager 1.22.4-1 +nnn 2.9-1 +nodejs 13.6.0-1 +noto-fonts 20190926-4 +npm 6.13.6-1 ntfs-3g 2017.3.23-3 -nvidia-390xx 390.132-10 -obs-studio 24.0.5-1 +nvidia-390xx 390.132-16 +obs-studio 24.0.5-2 octave 5.1.0-5 otf-latin-modern 2.004-3 otf-latinmodern-math 1.959-3 p7zip 16.02-5 -pacman 5.2.1-1 -pacman-contrib 1.2.0-3 -pandoc 2.7.3-90 +pacman 5.2.1-4 +pacman-contrib 1.3.0-1 +pandoc 2.8-14 patch 2.7.6-8 pciutils 3.6.2-2 peek 1.4.0-1 @@ -127,34 +132,34 @@ processing 3.5.3-3 procps-ng 3.3.15-2 psmisc 23.3-2 pstoedit 3.74-2 -pulseaudio 13.0-2 +pulseaudio 13.0-3 pulsemixer 1.5.0-2 pv 1.6.6-2 -python-pip 19.2.3-3 +python-pip 19.3-1 python-pywal 3.3.0-2 python2-scour 0.37-4 -qbittorrent 4.2.0-2 +qbittorrent 4.2.1-1 qrencode 4.0.2-1 -qt5-script 5.13.2-1 +qt5-script 5.14.0-1 r 3.6.2-1 racket 7.5-1 ranger 1.9.2-2 reiserfsprogs 3.6.27-3 rofi 1.5.4-1 -ruby 2.6.5-1 -ruby-rouge 3.3.0-2 -s-nail 14.9.15-3 +ruby 2.7.0-1 +ruby-rouge 3.14.0-2 +s-nail 14.9.16-2 scrot 1.2-1 sed 4.7-3 shadow 4.8-1 -shotcut 19.12.16-1 +shotcut 19.12.23-1 simplescreenrecorder 0.3.11-1 -sonic-pi 3.1.0-7 +sonic-pi 3.1.0-8 sox 14.4.2-5 sqlitebrowser 3.11.2-1 stow 2.3.1-2 strace 5.4-1 -sudo 1.8.29-1 +sudo 1.8.30-1 sxhkd 0.6.1-1 sysfsutils 2.1.0-11 systemd 244.1-1 @@ -171,7 +176,7 @@ texlive-pictures 2019.52499-1 texlive-science 2019.52582-1 thunar 1.8.11-1 thunar-volman 0.9.5-2 -thunderbird 68.3.0-1 +thunderbird 68.4.1-1 tmux 3.0_a-1 tree 1.8.0-1 ttf-bitstream-vera 1.10-12 @@ -180,13 +185,15 @@ ttf-fira-code 2-1 ttf-font-awesome 5.12.0-1 ttf-ibm-plex 4.0.2-1 ttf-joypixels 5.0.3-3 -udiskie 1.7.7-3 +udiskie 2.0.2-1 +upx 3.95-1 usbutils 012-2 util-linux 2.34-8 vi 1:070224-4 -vim 8.1.2268-2 -vlc 3.0.8-7 -weechat 2.7-1 +vim 8.2.0100-1 +vlc 3.0.8-8 +weechat 2.7-2 +wesnoth 1:1.14.9-2 wget 1.20.3-2 which 2.21-5 xarchiver 0.5.4.14-1 @@ -202,13 +209,13 @@ xorg-fonts-encodings 1.0.5-1 xorg-iceauth 1.0.8-1 xorg-luit 1.1.1-3 xorg-mkfontscale 1.2.1-1 -xorg-server 1.20.6-2 -xorg-server-common 1.20.6-2 -xorg-server-devel 1.20.6-2 -xorg-server-xephyr 1.20.6-2 -xorg-server-xnest 1.20.6-2 -xorg-server-xvfb 1.20.6-2 -xorg-server-xwayland 1.20.6-2 +xorg-server 1.20.6-3 +xorg-server-common 1.20.6-3 +xorg-server-devel 1.20.6-3 +xorg-server-xephyr 1.20.6-3 +xorg-server-xnest 1.20.6-3 +xorg-server-xvfb 1.20.6-3 +xorg-server-xwayland 1.20.6-3 xorg-sessreg 1.1.2-1 xorg-setxkbmap 1.3.2-1 xorg-smproxy 1.0.6-2 diff --git a/vim/.vim/own-snippets/asciidoc.snippets b/vim/.vim/own-snippets/asciidoc.snippets index 386f733..530531b 100644 --- a/vim/.vim/own-snippets/asciidoc.snippets +++ b/vim/.vim/own-snippets/asciidoc.snippets @@ -201,7 +201,7 @@ $1 $0 endsnippet -snippet mstem "Stem macro" iw +snippet stem "Stem macro" iw stem:[$1] $0 endsnippet diff --git a/vim/.vim/own-snippets/nroff.snippets b/vim/.vim/own-snippets/nroff.snippets index f2b3e7d..dbe936e 100644 --- a/vim/.vim/own-snippets/nroff.snippets +++ b/vim/.vim/own-snippets/nroff.snippets @@ -1,18 +1,46 @@ -snippet title "Title header" bi -.TH ${1:TITLE} ${2:SECTION} ${3:EXTRA} -$0 -endsnippet - +# Text formatting snippet p "Paragraph" bi .PP $0 endsnippet +snippet bf "Boldface" iw +.ft B +$1 +.ft +$0 +endsnippet + +snippet it "Italic" iw +.ft I +$1 +.ft +$0 +endsnippet + +snippet bfit "Boldface italic" iw +.ft BI +$1 +.ft +$0 +endsnippet + +# Document structures +snippet title "Title header" bi +.TH ${1:TITLE} ${2:SECTION} ${3:EXTRA} +$0 +endsnippet + snippet sect "Sectioned (unnumbered) headers" bi .SH ${1:SECTION NAME} $0 endsnippet +snippet ss "Subsectioned (unnumbered) headers" bi +.SS ${1:SUBSECTION NAME} +$0 +endsnippet + snippet ol "Ordered list setup" bi .nr step 1 1 diff --git a/zsh/.zshrc b/zsh/.zshrc index 8818c95..c8003e1 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -10,7 +10,7 @@ autoload -Uz vcs_info precmd_vcs_info() { vcs_info } precmd_functions+=( precmd_vcs_info ) setopt prompt_subst -zstyle ':vcs_info:git:*' formats '(%b)' +zstyle ':vcs_info:*' formats '[%s] (%b)' autoload -U colors && colors PS1="%F%{${fg[white]}%}%(0?.√.%?) %B%{$fg[magenta]%}%1~%{$reset_color%} \$vcs_info_msg_0_ $%f%b "