commit 283ba5cc7e90050b2304914e5765996690ea997f
parent 3e6866d27e3f7d2a610d37e055bda7925253ca96
Author: Hayden Hamilton <hayden@haydenvh.com>
Date: Mon, 17 Feb 2020 00:20:01 +0000
vim
Diffstat:
4 files changed, 152 insertions(+), 151 deletions(-)
diff --git a/.config/grub/grub.cfg b/.config/grub/grub.cfg
@@ -62,9 +62,9 @@ insmod part_msdos
insmod ext2
set root='hd0,msdos1'
if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos1 --hint-efi=hd0,msdos1 --hint-baremetal=ahci0,msdos1 cf3e4a02-7721-44f3-ae27-98a4098b2d22
+ search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos1 --hint-efi=hd0,msdos1 --hint-baremetal=ahci0,msdos1 788d0f37-8e91-4264-ba91-6a6b47885232
else
- search --no-floppy --fs-uuid --set=root cf3e4a02-7721-44f3-ae27-98a4098b2d22
+ search --no-floppy --fs-uuid --set=root 788d0f37-8e91-4264-ba91-6a6b47885232
fi
font="/usr/share/grub/unicode.pf2"
fi
@@ -80,11 +80,11 @@ fi
terminal_output gfxterm
insmod part_msdos
insmod ext2
-set root='hd0,msdos3'
+set root='hd0,msdos4'
if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
+ 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 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
+ search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
fi
insmod gfxmenu
insmod png
@@ -101,159 +101,57 @@ fi
### END /etc/grub.d/00_header ###
### BEGIN /etc/grub.d/10_linux ###
-menuentry 'Void/Austall GNU/Linux' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-simple-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
+menuentry 'Void/Austall GNU/Linux' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-simple-788d0f37-8e91-4264-ba91-6a6b47885232' {
load_video
set gfxpayload=keep
insmod gzio
insmod part_msdos
insmod ext2
- set root='hd0,msdos3'
+ set root='hd0,msdos4'
if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
+ 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 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
+ search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
fi
- echo 'Loading Linux 5.4.19_1 ...'
- linux /vmlinuz-5.4.19_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 ro loglevel=4 slub_debug=P page_poison=1
+ echo 'Loading Linux 5.5.4_1 ...'
+ linux /vmlinuz-5.5.4_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.19_1.img
+ initrd /initramfs-5.5.4_1.img
}
-submenu 'Advanced options for Void/Austall GNU/Linux' $menuentry_id_option 'gnulinux-advanced-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
- 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-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
+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.5.4_1' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.5.4_1-advanced-788d0f37-8e91-4264-ba91-6a6b47885232' {
load_video
set gfxpayload=keep
insmod gzio
insmod part_msdos
insmod ext2
- set root='hd0,msdos3'
+ set root='hd0,msdos4'
if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
+ 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 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
+ search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
fi
- echo 'Loading Linux 5.4.19_1 ...'
- linux /vmlinuz-5.4.19_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 ro loglevel=4 slub_debug=P page_poison=1
+ echo 'Loading Linux 5.5.4_1 ...'
+ linux /vmlinuz-5.5.4_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.19_1.img
+ initrd /initramfs-5.5.4_1.img
}
- 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-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
+ menuentry 'Void/Austall GNU/Linux, with Linux 5.5.4_1 (recovery mode)' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.5.4_1-recovery-788d0f37-8e91-4264-ba91-6a6b47885232' {
load_video
set gfxpayload=keep
insmod gzio
insmod part_msdos
insmod ext2
- set root='hd0,msdos3'
+ set root='hd0,msdos4'
if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
+ 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 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
+ search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
fi
- echo 'Loading Linux 5.4.19_1 ...'
- linux /vmlinuz-5.4.19_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 ro single
+ echo 'Loading Linux 5.5.4_1 ...'
+ linux /vmlinuz-5.5.4_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro single
echo 'Loading initial ramdisk ...'
- initrd /initramfs-5.4.19_1.img
- }
- 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-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
- load_video
- set gfxpayload=keep
- insmod gzio
- insmod part_msdos
- insmod ext2
- set root='hd0,msdos3'
- if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
- else
- search --no-floppy --fs-uuid --set=root a97ae8a3-d28a-4913-8249-9c5c829fb7c9
- fi
- echo 'Loading Linux 5.4.18_1 ...'
- linux /vmlinuz-5.4.18_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 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 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-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
- load_video
- set gfxpayload=keep
- insmod gzio
- insmod part_msdos
- insmod ext2
- set root='hd0,msdos3'
- if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
- else
- search --no-floppy --fs-uuid --set=root a97ae8a3-d28a-4913-8249-9c5c829fb7c9
- fi
- echo 'Loading Linux 5.4.18_1 ...'
- linux /vmlinuz-5.4.18_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 ro single
- echo 'Loading initial ramdisk ...'
- initrd /initramfs-5.4.18_1.img
- }
- menuentry 'Void/Austall GNU/Linux, with Linux 5.3.18_1' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.3.18_1-advanced-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
- load_video
- set gfxpayload=keep
- insmod gzio
- insmod part_msdos
- insmod ext2
- set root='hd0,msdos3'
- if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
- else
- search --no-floppy --fs-uuid --set=root a97ae8a3-d28a-4913-8249-9c5c829fb7c9
- fi
- echo 'Loading Linux 5.3.18_1 ...'
- linux /vmlinuz-5.3.18_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 ro loglevel=4 slub_debug=P page_poison=1
- echo 'Loading initial ramdisk ...'
- initrd /initramfs-5.3.18_1.img
- }
- menuentry 'Void/Austall GNU/Linux, with Linux 5.3.18_1 (recovery mode)' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.3.18_1-recovery-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
- load_video
- set gfxpayload=keep
- insmod gzio
- insmod part_msdos
- insmod ext2
- set root='hd0,msdos3'
- if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
- else
- search --no-floppy --fs-uuid --set=root a97ae8a3-d28a-4913-8249-9c5c829fb7c9
- fi
- echo 'Loading Linux 5.3.18_1 ...'
- linux /vmlinuz-5.3.18_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 ro single
- echo 'Loading initial ramdisk ...'
- initrd /initramfs-5.3.18_1.img
- }
- menuentry 'Void/Austall GNU/Linux, with Linux 5.3.9_1' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.3.9_1-advanced-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
- load_video
- set gfxpayload=keep
- insmod gzio
- insmod part_msdos
- insmod ext2
- set root='hd0,msdos3'
- if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
- else
- search --no-floppy --fs-uuid --set=root a97ae8a3-d28a-4913-8249-9c5c829fb7c9
- fi
- echo 'Loading Linux 5.3.9_1 ...'
- linux /vmlinuz-5.3.9_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 ro loglevel=4 slub_debug=P page_poison=1
- echo 'Loading initial ramdisk ...'
- initrd /initramfs-5.3.9_1.img
- }
- menuentry 'Void/Austall GNU/Linux, with Linux 5.3.9_1 (recovery mode)' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.3.9_1-recovery-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
- load_video
- set gfxpayload=keep
- insmod gzio
- insmod part_msdos
- insmod ext2
- set root='hd0,msdos3'
- if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
- else
- search --no-floppy --fs-uuid --set=root a97ae8a3-d28a-4913-8249-9c5c829fb7c9
- fi
- echo 'Loading Linux 5.3.9_1 ...'
- linux /vmlinuz-5.3.9_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 ro single
- echo 'Loading initial ramdisk ...'
- initrd /initramfs-5.3.9_1.img
+ initrd /initramfs-5.5.4_1.img
}
}
diff --git a/.gitaddlist b/.gitaddlist
@@ -0,0 +1,108 @@
+git add ./LICENSE
+git add .gitaddlist
+git add ./.Xresources
+git add ./.licenses
+git add ./.licenses/mit.license
+git add ./.licenses/gplv2.license
+git add ./.bash_profile
+git add ./.inputrc
+git add ./.bashrc
+git add ./.profile
+git add ./.vim
+git add ./.config/vim/
+git add ./.scripts/bin/misc/rmpv
+git add ./.scripts/bin/misc/hmpv
+git add ./.scripts/bin/misc/pipes
+git add ./.scripts/bin/misc/terminalimg
+git add ./.scripts/bin/misc/urlhand
+git add ./.scripts/bin/misc/slock_mod
+git add ./.scripts/bin/display/wallblur
+git add ./.scripts/bin/display/fehffile
+git add ./.scripts/bin/i3/scratcher
+git add ./.scripts/bin/i3/makegrid
+git add ./.scripts/bin/misc/trimfiles
+git add ./.scripts/bin/dmenu/dircgetpass
+git add ./.scripts/bin/display/hlock.png
+git add ./.scripts/bin/display/hlock
+git add ./.scripts/bin/display/monitors.sh
+git add ./.scripts/bin/display/rfeh
+git add ./.scripts/bin/i3/moveentire
+git add ./.scripts/bin/i3/mpvlisten
+git add ./.scripts/bin/i3/moveone
+git add ./.scripts/bin/i3/hvol
+git add ./.scripts/bin/i3/locker
+git add ./.scripts/bin/i3/wallvar
+git add ./.scripts/bin/i3/lockerexit
+git add ./.scripts/bin/i3/crefresh
+git add ./.scripts/bin/i3/ffflaunch
+git add ./.scripts/bin/dmenu/dmount
+git add ./.scripts/bin/dmenu/dumount
+git add ./.scripts/bin/dmenu/dmpv
+git add ./.scripts/bin/dmenu/daskpass
+git add ./.scripts/bin/dmenu/dpass
+git add ./.scripts/bin/dmenu/dfm
+git add ./.scripts/bin/dmenu/dbrowse
+git add ./.scripts/bin/dmenu/dmpvurl
+git add ./.scripts/bin/dmenu/userinput
+git add .scripts/i3blocks/convtodwm
+git add .scripts/i3blocks/news
+git add .scripts/i3blocks/weather2
+git add .scripts/i3blocks/bat
+git add .scripts/i3blocks/time2
+git add .scripts/i3blocks/net
+git add .scripts/i3blocks/mem
+git add .scripts/i3blocks/vol
+git add .scripts/i3blocks/time
+git add .scripts/i3blocks/host
+git add .scripts/i3blocks/cal
+git add .scripts/i3blocks/mpv
+git add .scripts/i3blocks/disk2
+git add .scripts/i3blocks/weather
+git add .scripts/i3blocks/cpu
+git add .scripts/i3blocks/disk
+git add ./.xprofile
+git add ./.vimrc
+git add ./.ls_colors
+git add ./.wall
+git add ./.xinitrc
+git add ./.Xresources
+git add .config/dunst/dunstrc
+git add .config/picom/config
+git add .config/irssi/pipeline.theme
+git add .config/irssi/default.theme
+git add .config/irssi/scripts/autorun/nickcolor.pl
+git add .config/irssi/scripts/autorun/usercount.pl
+git add .config/irssi/scripts/autorun/ascii.pl
+git add .config/irssi/scripts/autorun/url_hilight.pl
+git add .config/irssi/scripts/autorun/README
+git add .config/irssi/scripts/autorun/auto_whois.pl
+git add .config/irssi/config
+git add .config/i3blocks/i3blocks
+git add .config/i3blocks/config
+git add .config/i3blocks/config2
+git add .config/grub/grub.cfg
+git add .config/grub
+git add .config/grub/grub
+git add .config/grub/background.png
+git add .config/grub/autoinstall.sh
+git add .config/youtube-dl/config
+git add .config/neofetch/config.conf
+git add .config/mpd/mpd.conf
+git add .config/fff/fff
+git add .config/fff/config
+git add .config/dfm/config
+git add .config/dfm/bookmarks
+git add .config/wall1
+git add .config/youtube-viewer/youtube-viewer.conf
+git add .config/newsboat/config
+git add .config/mpv/input.conf
+git add .config/mpv/mpv.conf
+git add .config/i3/config
+git add .config/calcurse/keys
+git add .config/calcurse/conf
+git add .config/wall2
+git add .config/fish/config.fish
+git add .config/vimb/config
+git add .config/vimb/style.css
+git add .config/vimb/scripts.js
+git rm --cache .config/vim/.netrwhist
diff --git a/.scripts/i3blocks/title b/.scripts/i3blocks/title
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# i3blocks/title
-# Created by Hayden Hamilton
-#
-# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton.
-
-id=$(xprop -root _NET_ACTIVE_WINDOW | awk '// {print $5}')
-out1=$(xprop -id $id | awk '/WM_CLASS/ {print $3}' | sed 's/"//g' | sed 's/,//g')
-out2=$(xprop -id $id | awk '/_NET_WM_NAME/{ $1=""; $2=""; print}' | sed 's/"//g' | sed "s/^[ \t]*//")
-if [ "$BLOCK_BUTTON" == "1" ]
-then
- dunstify "Current window title" "$out2"
-fi
-echo "$out1 - $(echo "$out2" | cut -zc-25)"
-echo
-echo \#4a6b1b
diff --git a/.vimrc b/.vimrc
@@ -46,10 +46,20 @@ 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>bd :bdelete \| set linebreak<CR>
+map <leader>bn :bn \| set linebreak<CR>
+map <leader>bp :bp \| set linebreak<CR>
+map <leader>mvg :r !find -maxdepth 1 -type f -printf "mv \"\%f\"\t<++>\n"<Enter>
+map <leader>mvd :w! /tmp/bmv-edit \| set linebreak<CR>:!sh /tmp/bmv-edit \| set linebreak<CR>:q \| set linebreak<CR>
+map <leader>ss :set syntax=
+map dw diw
+map cw ciw
+imap <leader><leader>ss <Esc>:set syntax=
-map <leader><leader>s /<++><Enter>"_c4l
-imap <leader><leader>s <Esc>/<++><Enter>"_c4l
-map <leader><leader>c i<++><Esc>
+map <leader>j 0/<++><Enter>"_c4l
+map <leader>J 0/<++><Enter>"_d4l
+imap <leader><leader>j <Esc>0/<++><Enter>"_c4l
+map <leader>C i<++><Esc>
imap <leader><leader>c <++><Enter>
map <leader><leader>[ []<Esc><Left>i
@@ -69,13 +79,16 @@ imap <leader><leader>< <><Esc><Left>i
map <leader>m :Magit \| set linebreak<CR>
let g:magit_default_fold_level=0
-"Splitting
+"Splits
set splitbelow splitright
+noremap <leader>z :vsplit \| set linebreak<CR>
+noremap <leader>Z :split \| set linebreak<CR>
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
+noremap <C-W> <C-w><C-w>
"Vimling
nm <leader>ld :call ToggleDeadKeys()<CR>
