dotfiles

<-- duh.
Log | Files | Refs | LICENSE

commit e2447723db2fc3bc0fb7363a56969c7b88835c5c
parent ecb7c18648e1178d5189d8f085bf56a510c88a49
Author: Hayden Hamilton <hayden@haydenvh.com>
Date:   Fri, 14 Feb 2020 23:03:31 +0000

.

Diffstat:
M.bashrc | 3+++
M.config/fish/config.fish | 13+++++++++++--
M.config/grub/autoinstall.sh | 2++
M.config/grub/box/select_c.png | 0
M.config/grub/box/select_e.png | 0
M.config/grub/box/select_w.png | 0
M.config/grub/grub.cfg | 155++++++++++++++++++++++++++++++++-----------------------------------------------
M.config/grub/theme.txt | 4++--
M.config/irssi/config | 2+-
M.config/newsboat/config | 12++++++------
D.config/vim/surround.vim | 619-------------------------------------------------------------------------------
M.config/vimb/config | 20++++++++++++++++----
M.config/vimb/scripts.js | 10+++++-----
M.config/youtube-viewer/youtube-viewer.conf | 10++++------
M.scripts/bin/dmenu/dmpv | 2+-
M.scripts/i3blocks/disk | 2+-
M.scripts/i3blocks/disk2 | 2+-
M.scripts/i3blocks/mpv | 4++--
M.vimrc | 76+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
19 files changed, 188 insertions(+), 748 deletions(-)

diff --git a/.bashrc b/.bashrc @@ -12,6 +12,9 @@ HISTSIZE= HISTFILESIZE= export PS1="\[$(tput bold)\]\[$(tput setaf 1)\][\[$(tput setaf 3)\]\u\[$(tput setaf 2)\]@\[$(tput setaf 4)\]\h \[$(tput setaf 5)\]\w\[$(tput setaf 1)\]]\[$(tput setaf 7)\]\\\$ \[$(tput sgr0)\]" export PS2="\[$(tput bold)\]\[$(tput setaf 1)\][$(tput setaf 2)\]Unclosed string\[$(tput setaf 1)\]]\[$(tput setaf 7)\]> \[$(tput sgr0)\]" +##Start X when on tty1 +[ "$(tty)" = "/dev/tty1" ] && startx + ##Setting aliases for xbps alias \ vi="vim" \ diff --git a/.config/fish/config.fish b/.config/fish/config.fish @@ -38,8 +38,17 @@ abbr -a -g rmst bash ~/.scripts/random/gnulinux.sh abbr -a -g fff bash ~/.config/fff/config abbr -a -g python python3 abbr -a -g vimb vimb --no-maximize -abbr -a -g cleancache sudo xbps-remove -O +abbr -a -g cleancache "sudo xbps-remove -O; rm -rf ~/.cache ~/.mozilla ~/.local/share/webkitgtk" abbr -a -g clock tty-clock -s -c -C 7 +abbr -a -g ~d cd ~/general/downloads +abbr -a -g ~do cd ~/general/documents +abbr -a -g ~i cd ~/images +abbr -a -g ~wa cd ~/.wallpapers +abbr -a -g ~v cd ~/videos +abbr -a -g ~m cd ~/music +abbr -a -g ~w cd ~/work +abbr -a -g ~c cd ~/.config +abbr -a -g ~s cd ~/.scripts #Set fish colors set fish_color_command a84b8d @@ -47,7 +56,7 @@ set fish_color_autosuggestion 86296b set fish_color_quote 3ab475 #Set LS colors -set -x LS_COLORS "di=35:fi=0:ln=33:ex=91;01:*.sh=91:*.html=92:*.css=97:*.md=97:*.yml=93:*.c=94:*.h=94:*.h.orig=94;01:*.h.rej=94;01:*.mk=96:*LICENSE=90:*Makefile=90:*README=97:*.c.orig=94;01:*.c.rej=94;01:*.png=95:*.jpg=95:*.heic=95:*.heif=95:*.mp3=95;01:*opus=.95;01:*.m4a=95;01:*.flac=95;01:*.wav=95;01:*.mp4=95;04:*.mkv=95;04" +set -x LS_COLORS "di=35:fi=0:ln=33:ex=91;01:*.sh=91:*.html=92:*.css=97:*.md=97:*.yml=93:*.c=94:*.h=94:*.h.orig=94;01:*.h.rej=94;01:*.mk=96:*LICENSE=90:*Makefile=90:*README=97:*.c.orig=94;01:*.c.rej=94;01:*.png=95:*.jpg=95:*.heic=95:*.heif=95:*.mp3=95;01:*opus=.95;01:*.m4a=95;01:*.flac=95;01:*.wav=95;01:*.mp4=95;04:*.mkv=95;04:*.webm=95;04" #Frame buffer diff --git a/.config/grub/autoinstall.sh b/.config/grub/autoinstall.sh @@ -7,3 +7,5 @@ sudo cp background.png /boot/grub sudo cp grub /etc/default/grub sudo grub-mkconfig -o grub.cfg sudo cp grub.cfg /boot/grub/grub.cfg +user="$USER" +sudo chown $USER1:$USER1 grub.cfg diff --git a/.config/grub/box/select_c.png b/.config/grub/box/select_c.png Binary files differ. diff --git a/.config/grub/box/select_e.png b/.config/grub/box/select_e.png Binary files differ. diff --git a/.config/grub/box/select_w.png b/.config/grub/box/select_w.png Binary files differ. diff --git a/.config/grub/grub.cfg b/.config/grub/grub.cfg @@ -113,13 +113,13 @@ menuentry 'Void/Austall GNU/Linux' --class void_austall --class gnu-linux --clas else search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e fi - echo 'Loading Linux 5.4.17_1 ...' - linux /vmlinuz-5.4.17_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro loglevel=4 slub_debug=P page_poison=1 + echo 'Loading Linux 5.4.19_1 ...' + linux /vmlinuz-5.4.19_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro loglevel=4 slub_debug=P page_poison=1 echo 'Loading initial ramdisk ...' - initrd /initramfs-5.4.17_1.img + initrd /initramfs-5.4.19_1.img } submenu 'Advanced options for Void/Austall GNU/Linux' $menuentry_id_option 'gnulinux-advanced-788d0f37-8e91-4264-ba91-6a6b47885232' { - menuentry 'Void/Austall GNU/Linux, with Linux 5.4.17_1' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.17_1-advanced-788d0f37-8e91-4264-ba91-6a6b47885232' { + menuentry 'Void/Austall GNU/Linux, with Linux 5.4.19_1' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.19_1-advanced-788d0f37-8e91-4264-ba91-6a6b47885232' { load_video set gfxpayload=keep insmod gzio @@ -131,12 +131,12 @@ submenu 'Advanced options for Void/Austall GNU/Linux' $menuentry_id_option 'gnul else search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e fi - echo 'Loading Linux 5.4.17_1 ...' - linux /vmlinuz-5.4.17_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro loglevel=4 slub_debug=P page_poison=1 + echo 'Loading Linux 5.4.19_1 ...' + linux /vmlinuz-5.4.19_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro loglevel=4 slub_debug=P page_poison=1 echo 'Loading initial ramdisk ...' - initrd /initramfs-5.4.17_1.img + initrd /initramfs-5.4.19_1.img } - menuentry 'Void/Austall GNU/Linux, with Linux 5.4.17_1 (recovery mode)' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.17_1-recovery-788d0f37-8e91-4264-ba91-6a6b47885232' { + menuentry 'Void/Austall GNU/Linux, with Linux 5.4.19_1 (recovery mode)' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.19_1-recovery-788d0f37-8e91-4264-ba91-6a6b47885232' { load_video set gfxpayload=keep insmod gzio @@ -148,119 +148,88 @@ submenu 'Advanced options for Void/Austall GNU/Linux' $menuentry_id_option 'gnul else search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e fi - echo 'Loading Linux 5.4.17_1 ...' - linux /vmlinuz-5.4.17_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro single + echo 'Loading Linux 5.4.19_1 ...' + linux /vmlinuz-5.4.19_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro single echo 'Loading initial ramdisk ...' - initrd /initramfs-5.4.17_1.img - } -} - -### END /etc/grub.d/10_linux ### - -### BEGIN /etc/grub.d/20_linux_xen ### - -### END /etc/grub.d/20_linux_xen ### - -### BEGIN /etc/grub.d/30_os-prober ### -menuentry 'void (on /dev/sdb3)' --class void --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-simple-e0081396-b3c2-45b2-9e84-77516bd56df3' { - insmod part_msdos - insmod ext2 - set root='hd1,msdos3' - if [ x$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root --hint-bios=hd1,msdos3 --hint-efi=hd1,msdos3 --hint-baremetal=ahci1,msdos3 e0081396-b3c2-45b2-9e84-77516bd56df3 - else - search --no-floppy --fs-uuid --set=root e0081396-b3c2-45b2-9e84-77516bd56df3 - fi - linux /boot/vmlinuz-5.3.18_1 root=UUID=e0081396-b3c2-45b2-9e84-77516bd56df3 ro loglevel=4 slub_debug=P page_poison=1 - initrd /boot/initramfs-5.3.18_1.img -} -submenu 'Advanced options for void (on /dev/sdb3)' $menuentry_id_option 'osprober-gnulinux-advanced-e0081396-b3c2-45b2-9e84-77516bd56df3' { - menuentry 'Void/Austall GNU/Linux (on /dev/sdb3)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-5.3.18_1--e0081396-b3c2-45b2-9e84-77516bd56df3' { - insmod part_msdos - insmod ext2 - set root='hd1,msdos3' - if [ x$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root --hint-bios=hd1,msdos3 --hint-efi=hd1,msdos3 --hint-baremetal=ahci1,msdos3 e0081396-b3c2-45b2-9e84-77516bd56df3 - else - search --no-floppy --fs-uuid --set=root e0081396-b3c2-45b2-9e84-77516bd56df3 - fi - linux /boot/vmlinuz-5.3.18_1 root=UUID=e0081396-b3c2-45b2-9e84-77516bd56df3 ro loglevel=4 slub_debug=P page_poison=1 - initrd /boot/initramfs-5.3.18_1.img + initrd /initramfs-5.4.19_1.img } - menuentry 'Void/Austall GNU/Linux, with Linux 5.3.18_1 (on /dev/sdb3)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-5.3.18_1--e0081396-b3c2-45b2-9e84-77516bd56df3' { - insmod part_msdos - insmod ext2 - set root='hd1,msdos3' - if [ x$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root --hint-bios=hd1,msdos3 --hint-efi=hd1,msdos3 --hint-baremetal=ahci1,msdos3 e0081396-b3c2-45b2-9e84-77516bd56df3 - else - search --no-floppy --fs-uuid --set=root e0081396-b3c2-45b2-9e84-77516bd56df3 - fi - linux /boot/vmlinuz-5.3.18_1 root=UUID=e0081396-b3c2-45b2-9e84-77516bd56df3 ro loglevel=4 slub_debug=P page_poison=1 - initrd /boot/initramfs-5.3.18_1.img - } - menuentry 'Void/Austall GNU/Linux, with Linux 5.3.18_1 (recovery mode) (on /dev/sdb3)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-5.3.18_1-root=UUID=e0081396-b3c2-45b2-9e84-77516bd56df3 ro single-e0081396-b3c2-45b2-9e84-77516bd56df3' { - insmod part_msdos - insmod ext2 - set root='hd1,msdos3' - if [ x$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root --hint-bios=hd1,msdos3 --hint-efi=hd1,msdos3 --hint-baremetal=ahci1,msdos3 e0081396-b3c2-45b2-9e84-77516bd56df3 - else - search --no-floppy --fs-uuid --set=root e0081396-b3c2-45b2-9e84-77516bd56df3 - fi - linux /boot/vmlinuz-5.3.18_1 root=UUID=e0081396-b3c2-45b2-9e84-77516bd56df3 ro single - initrd /boot/initramfs-5.3.18_1.img - } - menuentry 'Void/Austall GNU/Linux, with Linux 4.19.91_1 (on /dev/sdb3)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-4.19.91_1--e0081396-b3c2-45b2-9e84-77516bd56df3' { + menuentry 'Void/Austall GNU/Linux, with Linux 5.4.18_1' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.18_1-advanced-788d0f37-8e91-4264-ba91-6a6b47885232' { + load_video + set gfxpayload=keep + insmod gzio insmod part_msdos insmod ext2 - set root='hd1,msdos3' + set root='hd0,msdos4' if [ x$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root --hint-bios=hd1,msdos3 --hint-efi=hd1,msdos3 --hint-baremetal=ahci1,msdos3 e0081396-b3c2-45b2-9e84-77516bd56df3 + search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos4 --hint-efi=hd0,msdos4 --hint-baremetal=ahci0,msdos4 b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e else - search --no-floppy --fs-uuid --set=root e0081396-b3c2-45b2-9e84-77516bd56df3 + search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e fi - linux /boot/vmlinuz-4.19.91_1 root=UUID=e0081396-b3c2-45b2-9e84-77516bd56df3 ro loglevel=4 slub_debug=P page_poison=1 - initrd /boot/initramfs-4.19.91_1.img + echo 'Loading Linux 5.4.18_1 ...' + linux /vmlinuz-5.4.18_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro loglevel=4 slub_debug=P page_poison=1 + echo 'Loading initial ramdisk ...' + initrd /initramfs-5.4.18_1.img } - menuentry 'Void/Austall GNU/Linux, with Linux 4.19.91_1 (recovery mode) (on /dev/sdb3)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-4.19.91_1-root=UUID=e0081396-b3c2-45b2-9e84-77516bd56df3 ro single-e0081396-b3c2-45b2-9e84-77516bd56df3' { + menuentry 'Void/Austall GNU/Linux, with Linux 5.4.18_1 (recovery mode)' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.18_1-recovery-788d0f37-8e91-4264-ba91-6a6b47885232' { + load_video + set gfxpayload=keep + insmod gzio insmod part_msdos insmod ext2 - set root='hd1,msdos3' + set root='hd0,msdos4' if [ x$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root --hint-bios=hd1,msdos3 --hint-efi=hd1,msdos3 --hint-baremetal=ahci1,msdos3 e0081396-b3c2-45b2-9e84-77516bd56df3 + search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos4 --hint-efi=hd0,msdos4 --hint-baremetal=ahci0,msdos4 b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e else - search --no-floppy --fs-uuid --set=root e0081396-b3c2-45b2-9e84-77516bd56df3 + search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e fi - linux /boot/vmlinuz-4.19.91_1 root=UUID=e0081396-b3c2-45b2-9e84-77516bd56df3 ro single - initrd /boot/initramfs-4.19.91_1.img + echo 'Loading Linux 5.4.18_1 ...' + linux /vmlinuz-5.4.18_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro single + echo 'Loading initial ramdisk ...' + initrd /initramfs-5.4.18_1.img } - menuentry 'Void/Austall GNU/Linux, with Linux 4.19.47_1 (on /dev/sdb3)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-4.19.47_1--e0081396-b3c2-45b2-9e84-77516bd56df3' { + menuentry 'Void/Austall GNU/Linux, with Linux 5.4.17_1' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.17_1-advanced-788d0f37-8e91-4264-ba91-6a6b47885232' { + load_video + set gfxpayload=keep + insmod gzio insmod part_msdos insmod ext2 - set root='hd1,msdos3' + set root='hd0,msdos4' if [ x$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root --hint-bios=hd1,msdos3 --hint-efi=hd1,msdos3 --hint-baremetal=ahci1,msdos3 e0081396-b3c2-45b2-9e84-77516bd56df3 + search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos4 --hint-efi=hd0,msdos4 --hint-baremetal=ahci0,msdos4 b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e else - search --no-floppy --fs-uuid --set=root e0081396-b3c2-45b2-9e84-77516bd56df3 + search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e fi - linux /boot/vmlinuz-4.19.47_1 root=UUID=e0081396-b3c2-45b2-9e84-77516bd56df3 ro loglevel=4 slub_debug=P page_poison=1 - initrd /boot/initramfs-4.19.47_1.img + echo 'Loading Linux 5.4.17_1 ...' + linux /vmlinuz-5.4.17_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro loglevel=4 slub_debug=P page_poison=1 + echo 'Loading initial ramdisk ...' + initrd /initramfs-5.4.17_1.img } - menuentry 'Void/Austall GNU/Linux, with Linux 4.19.47_1 (recovery mode) (on /dev/sdb3)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-4.19.47_1-root=UUID=e0081396-b3c2-45b2-9e84-77516bd56df3 ro single-e0081396-b3c2-45b2-9e84-77516bd56df3' { + menuentry 'Void/Austall GNU/Linux, with Linux 5.4.17_1 (recovery mode)' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.17_1-recovery-788d0f37-8e91-4264-ba91-6a6b47885232' { + load_video + set gfxpayload=keep + insmod gzio insmod part_msdos insmod ext2 - set root='hd1,msdos3' + set root='hd0,msdos4' if [ x$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root --hint-bios=hd1,msdos3 --hint-efi=hd1,msdos3 --hint-baremetal=ahci1,msdos3 e0081396-b3c2-45b2-9e84-77516bd56df3 + search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos4 --hint-efi=hd0,msdos4 --hint-baremetal=ahci0,msdos4 b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e else - search --no-floppy --fs-uuid --set=root e0081396-b3c2-45b2-9e84-77516bd56df3 + search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e fi - linux /boot/vmlinuz-4.19.47_1 root=UUID=e0081396-b3c2-45b2-9e84-77516bd56df3 ro single - initrd /boot/initramfs-4.19.47_1.img + echo 'Loading Linux 5.4.17_1 ...' + linux /vmlinuz-5.4.17_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro single + echo 'Loading initial ramdisk ...' + initrd /initramfs-5.4.17_1.img } } +### END /etc/grub.d/10_linux ### + +### BEGIN /etc/grub.d/20_linux_xen ### + +### END /etc/grub.d/20_linux_xen ### + +### BEGIN /etc/grub.d/30_os-prober ### ### END /etc/grub.d/30_os-prober ### ### BEGIN /etc/grub.d/40_custom ### diff --git a/.config/grub/theme.txt b/.config/grub/theme.txt @@ -12,8 +12,8 @@ terminal-border: "0" top=10% width=40% height=80% - selected_item_color="#305363" - item_color="#0a3439" + selected_item_color="#1e5eb3" + item_color="#1e5eb3" item_height=38 item_spacing=9 align="center" diff --git a/.config/irssi/config b/.config/irssi/config @@ -271,7 +271,7 @@ settings = { core = { real_name = "haydenh"; user_name = "haydenh"; - nick = "haydenh"; + nick = "hhhhv"; recode_transliterate = "no"; timestamp_format = "%H:%M:%S"; }; diff --git a/.config/newsboat/config b/.config/newsboat/config @@ -23,9 +23,9 @@ bind-key D pb-download bind-key U show-urls bind-key x pb-delete -color listnormal white black -color listfocus white red bold -color listnormal_unread magenta black -color listfocus_unread magenta blue bold -color info black blue bold -color article white black +color listnormal white black +color listfocus white red bold +color listnormal_unread magenta black +color listfocus_unread magenta red bold +color info black blue bold +color article white black diff --git a/.config/vim/surround.vim b/.config/vim/surround.vim @@ -1,619 +0,0 @@ -" surround.vim - Surroundings -" Author: Tim Pope <http://tpo.pe/> -" Version: 2.1 -" GetLatestVimScripts: 1697 1 :AutoInstall: surround.vim - -if exists("g:loaded_surround") || &cp || v:version < 700 - finish -endif -let g:loaded_surround = 1 - -" Input functions {{{1 - -function! s:getchar() - let c = getchar() - if c =~ '^\d\+$' - let c = nr2char(c) - endif - return c -endfunction - -function! s:inputtarget() - let c = s:getchar() - while c =~ '^\d\+$' - let c .= s:getchar() - endwhile - if c == " " - let c .= s:getchar() - endif - if c =~ "\<Esc>\|\<C-C>\|\0" - return "" - else - return c - endif -endfunction - -function! s:inputreplacement() - let c = s:getchar() - if c == " " - let c .= s:getchar() - endif - if c =~ "\<Esc>" || c =~ "\<C-C>" - return "" - else - return c - endif -endfunction - -function! s:beep() - exe "norm! \<Esc>" - return "" -endfunction - -function! s:redraw() - redraw - return "" -endfunction - -" }}}1 - -" Wrapping functions {{{1 - -function! s:extractbefore(str) - if a:str =~ '\r' - return matchstr(a:str,'.*\ze\r') - else - return matchstr(a:str,'.*\ze\n') - endif -endfunction - -function! s:extractafter(str) - if a:str =~ '\r' - return matchstr(a:str,'\r\zs.*') - else - return matchstr(a:str,'\n\zs.*') - endif -endfunction - -function! s:fixindent(str,spc) - let str = substitute(a:str,'\t',repeat(' ',&sw),'g') - let spc = substitute(a:spc,'\t',repeat(' ',&sw),'g') - let str = substitute(str,'\(\n\|\%^\).\@=','\1'.spc,'g') - if ! &et - let str = substitute(str,'\s\{'.&ts.'\}',"\t",'g') - endif - return str -endfunction - -function! s:process(string) - let i = 0 - for i in range(7) - let repl_{i} = '' - let m = matchstr(a:string,nr2char(i).'.\{-\}\ze'.nr2char(i)) - if m != '' - let m = substitute(strpart(m,1),'\r.*','','') - let repl_{i} = input(match(m,'\w\+$') >= 0 ? m.': ' : m) - endif - endfor - let s = "" - let i = 0 - while i < strlen(a:string) - let char = strpart(a:string,i,1) - if char2nr(char) < 8 - let next = stridx(a:string,char,i+1) - if next == -1 - let s .= char - else - let insertion = repl_{char2nr(char)} - let subs = strpart(a:string,i+1,next-i-1) - let subs = matchstr(subs,'\r.*') - while subs =~ '^\r.*\r' - let sub = matchstr(subs,"^\r\\zs[^\r]*\r[^\r]*") - let subs = strpart(subs,strlen(sub)+1) - let r = stridx(sub,"\r") - let insertion = substitute(insertion,strpart(sub,0,r),strpart(sub,r+1),'') - endwhile - let s .= insertion - let i = next - endif - else - let s .= char - endif - let i += 1 - endwhile - return s -endfunction - -function! s:wrap(string,char,type,removed,special) - let keeper = a:string - let newchar = a:char - let s:input = "" - let type = a:type - let linemode = type ==# 'V' ? 1 : 0 - let before = "" - let after = "" - if type ==# "V" - let initspaces = matchstr(keeper,'\%^\s*') - else - let initspaces = matchstr(getline('.'),'\%^\s*') - endif - let pairs = "b()B{}r[]a<>" - let extraspace = "" - if newchar =~ '^ ' - let newchar = strpart(newchar,1) - let extraspace = ' ' - endif - let idx = stridx(pairs,newchar) - if newchar == ' ' - let before = '' - let after = '' - elseif exists("b:surround_".char2nr(newchar)) - let all = s:process(b:surround_{char2nr(newchar)}) - let before = s:extractbefore(all) - let after = s:extractafter(all) - elseif exists("g:surround_".char2nr(newchar)) - let all = s:process(g:surround_{char2nr(newchar)}) - let before = s:extractbefore(all) - let after = s:extractafter(all) - elseif newchar ==# "p" - let before = "\n" - let after = "\n\n" - elseif newchar ==# 's' - let before = ' ' - let after = '' - elseif newchar ==# ':' - let before = ':' - let after = '' - elseif newchar =~# "[tT\<C-T><]" - let dounmapp = 0 - let dounmapb = 0 - if !maparg(">","c") - let dounmapb = 1 - " Hide from AsNeeded - exe "cn"."oremap > ><CR>" - endif - let default = "" - if newchar ==# "T" - if !exists("s:lastdel") - let s:lastdel = "" - endif - let default = matchstr(s:lastdel,'<\zs.\{-\}\ze>') - endif - let tag = input("<",default) - if dounmapb - silent! cunmap > - endif - let s:input = tag - if tag != "" - let keepAttributes = ( match(tag, ">$") == -1 ) - let tag = substitute(tag,'>*$','','') - let attributes = "" - if keepAttributes - let attributes = matchstr(a:removed, '<[^ \t\n]\+\zs\_.\{-\}\ze>') - endif - let s:input = tag . '>' - if tag =~ '/$' - let tag = substitute(tag, '/$', '', '') - let before = '<'.tag.attributes.' />' - let after = '' - else - let before = '<'.tag.attributes.'>' - let after = '</'.substitute(tag,' .*','','').'>' - endif - if newchar == "\<C-T>" - if type ==# "v" || type ==# "V" - let before .= "\n\t" - endif - if type ==# "v" - let after = "\n". after - endif - endif - endif - elseif newchar ==# 'l' || newchar == '\' - " LaTeX - let env = input('\begin{') - if env != "" - let s:input = env."\<CR>" - let env = '{' . env - let env .= s:closematch(env) - echo '\begin'.env - let before = '\begin'.env - let after = '\end'.matchstr(env,'[^}]*').'}' - endif - elseif newchar ==# 'f' || newchar ==# 'F' - let fnc = input('function: ') - if fnc != "" - let s:input = fnc."\<CR>" - let before = substitute(fnc,'($','','').'(' - let after = ')' - if newchar ==# 'F' - let before .= ' ' - let after = ' ' . after - endif - endif - elseif newchar ==# "\<C-F>" - let fnc = input('function: ') - let s:input = fnc."\<CR>" - let before = '('.fnc.' ' - let after = ')' - elseif idx >= 0 - let spc = (idx % 3) == 1 ? " " : "" - let idx = idx / 3 * 3 - let before = strpart(pairs,idx+1,1) . spc - let after = spc . strpart(pairs,idx+2,1) - elseif newchar == "\<C-[>" || newchar == "\<C-]>" - let before = "{\n\t" - let after = "\n}" - elseif newchar !~ '\a' - let before = newchar - let after = newchar - else - let before = '' - let after = '' - endif - let after = substitute(after ,'\n','\n'.initspaces,'g') - if type ==# 'V' || (a:special && type ==# "v") - let before = substitute(before,' \+$','','') - let after = substitute(after ,'^ \+','','') - if after !~ '^\n' - let after = initspaces.after - endif - if keeper !~ '\n$' && after !~ '^\n' - let keeper .= "\n" - elseif keeper =~ '\n$' && after =~ '^\n' - let after = strpart(after,1) - endif - if keeper !~ '^\n' && before !~ '\n\s*$' - let before .= "\n" - if a:special - let before .= "\t" - endif - elseif keeper =~ '^\n' && before =~ '\n\s*$' - let keeper = strcharpart(keeper,1) - endif - if type ==# 'V' && keeper =~ '\n\s*\n$' - let keeper = strcharpart(keeper,0,strchars(keeper) - 1) - endif - endif - if type ==# 'V' - let before = initspaces.before - endif - if before =~ '\n\s*\%$' - if type ==# 'v' - let keeper = initspaces.keeper - endif - let padding = matchstr(before,'\n\zs\s\+\%$') - let before = substitute(before,'\n\s\+\%$','\n','') - let keeper = s:fixindent(keeper,padding) - endif - if type ==# 'V' - let keeper = before.keeper.after - elseif type =~ "^\<C-V>" - " Really we should be iterating over the buffer - let repl = substitute(before,'[\\~]','\\&','g').'\1'.substitute(after,'[\\~]','\\&','g') - let repl = substitute(repl,'\n',' ','g') - let keeper = substitute(keeper."\n",'\(.\{-\}\)\(\n\)',repl.'\n','g') - let keeper = substitute(keeper,'\n\%$','','') - else - let keeper = before.extraspace.keeper.extraspace.after - endif - return keeper -endfunction - -function! s:wrapreg(reg,char,removed,special) - let orig = getreg(a:reg) - let type = substitute(getregtype(a:reg),'\d\+$','','') - let new = s:wrap(orig,a:char,type,a:removed,a:special) - call setreg(a:reg,new,type) -endfunction -" }}}1 - -function! s:insert(...) " {{{1 - " Optional argument causes the result to appear on 3 lines, not 1 - let linemode = a:0 ? a:1 : 0 - let char = s:inputreplacement() - while char == "\<CR>" || char == "\<C-S>" - " TODO: use total count for additional blank lines - let linemode += 1 - let char = s:inputreplacement() - endwhile - if char == "" - return "" - endif - let cb_save = &clipboard - set clipboard-=unnamed clipboard-=unnamedplus - let reg_save = @@ - call setreg('"',"\r",'v') - call s:wrapreg('"',char,"",linemode) - " If line mode is used and the surrounding consists solely of a suffix, - " remove the initial newline. This fits a use case of mine but is a - " little inconsistent. Is there anyone that would prefer the simpler - " behavior of just inserting the newline? - if linemode && match(getreg('"'),'^\n\s*\zs.*') == 0 - call setreg('"',matchstr(getreg('"'),'^\n\s*\zs.*'),getregtype('"')) - endif - " This can be used to append a placeholder to the end - if exists("g:surround_insert_tail") - call setreg('"',g:surround_insert_tail,"a".getregtype('"')) - endif - if &ve != 'all' && col('.') >= col('$') - if &ve == 'insert' - let extra_cols = virtcol('.') - virtcol('$') - if extra_cols > 0 - let [regval,regtype] = [getreg('"',1,1),getregtype('"')] - call setreg('"',join(map(range(extra_cols),'" "'),''),'v') - norm! ""p - call setreg('"',regval,regtype) - endif - endif - norm! ""p - else - norm! ""P - endif - if linemode - call s:reindent() - endif - norm! `] - call search('\r','bW') - let @@ = reg_save - let &clipboard = cb_save - return "\<Del>" -endfunction " }}}1 - -function! s:reindent() " {{{1 - if exists("b:surround_indent") ? b:surround_indent : (!exists("g:surround_indent") || g:surround_indent) - silent norm! '[='] - endif -endfunction " }}}1 - -function! s:dosurround(...) " {{{1 - let scount = v:count1 - let char = (a:0 ? a:1 : s:inputtarget()) - let spc = "" - if char =~ '^\d\+' - let scount = scount * matchstr(char,'^\d\+') - let char = substitute(char,'^\d\+','','') - endif - if char =~ '^ ' - let char = strpart(char,1) - let spc = 1 - endif - if char == 'a' - let char = '>' - endif - if char == 'r' - let char = ']' - endif - let newchar = "" - if a:0 > 1 - let newchar = a:2 - if newchar == "\<Esc>" || newchar == "\<C-C>" || newchar == "" - return s:beep() - endif - endif - let cb_save = &clipboard - set clipboard-=unnamed clipboard-=unnamedplus - let append = "" - let original = getreg('"') - let otype = getregtype('"') - call setreg('"',"") - let strcount = (scount == 1 ? "" : scount) - if char == '/' - exe 'norm! '.strcount.'[/d'.strcount.']/' - elseif char =~# '[[:punct:][:space:]]' && char !~# '[][(){}<>"''`]' - exe 'norm! T'.char - if getline('.')[col('.')-1] == char - exe 'norm! l' - endif - exe 'norm! dt'.char - else - exe 'norm! d'.strcount.'i'.char - endif - let keeper = getreg('"') - let okeeper = keeper " for reindent below - if keeper == "" - call setreg('"',original,otype) - let &clipboard = cb_save - return "" - endif - let oldline = getline('.') - let oldlnum = line('.') - if char ==# "p" - call setreg('"','','V') - elseif char ==# "s" || char ==# "w" || char ==# "W" - " Do nothing - call setreg('"','') - elseif char =~ "[\"'`]" - exe "norm! i \<Esc>d2i".char - call setreg('"',substitute(getreg('"'),' ','','')) - elseif char == '/' - norm! "_x - call setreg('"','/**/',"c") - let keeper = substitute(substitute(keeper,'^/\*\s\=','',''),'\s\=\*$','','') - elseif char =~# '[[:punct:][:space:]]' && char !~# '[][(){}<>]' - exe 'norm! F'.char - exe 'norm! df'.char - else - " One character backwards - call search('\m.', 'bW') - exe "norm! da".char - endif - let removed = getreg('"') - let rem2 = substitute(removed,'\n.*','','') - let oldhead = strpart(oldline,0,strlen(oldline)-strlen(rem2)) - let oldtail = strpart(oldline, strlen(oldline)-strlen(rem2)) - let regtype = getregtype('"') - if char =~# '[\[({<T]' || spc - let keeper = substitute(keeper,'^\s\+','','') - let keeper = substitute(keeper,'\s\+$','','') - endif - if col("']") == col("$") && col('.') + 1 == col('$') - if oldhead =~# '^\s*$' && a:0 < 2 - let keeper = substitute(keeper,'\%^\n'.oldhead.'\(\s*.\{-\}\)\n\s*\%$','\1','') - endif - let pcmd = "p" - else - let pcmd = "P" - endif - if line('.') + 1 < oldlnum && regtype ==# "V" - let pcmd = "p" - endif - call setreg('"',keeper,regtype) - if newchar != "" - let special = a:0 > 2 ? a:3 : 0 - call s:wrapreg('"',newchar,removed,special) - endif - silent exe 'norm! ""'.pcmd.'`[' - if removed =~ '\n' || okeeper =~ '\n' || getreg('"') =~ '\n' - call s:reindent() - endif - if getline('.') =~ '^\s\+$' && keeper =~ '^\s*\n' - silent norm! cc - endif - call setreg('"',original,otype) - let s:lastdel = removed - let &clipboard = cb_save - if newchar == "" - silent! call repeat#set("\<Plug>Dsurround".char,scount) - else - silent! call repeat#set("\<Plug>C".(a:0 > 2 && a:3 ? "S" : "s")."urround".char.newchar.s:input,scount) - endif -endfunction " }}}1 - -function! s:changesurround(...) " {{{1 - let a = s:inputtarget() - if a == "" - return s:beep() - endif - let b = s:inputreplacement() - if b == "" - return s:beep() - endif - call s:dosurround(a,b,a:0 && a:1) -endfunction " }}}1 - -function! s:opfunc(type, ...) abort " {{{1 - if a:type ==# 'setup' - let &opfunc = matchstr(expand('<sfile>'), '<SNR>\w\+$') - return 'g@' - endif - let char = s:inputreplacement() - if char == "" - return s:beep() - endif - let reg = '"' - let sel_save = &selection - let &selection = "inclusive" - let cb_save = &clipboard - set clipboard-=unnamed clipboard-=unnamedplus - let reg_save = getreg(reg) - let reg_type = getregtype(reg) - let type = a:type - if a:type == "char" - silent exe 'norm! v`[o`]"'.reg.'y' - let type = 'v' - elseif a:type == "line" - silent exe 'norm! `[V`]"'.reg.'y' - let type = 'V' - elseif a:type ==# "v" || a:type ==# "V" || a:type ==# "\<C-V>" - let &selection = sel_save - let ve = &virtualedit - if !(a:0 && a:1) - set virtualedit= - endif - silent exe 'norm! gv"'.reg.'y' - let &virtualedit = ve - elseif a:type =~ '^\d\+$' - let type = 'v' - silent exe 'norm! ^v'.a:type.'$h"'.reg.'y' - if mode() ==# 'v' - norm! v - return s:beep() - endif - else - let &selection = sel_save - let &clipboard = cb_save - return s:beep() - endif - let keeper = getreg(reg) - if type ==# "v" && a:type !=# "v" - let append = matchstr(keeper,'\_s\@<!\s*$') - let keeper = substitute(keeper,'\_s\@<!\s*$','','') - endif - call setreg(reg,keeper,type) - call s:wrapreg(reg,char,"",a:0 && a:1) - if type ==# "v" && a:type !=# "v" && append != "" - call setreg(reg,append,"ac") - endif - silent exe 'norm! gv'.(reg == '"' ? '' : '"' . reg).'p`[' - if type ==# 'V' || (getreg(reg) =~ '\n' && type ==# 'v') - call s:reindent() - endif - call setreg(reg,reg_save,reg_type) - let &selection = sel_save - let &clipboard = cb_save - if a:type =~ '^\d\+$' - silent! call repeat#set("\<Plug>Y".(a:0 && a:1 ? "S" : "s")."surround".char.s:input,a:type) - else - silent! call repeat#set("\<Plug>SurroundRepeat".char.s:input) - endif -endfunction - -function! s:opfunc2(...) abort - if !a:0 || a:1 ==# 'setup' - let &opfunc = matchstr(expand('<sfile>'), '<SNR>\w\+$') - return 'g@' - endif - call s:opfunc(a:1, 1) -endfunction " }}}1 - -function! s:closematch(str) " {{{1 - " Close an open (, {, [, or < on the command line. - let tail = matchstr(a:str,'.[^\[\](){}<>]*$') - if tail =~ '^\[.\+' - return "]" - elseif tail =~ '^(.\+' - return ")" - elseif tail =~ '^{.\+' - return "}" - elseif tail =~ '^<.+' - return ">" - else - return "" - endif -endfunction " }}}1 - -nnoremap <silent> <Plug>SurroundRepeat . -nnoremap <silent> <Plug>Dsurround :<C-U>call <SID>dosurround(<SID>inputtarget())<CR> -nnoremap <silent> <Plug>Csurround :<C-U>call <SID>changesurround()<CR> -nnoremap <silent> <Plug>CSurround :<C-U>call <SID>changesurround(1)<CR> -nnoremap <expr> <Plug>Yssurround '^'.v:count1.<SID>opfunc('setup').'g_' -nnoremap <expr> <Plug>YSsurround <SID>opfunc2('setup').'_' -nnoremap <expr> <Plug>Ysurround <SID>opfunc('setup') -nnoremap <expr> <Plug>YSurround <SID>opfunc2('setup') -vnoremap <silent> <Plug>VSurround :<C-U>call <SID>opfunc(visualmode(),visualmode() ==# 'V' ? 1 : 0)<CR> -vnoremap <silent> <Plug>VgSurround :<C-U>call <SID>opfunc(visualmode(),visualmode() ==# 'V' ? 0 : 1)<CR> -inoremap <silent> <Plug>Isurround <C-R>=<SID>insert()<CR> -inoremap <silent> <Plug>ISurround <C-R>=<SID>insert(1)<CR> - -if !exists("g:surround_no_mappings") || ! g:surround_no_mappings - nmap ds <Plug>Dsurround - nmap cs <Plug>Csurround - nmap cS <Plug>CSurround - nmap ys <Plug>Ysurround - nmap yS <Plug>YSurround - nmap yss <Plug>Yssurround - nmap ySs <Plug>YSsurround - nmap ySS <Plug>YSsurround - xmap S <Plug>VSurround - xmap gS <Plug>VgSurround - if !exists("g:surround_no_insert_mappings") || ! g:surround_no_insert_mappings - if !hasmapto("<Plug>Isurround","i") && "" == mapcheck("<C-S>","i") - imap <C-S> <Plug>Isurround - endif - imap <C-G>s <Plug>Isurround - imap <C-G>S <Plug>ISurround - endif -endif - -" vim:set ft=vim sw=2 sts=2 et: diff --git a/.config/vimb/config b/.config/vimb/config @@ -1,9 +1,16 @@ set download-path=~/general/downloads/ set editor-command="urxvt -e vim %s" set history-max-items=99999 -set input-autohide=true -set home-page=file:///root/.homepage/index.html +set input-autohide=false +set input-css=background-color:#30404e;color:#ffffff +set completion-css=background-color:#0a0a10;color:#1e5eb3 +set completion-hover-css=background-color:#141726;color:#1e5eb3 +set completion-selected-css=background-color:#141726;color:#1e5eb3 +set status-css=background-color:#30404e;color:#ffffff;border-bottom;padding-bottom:1px;border-bottom:1px solid #0a0a10 +set status-ssl-css=background-color:#30404e;color:#ffffff;border-bottom;padding-bottom:1px;border-bottom:1px solid #0a0a10 + +set home-page=http://www.haydenvh.com/h/ set smooth-scrolling=false set webinspector=true @@ -12,11 +19,16 @@ shortcut-add sx=https://searx.me/?q=$0 shortcut-add sch=https://searx.ch/?q=$0 shortcut-add bit=https://bitchute.com/search?q=$0 shortcut-add yt=https://youtube.com/results?search_query=$0 -shortcut-add hh=https://haydenh.gitlab.io/h/ -shortcut-add vl=https://voidlinux.org +shortcut-add hh=http://www.haydenvh.com/h/ +shortcut-add vl=https://voidlinux.org/ shortcut-add vw=https://wiki.voidlinux.org/index.php?search=$0 +shortcut-add vd=https://docs.voidlinux.org/ shortcut-add gh=https://github.com/search?q=$0 shortcut-add gl=https://gitlab.com/search?search=$0 shortcut-add ddg=https://duckduckgo.com/?q=$0 shortcut-add wk=https://en.wikipedia.org/wiki/$0 shortcut-add aw=https://wiki.archlinux.org/index.php?search=$0 +shortcut-add karta=https://minkarta.lantmateriet.se/ +shortcut-add map=https://map.openaerialmap.org/#/ +shortcut-add ebay=https://www.ebay.co.uk/sch/$0 +shortcut-add 8g=https://8kun.top/g/catalog.html diff --git a/.config/vimb/scripts.js b/.config/vimb/scripts.js @@ -9,25 +9,25 @@ function addGlobalStyle(css) { } var hostname = window.location.hostname; if (hostname == "www.youtube.com") { -addGlobalStyle("#watch7-sidebar *, #watch7-content *{background-color:#141726 !important; border-radius:#141726 !important;}#masthead-positioner, #masthead-positioner-height-offset{display:none !important;}#meta-contents{margin-bottom:2vw !important;}ytd-watch-flexy #secondary{padding:2.5vw !important;}ytd-watch-flexy #player{display:none !important;}ytd-watch-flexy #primary-inner, ytd-watch-flexy #secondary-inner{padding:2.5vw !important;margin:0.5vw !important;background-color:#14172666 !important}.ytp-videowall-still-info-content *{background-color:#0c0a14cc !important;padding:1vw;margin:0 !important;}.ytp-videowall-info-content{padding:0 !important;}a *{font-weight:bold !important;}*{color:#1e5eb3 !important;}#columns{margin:0 !important;padding-left:4vw !important;padding-right:4vw} .avatar-container *{ background-color:#141726 !important;}a{ font-weight:bold !important;}.sbdd_a *{ background-color:#141726 !important; border:0 !important;}.ytp-ad-image-overlay *{ display:none !important;}ytd-video-masthead-ad-v3-renderer{ display:none !important;}ytd-section-list-renderer{ background-color:#070911 !important;}.ytd-page-manager{ background-color:#070911 !important;}#channel-container *{ background-color:#141726 !important;}app-toolbar *{ background-color:#141726 !important;g}ytd-guide-renderer{ background-color:#141726 !important;}ytd-mini-guide-renderer,ytd-mini-guide-renderer *{ background-color:#141726 !important;}ytd-section-list-renderer{ background-color:#070911 !important;}.ytd-page-manager{ background-color:#070911 !important;}#channel-container *{ background-color:#141726 !important;}app-toolbar *{ background-color:#141726 !important;g}ytd-guide-renderer{ background-color:#141726 !important;}ytd-clarification-renderer{ display:none !important;}::placeholder,input{font-family:monospace;}.ytd-playlist-panel-renderer{background:rgba(0,0,0,0) !important;}ytd-player #container #movie_player{background-color:#0c0a14 !important;}#merch-shelf{display:none !important;}#columns{background-color:#0c0a14;}#masthead-container #container{ background-color:#141726;}#masthead-container #container #logo-icon-container,#country-code,#guide-icon,#end #buttons{ display:none;}#container.ytd-searchbox input.ytd-searchbox{ color:#bbbbff !important;;}html{ font-family:monospace !important; font-size:9px !important;}#top-level-buttons{ display:none !important;}ytd-menu-renderer{ display:none !important;}#companion,#like-bar{ display:none !important;}.style-scope .ytd-sentiment-bar-renderer{ display:none !important;}#subscribe-button{ display:none !important;}ytd-rich-metadata-renderer{ display:none !important;}yt-dropdown-menu{ display:none !important;}ytd-comment-simplebox-renderer{ display:none;}.ytd-comments #header{ display:none !important;}.ytd-video-owner-renderer{ display:none;}span{ color:#ffffff;}ytd-expander{ margin-left:0 !important;;}#collapsible .style-scope .ytd-video-secondary-info-renderer{ display:none !important;}ytd-player{ background-color:#0c0a14;}.ytp-gradient-bottom{ display:none;}.ytp-chrome-controls{ background-color:#141726;}"); +addGlobalStyle("#watch7-sidebar *, #watch7-content *{background-color:#141726 !important; border-radius:#141726 !important;}#masthead-positioner, #masthead-positioner-height-offset{display:none !important;}#meta-contents{margin-bottom:2vw !important;}ytd-watch-flexy #secondary{padding:2.5vw !important;}ytd-watch-flexy #player{display:none !important;}ytd-watch-flexy #primary-inner, ytd-watch-flexy #secondary-inner{padding:2.5vw !important;margin:0.5vw !important;background-color:#14172666 !important}.ytp-videowall-still-info-content *{background-color:#0a0a10cc !important;padding:1vw;margin:0 !important;}.ytp-videowall-info-content{padding:0 !important;}a *{font-weight:bold !important;}*{color:#1e5eb3 !important;}#columns{margin:0 !important;padding-left:4vw !important;padding-right:4vw} .avatar-container *{ background-color:#141726 !important;}a{ font-weight:bold !important;}.sbdd_a *{ background-color:#141726 !important; border:0 !important;}.ytp-ad-image-overlay *{ display:none !important;}ytd-video-masthead-ad-v3-renderer{ display:none !important;}ytd-section-list-renderer{ background-color:#070911 !important;}.ytd-page-manager{ background-color:#070911 !important;}#channel-container *{ background-color:#141726 !important;}app-toolbar *{ background-color:#141726 !important;g}ytd-guide-renderer{ background-color:#141726 !important;}ytd-mini-guide-renderer,ytd-mini-guide-renderer *{ background-color:#141726 !important;}ytd-section-list-renderer{ background-color:#070911 !important;}.ytd-page-manager{ background-color:#070911 !important;}#channel-container *{ background-color:#141726 !important;}app-toolbar *{ background-color:#141726 !important;g}ytd-guide-renderer{ background-color:#141726 !important;}ytd-clarification-renderer{ display:none !important;}::placeholder,input{font-family:monospace;}.ytd-playlist-panel-renderer{background:rgba(0,0,0,0) !important;}ytd-player #container #movie_player{background-color:#0a0a10 !important;}#merch-shelf{display:none !important;}#columns{background-color:#0a0a10;}#masthead-container #container{ background-color:#141726;}#masthead-container #container #logo-icon-container,#country-code,#guide-icon,#end #buttons{ display:none;}#container.ytd-searchbox input.ytd-searchbox{ color:#bbbbff !important;;}html{ font-family:monospace !important; font-size:9px !important;}#top-level-buttons{ display:none !important;}ytd-menu-renderer{ display:none !important;}#companion,#like-bar{ display:none !important;}.style-scope .ytd-sentiment-bar-renderer{ display:none !important;}#subscribe-button{ display:none !important;}ytd-rich-metadata-renderer{ display:none !important;}yt-dropdown-menu{ display:none !important;}ytd-comment-simplebox-renderer{ display:none;}.ytd-comments #header{ display:none !important;}.ytd-video-owner-renderer{ display:none;}span{ color:#ffffff;}ytd-expander{ margin-left:0 !important;;}#collapsible .style-scope .ytd-video-secondary-info-renderer{ display:none !important;}ytd-player{ background-color:#0a0a10;}.ytp-gradient-bottom{ display:none;}.ytp-chrome-controls{ background-color:#141726;}"); document.getElementsByTagName("html")[0].setAttribute("dark","true"); } if (hostname == "gitlab.com") { var element = document.getElementsByTagName("tr"); element.outerHTML = element.outerHTML; -addGlobalStyle("*{color:#1e5eb3 !important;}#js-tab-pipeline *{background-color:#0c0a14 !important}form *{background-color:#0c0a14 !important;}h1,h2,h3,h4,h5,h6{color:inherit !important;}.avatar-container *{ background-color:#141726 !important;}.top-bar{ background:#111111 !important;}aside{ background-color:#111111 !important;}.js-jobs-container{ background-color:#111111 !important;}.build-job *{ background-color:#222222 !important; border:0 !important;}body.ui-indigo .navbar-gitlab .navbar-sub-nav > li.active > button{ background-color:rgba(10,10,10,0.5) !important;}.content-block, .content-block *, .content-block * *{ background-color:#141726 !important;}.dropdown{ background-color:rgba(0,0,0,0) !important;}.file-holder *{ background-color:#141726 !important;}.banner-callout{ display:none !important;}.bg-light{ background-color:#141726 !important; border:none !important;}*{ color:#1e5eb3 !important; border-radius:0 !important;}.avatar-tile{ background-color:#141726 !important;}.avatar-container{ background-color:rgba(0,0,0,0) !important;}textarea{ border:0 !important; background-color:rgba(50,50,50,0.5) !important;}.input-group-prepend,.input-group-prepend div{ border:0 !important; background-color:rgba(25,25,25,0.5) !important;}gspan{color:#aaaaaa !important}.commit-sha-group div{ background-color:#141726 !important; border:0 !important; color:#ffffff !important;}.ci-status-link{ display:none !important;}.card, .card div{ background-color:#141726 !important;}.card{ border:0 !important;}.row-content-block{ background-color:#141726; border:0 !important;}.commit-header{ background-color:#141726 !important; border:0 !important;}body{font-family:monospace !important}.toggle-sidebar-button{ background-color:#141726; border:0 !important;}.dropdown-menu{ background-color:#141726;}input{ background:rgba(50,50,50,0.5) !important;}.cover-block{ background-color:#141726; color:#ffffff !important; padding-bottom:5vh !important;}.cover-block p,.cover-block .cover-title{ color:#ffffff !important;}.profile-link-holder{ color:#ffffff !important;}.cover-block .scrolling-tabs-container .nav-links{ border-bottom:0; position:relative; top:5vh;}.cover-block .scrolling-tabs-container .nav-links li{ border-top:#ffffff 1px solid !important;}.user-caller{display:none !important;}.avatar-container{border:0 !important;border-radius:0 !important;}article{border:0 !important;}article div{background-color:#141726 !important; border:0 !important; color:#ffffff !important;}article p{ color:#ffffff !important;}code{ background-color:rgba(15,15,15,0.5)}body{ background-color:#0c0a14; color:#1e5eb3 !important;}#content-body input,#content-body button,#content-body.dropdown,#content-body a{ border:none; background-color:rgba(0,0,0,0) !important; color:#1e5eb3 !important;font-weight:bold !important;}header{ background-color:#141726 !important;}.nav-sidebar{ background-color:#141726 !important;}.fly-out-list{ background-color:#141726 !important; border:0; border:#393982 1px solid !important; color:#ffffff !important;}a{ color:#ffffff !important;}.info-well{ background-color:rgba(0,0,0,0); border:0;}.bs-callout{ display:none !important;}.count-badge-count{ display:none !important;}table{ border:0 !important; background-color:rgba(0,0,0,0) !important; color:#ffffff !important;}.table-holder{ border:0 !important;}thead th{ background-color:#141726 !important; border:0 !important;}tr{ border-bottom-color:#141726 !important;}tr:hover{ border-bottom-color:#141726 !important; display:}"); +addGlobalStyle("*{color:#1e5eb3 !important;}#js-tab-pipeline *{background-color:#0a0a10 !important}form *{background-color:#0a0a10 !important;}h1,h2,h3,h4,h5,h6{color:inherit !important;}.avatar-container *{ background-color:#141726 !important;}.top-bar{ background:#111111 !important;}aside{ background-color:#111111 !important;}.js-jobs-container{ background-color:#111111 !important;}.build-job *{ background-color:#222222 !important; border:0 !important;}body.ui-indigo .navbar-gitlab .navbar-sub-nav > li.active > button{ background-color:rgba(10,10,10,0.5) !important;}.content-block, .content-block *, .content-block * *{ background-color:#141726 !important;}.dropdown{ background-color:rgba(0,0,0,0) !important;}.file-holder *{ background-color:#141726 !important;}.banner-callout{ display:none !important;}.bg-light{ background-color:#141726 !important; border:none !important;}*{ color:#1e5eb3 !important; border-radius:0 !important;}.avatar-tile{ background-color:#141726 !important;}.avatar-container{ background-color:rgba(0,0,0,0) !important;}textarea{ border:0 !important; background-color:rgba(50,50,50,0.5) !important;}.input-group-prepend,.input-group-prepend div{ border:0 !important; background-color:rgba(25,25,25,0.5) !important;}gspan{color:#aaaaaa !important}.commit-sha-group div{ background-color:#141726 !important; border:0 !important; color:#ffffff !important;}.ci-status-link{ display:none !important;}.card, .card div{ background-color:#141726 !important;}.card{ border:0 !important;}.row-content-block{ background-color:#141726; border:0 !important;}.commit-header{ background-color:#141726 !important; border:0 !important;}body{font-family:monospace !important}.toggle-sidebar-button{ background-color:#141726; border:0 !important;}.dropdown-menu{ background-color:#141726;}input{ background:rgba(50,50,50,0.5) !important;}.cover-block{ background-color:#141726; color:#ffffff !important; padding-bottom:5vh !important;}.cover-block p,.cover-block .cover-title{ color:#ffffff !important;}.profile-link-holder{ color:#ffffff !important;}.cover-block .scrolling-tabs-container .nav-links{ border-bottom:0; position:relative; top:5vh;}.cover-block .scrolling-tabs-container .nav-links li{ border-top:#ffffff 1px solid !important;}.user-caller{display:none !important;}.avatar-container{border:0 !important;border-radius:0 !important;}article{border:0 !important;}article div{background-color:#141726 !important; border:0 !important; color:#ffffff !important;}article p{ color:#ffffff !important;}code{ background-color:rgba(15,15,15,0.5)}body{ background-color:#0a0a10; color:#1e5eb3 !important;}#content-body input,#content-body button,#content-body.dropdown,#content-body a{ border:none; background-color:rgba(0,0,0,0) !important; color:#1e5eb3 !important;font-weight:bold !important;}header{ background-color:#141726 !important;}.nav-sidebar{ background-color:#141726 !important;}.fly-out-list{ background-color:#141726 !important; border:0; border:#393982 1px solid !important; color:#ffffff !important;}a{ color:#ffffff !important;}.info-well{ background-color:rgba(0,0,0,0); border:0;}.bs-callout{ display:none !important;}.count-badge-count{ display:none !important;}table{ border:0 !important; background-color:rgba(0,0,0,0) !important; color:#ffffff !important;}.table-holder{ border:0 !important;}thead th{ background-color:#141726 !important; border:0 !important;}tr{ border-bottom-color:#141726 !important;}tr:hover{ border-bottom-color:#141726 !important; display:}"); } -if (hostname == "searx.me" || hostname == "searx.ch") {addGlobalStyle("*{color:#1e5eb3 !important;border-color:#1e5e3 !important;}#categories label{ background-color:#141726; border:none !important; padding:1vw; cursor:pointer; border-bottom:#5555 5px solid !important;}.result{ background-color:rgba(0,0,0,0) !important;}.highlight{ background-color:#aaa !important;}.alert{ background-color:rgba(10,10,10,0.5) !important;}.panel div{ background-color:#0c0a14 !important; color:#1e5eb3 !important;}.panel img{ border:7.5px solid #141726}.searx-navbar{ background-color:#141726;}body{ background-color:#0c0a14; font-family:monospace !important;}input,button{ background-color:rgba(0,0,0,0) !important;}.footer{ display:none;}");} +if (hostname == "searx.me" || hostname == "searx.ch") {addGlobalStyle("*{color:#1e5eb3 !important;border-color:#1e5e3 !important;}#categories label{ background-color:#141726; border:none !important; padding:1vw; cursor:pointer; border-bottom:#5555 5px solid !important;}.result{ background-color:rgba(0,0,0,0) !important;}.highlight{ background-color:#aaa !important;}.alert{ background-color:rgba(10,10,10,0.5) !important;}.panel div{ background-color:#0a0a10 !important; color:#1e5eb3 !important;}.panel img{ border:7.5px solid #141726}.searx-navbar{ background-color:#141726;}body{ background-color:#0a0a10; font-family:monospace !important;}input,button{ background-color:rgba(0,0,0,0) !important;}.footer{ display:none;}");} if (hostname == "neinchan.com") { addGlobalStyle(".greenText{color:#3ab475 !important;}a{color:#3ab475 !important;font-weight:bold !important;font-decoration:underline !important;}*{color:#1e5eb3 !important;}fieldset{ border:0 !important;}fieldset legend{ display:none !important;}.small{ display:none !important;g}*{border-radius:0 !important; background-color:#070911 !important;font-family:monospace !important;}nav{ padding-top:2vh !important; border-bottom:#aaaaaa 1px solid !important;}nav *,nav{ background-color:#141726 !important; color:#1e5eb3 !important;}hr{ border:0 !important; border-bottom:#aaaaaa 1px solid !important;}.postCell .innerPost{ border:#aaaaaa 1px solid !important;}.deletionCheckBox{ display:none !important;}th{ border:#aaaaaa 0.5px solid !important; padding-left:1vw !important; padding-right:1vw !important;}table input,table textarea,table .dropzone,button{ border:#aaaaaa 0.5px solid !important; padding:0.5vw !important; max-width:285px !important;}") document.getElementsByTagName("table")[0].setAttribute("cellspacing","0") } -function wikipedia() {addGlobalStyle("#mw-panel{margin:0 !important;width:10vw !important;}body{margin-right:10vw !important;}mw-navigation{display:none !important;}*{ border-color:#333333 !important;}img{ background-color:#333 !important;}code{color:#892b2b;border:0 !important;border-bottom:#fff 1px solid !important}html *{ background-color:#0c0a14 !important; border-radius:0 !important;}p,h1,h2,h3,h4,h5,h6{ color:#892b2b !important;}.collapsible-heading div{ display:none !important;}th,td{ color:#ffffff;}a{ color:#3ab475 !important;}div{ color:#892b2b !important;}.mw-wiki-logo{ display:none !important;}#p-logo{ display:none !important;}#content{ border:none !important;}#mp-upper *,#mp-bottom *,#mp-center *,#mp-other-content *,#mp-other-lower *{ border:0 !important;}");} +function wikipedia() {addGlobalStyle("#mw-panel{margin:0 !important;width:10vw !important;}body{margin-right:10vw !important;}mw-navigation{display:none !important;}*{ border-color:#333333 !important;}img{ background-color:#333 !important;}code{color:#892b2b;border:0 !important;border-bottom:#fff 1px solid !important}html *{ background-color:#0a0a10 !important; border-radius:0 !important;}p,h1,h2,h3,h4,h5,h6{ color:#892b2b !important;}.collapsible-heading div{ display:none !important;}th,td{ color:#ffffff;}a{ color:#3ab475 !important;}div{ color:#892b2b !important;}.mw-wiki-logo{ display:none !important;}#p-logo{ display:none !important;}#content{ border:none !important;}#mp-upper *,#mp-bottom *,#mp-center *,#mp-other-content *,#mp-other-lower *{ border:0 !important;}");} if (hostname == "en.wikipedia.org") { wikipedia(); } if (hostname == "en.m.wikipedia.org") { wikipedia(); } -if (hostname == "duckduckgo.com") {addGlobalStyle("body *{background-color:#0c0a14 !important;color:#1e5eb3 !important;}a *{text-decoration:underline !important;}#header_wrapper *{background-color:#141726 !important;}.header--aside{display:none !important;}#header_wrapper{width:100vw !important; background-color:#141726 !important;}.header__search{border:#1e5eb3 1px solid !important;}div.search-filters-wrap::before{display:none !important;}div.search-filters-wrap::after{display:none !important;}.results--ads{display:none !important;}#header, #header *{background-color:#141726 !important;}") +if (hostname == "duckduckgo.com") {addGlobalStyle("body *{background-color:#0a0a10 !important;color:#1e5eb3 !important;}a *{text-decoration:underline !important;}#header_wrapper *{background-color:#141726 !important;}.header--aside{display:none !important;}#header_wrapper{width:100vw !important; background-color:#141726 !important;}.header__search{border:#1e5eb3 1px solid !important;}div.search-filters-wrap::before{display:none !important;}div.search-filters-wrap::after{display:none !important;}.results--ads{display:none !important;}#header, #header *{background-color:#141726 !important;}") } diff --git a/.config/youtube-viewer/youtube-viewer.conf b/.config/youtube-viewer/youtube-viewer.conf @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Youtube Viewer 3.5.9 - configuration file +# Youtube Viewer 3.7.2 - configuration file our $CONFIG = { auto_captions => 0, @@ -8,7 +8,6 @@ our $CONFIG = { autoplay_mode => 0, cache_dir => "/home/hayden/.cache/youtube-viewer", captions_dir => "/tmp", - clobber => 0, colors => 1, comments_order => "time", confirm => 0, @@ -22,7 +21,6 @@ our $CONFIG = { dash_support => 1, debug => 0, download_and_play => 0, - download_in_parallel => 0, download_with_wget => 1, downloads_dir => ".", env_proxy => 1, @@ -76,12 +74,12 @@ our $CONFIG = { srt => "-sub *SUB*", }, mpv => { - arg => "--input-ipc-server=/tmp/mpv-socket2 --really-quiet --title *TITLE* --no-ytdl", - audio => "--audio-file *AUDIO*", + arg => "--input-ipc-server=/tmp/mpv-socket2 --really-quiet --title=*TITLE* --no-ytdl", + audio => "--audio-file=*AUDIO*", cmd => "/bin/mpv", fs => "--fullscreen", novideo => "--no-video", - srt => "--sub-file *SUB*", + srt => "--sub-file=*SUB*", }, vlc => { arg => "--quiet --play-and-exit --no-video-title-show --input-title-format *TITLE*", diff --git a/.scripts/bin/dmenu/dmpv b/.scripts/bin/dmenu/dmpv @@ -8,4 +8,4 @@ then fi hmpv pause $3 -dfm "mpv --input-ipc-server $2 $4" ~/$1 $com +dfm "mpv --input-ipc-server=$2 $4" ~/$1 $com dotspace diff --git a/.scripts/i3blocks/disk b/.scripts/i3blocks/disk @@ -6,7 +6,7 @@ # haydenvh.com # Copyright (c) 2019 Hayden Hamilton. -sda1=$(df -h | awk '/sda1/ {print $3 "/" $4}') +sda1=$(df -h | awk '/sda1/ {print $3 "/" $2}') echo "[SDA1 $sda1]" echo echo \#0F6BF3 diff --git a/.scripts/i3blocks/disk2 b/.scripts/i3blocks/disk2 @@ -6,7 +6,7 @@ # haydenvh.com # Copyright (c) 2019 Hayden Hamilton. -sda2=$(df -h | awk '/sda2/ {print $3 "/" $4}') +sda2=$(df -h | awk '/sda2/ {print $3 "/" $2}') echo "[SDA2 $sda2]" echo echo \#3157B5 diff --git a/.scripts/i3blocks/mpv b/.scripts/i3blocks/mpv @@ -7,7 +7,7 @@ # Copyright (c) 2019 Hayden Hamilton. file2=$(echo '{command:["get_property", "media-title"]}' | socat - /tmp/mpv-socket | tr "." " " | sed 's/opus//g' | sed 's/mp3//g' | sed 's/mkv//g' | sed 's/flac//g' | sed 's/webm//g' | sed 's/part//g' | tr '"\{:,}[' ' ' | sed 's/data//g' | sed 's/request_id 0//g' | sed 's/error success//g' | sed 's/ //g' | tail -c +2 | sed 's/$//g' | tr "()'" " " | sed 's/ / /g' |sed 's/ / /g' | sed 's/ / /g' | sed 's/ / /g') - vidtitle2=$(echo '{command:["get_property", "media-title"]}' | socat - /tmp/mpv-socket2 | tr '"{:,}\[' ' ' | sed 's/data//g' | sed 's/request_id 0//g' | sed 's/error success//g' | sed 's/ / /g' | sed 's/ / /g' | sed 's/ / /g' | sed 's/ / /g' | sed 's/^//g') +vidtitle2=$(echo '{command:["get_property", "media-title"]}' | socat - /tmp/mpv-socket2 | tr '"{:,}\[' ' ' | sed 's/data//g' | sed 's/request_id 0//g' | sed 's/error success//g' | sed 's/ / /g' | sed 's/ / /g' | sed 's/ / /g' | sed 's/ / /g' | sed 's/^//g') state=$(echo '{ "command": ["get_property", "pause"] }' | socat - /tmp/mpv-socket | tr '{":0,}' ' ' | awk '// {print $2}') state2=$(echo '{ "command": ["get_property", "pause"] }' | socat - /tmp/mpv-socket2 | tr '{":0,}' ' ' | awk '// {print $2}') convertsecs() { @@ -46,7 +46,7 @@ else fi if [ "$color" == "true" ] then - echo "[MPV$out]" + echo "[MPV$out]" | cut -zc-70 echo echo \#666b1b elif [ "$color" == "false" ] diff --git a/.vimrc b/.vimrc @@ -3,30 +3,96 @@ " Created by Hayden Hamilton " " haydenvh.com -" Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 ./licenses/gplv2.license +" Copyright (c) 2019 Hayden Hamilton. " +"Note: scripts are found in .vim/plugin/ or .vim/autoload/ +" goyo - centres text +" surround - allows operation on surrounding characters +" commentary - comments stuff out +" repeat - repeat things +" vimling (ipa, deadkeys, prose) - deadkeys + "VI-M not VI set nocompatible "Leader let mapleader="," -"Manpage -let $PAGER='' - "Tab completion set path+=** set wildmenu set wildmode=longest,list,full set incsearch -"Set colourscheme +"Misc +set encoding=utf-8 + +"Set scheme syntax on +colo ron set background=dark set relativenumber set number set hlsearch +filetype plugin on + +"Keys +map <leader>g :Goyo \| set linebreak<CR> +map <leader>c :!sudo make all install clean \| set linebreak<CR> +map <leader>oc :!groff -T pdf % - > /tmp/grff<Left><Left><Left><Left><Left><Left><Left><Left><Left><Left><Left><Left> +map <Leader>ov :!zathura /tmp/grff \| set linebreak<CR> +map <Leader>sv :!sent % \| set linebreak<CR> +map <leader>sc :setlocal spell! spelllang=en_us \| set linebreak<CR> +map <leader>ff :r !find \| set linebreak<CR> +map <leader>fl :r !ls \| set linebreak<CR> + +map <leader><leader>s /<++><Enter>"_c4l +imap <leader><leader>s <Esc>/<++><Enter>"_c4l +map <leader><leader>c i<++><Esc> +imap <leader><leader>c <++><Enter> + +map <leader><leader>[ []<Esc><Left>i +map <leader><leader>( ()<Esc><Left>i +map <leader><leader>" ""<Esc><Left>i +map <leader><leader>' ''<Esc><Left>i +map <leader><leader>{ {}<Esc><Left>i +map <leader><leader>< <><Esc><Left>i +imap <leader><leader>[ []<Esc><Left>i +imap <leader><leader>( ()<Esc><Left>i +imap <leader><leader>" ""<Esc><Left>i +imap <leader><leader>' ''<Esc><Left>i +imap <leader><leader>{ {}<Esc><Left>i +imap <leader><leader>< <><Esc><Left>i + +"Magit +map <leader>m :Magit \| set linebreak<CR> +let g:magit_default_fold_level=0 + +"Splitting +set splitbelow splitright +noremap <C-h> <C-w>h +noremap <C-j> <C-w>j +noremap <C-k> <C-w>k +noremap <C-l> <C-w>l +noremap <C-c> <C-w>c + +"Vimling +nm <leader>ld :call ToggleDeadKeys()<CR> +imap <leader>ld <esc>:call ToggleDeadKeys()<CR>a +nm <leader>li :call ToggleIPA()<CR> +imap <leader>li <esc>:call ToggleIPA()<CR>a +nm <F8> :call ToggleProse()<CR> + +"File-browser +map <leader>eh :Sexplore \| set linebreak<CR> +map <leader>ev :Vexplore \| set linebreak<CR> +map <leader>en :Explox \| set linebreak<CR> +map <leader>Eo :browse oldfiles \| set linebreak<CR> +map <leader>Eb 100j +let g:netrw_liststyle=3 +let g:netrw_banner=0 +let g:netrw_altv=1 "Remove arrow keys no <Up> <Nop>