diff options
| -rw-r--r-- | 01-keyboard.hwdb | 14 | ||||
| -rw-r--r-- | LICENSE | 2 | ||||
| -rw-r--r-- | alacritty.yml | 68 | ||||
| -rw-r--r-- | ansible/openbsd-laptop.yml (renamed from openbsd-laptop.yml) | 0 | ||||
| -rw-r--r-- | arch-pkgs | 105 | ||||
| -rw-r--r-- | bin/Makefile | 31 | ||||
| -rwxr-xr-x | bin/OpenBSDStatus.sh | 108 | ||||
| -rwxr-xr-x | bin/ddmenu | 24 | ||||
| -rwxr-xr-x | bin/mouse-props | 32 | ||||
| -rwxr-xr-x | bin/snipmenu | 19 | ||||
| -rw-r--r-- | build/git | 8 | ||||
| -rwxr-xr-x | build/nvim | 6 | ||||
| -rwxr-xr-x | build/oksh | 33 | ||||
| -rw-r--r-- | build/readme.md | 7 | ||||
| -rw-r--r-- | build/socat/.gitignore | 1 | ||||
| -rw-r--r-- | build/socat/Dockerfile | 5 | ||||
| -rw-r--r-- | build/socat/build-int.sh | 26 | ||||
| -rw-r--r-- | build/socat/build.sh | 27 | ||||
| -rwxr-xr-x | build/tmux | 36 | ||||
| -rwxr-xr-x | build/upx | 26 | ||||
| -rwxr-xr-x | build/vim | 18 | ||||
| -rw-r--r-- | distro/arch.sh | 191 | ||||
| -rw-r--r-- | distro/fedora.sh | 76 | ||||
| -rw-r--r-- | distro/void.sh | 44 | ||||
| -rw-r--r-- | dotfiles/exclude | 22 | ||||
| -rw-r--r-- | dotfiles/gitconfig (renamed from gitconfig/mitch) | 4 | ||||
| l--------- | dotfiles/kshrc | 1 | ||||
| -rw-r--r-- | dotfiles/mpdconf (renamed from mpdconf) | 9 | ||||
| -rw-r--r-- | dotfiles/restic | 16 | ||||
| -rw-r--r-- | dotfiles/rtorrent.rc (renamed from rtorrent.rc) | 0 | ||||
| -rw-r--r-- | dotfiles/vimrc (renamed from vimrc) | 0 | ||||
| -rw-r--r-- | exclude | 14 | ||||
| -rwxr-xr-x | install.sh | 46 | ||||
| -rw-r--r-- | kshrc | 315 | ||||
| -rw-r--r-- | linux-bin/.gitignore (renamed from bin/.gitignore) | 0 | ||||
| -rw-r--r-- | linux-bin/Makefile | 16 | ||||
| -rw-r--r-- | linux-bin/backlight.c (renamed from bin/backlight.c) | 0 | ||||
| -rwxr-xr-x | linux-bin/wpa (renamed from bin/wpa) | 1 | ||||
| -rw-r--r-- | linux-bin/zzz.c (renamed from bin/zzz.c) | 7 | ||||
| -rw-r--r-- | pacman_bootbackup | 14 | ||||
| -rw-r--r-- | picom.conf | 10 | ||||
| -rw-r--r-- | plug.vim | 2827 | ||||
| -rw-r--r-- | readme.md | 98 | ||||
| -rw-r--r-- | remap.sh (renamed from linux-ncaps.sh) | 4 | ||||
| -rwxr-xr-x | scripts/httpsvr | 68 | ||||
| -rwxr-xr-x | scripts/key-check.sh | 12 | ||||
| -rw-r--r-- | scripts/readme.md | 3 | ||||
| -rwxr-xr-x | scripts/snap-btrfs.sh | 23 | ||||
| -rwxr-xr-x | scripts/snap-lvm.sh | 31 | ||||
| -rw-r--r-- | scripts/syncthing-cert.sh | 70 | ||||
| -rwxr-xr-x | scripts/webhook.py | 70 | ||||
| -rw-r--r-- | snips/aws/ami | 1 | ||||
| -rw-r--r-- | snips/aws/id | 1 | ||||
| -rw-r--r-- | snips/aws/ip | 1 | ||||
| -rw-r--r-- | snips/aws/ip-pub | 1 | ||||
| -rw-r--r-- | snips/aws/user-data | 1 | ||||
| -rw-r--r-- | snips/bash_history | 7 | ||||
| -rw-r--r-- | snips/docker-registry/all-repos | 2 | ||||
| -rw-r--r-- | snips/docker-registry/tags-for-repo | 1 | ||||
| l--------- | snips/keys | 1 | ||||
| l--------- | snips/mpdconf | 1 | ||||
| l--------- | snips/rtorrent.rc | 1 | ||||
| l--------- | snips/tmux.conf | 1 | ||||
| l--------- | snips/vimrc | 1 | ||||
| -rw-r--r-- | ssh (renamed from keys/personal) | 0 | ||||
| -rw-r--r-- | tezos/install.sh | 141 | ||||
| -rw-r--r-- | tezos/start.sh | 33 | ||||
| -rwxr-xr-x | util/backlight.sh | 19 | ||||
| -rw-r--r-- | util/hexify.c | 11 | ||||
| -rw-r--r-- | util/terminal-colors | 585 | ||||
| -rwxr-xr-x | util/zram.sh | 27 | ||||
| -rw-r--r-- | vimrc-full | 190 | ||||
| -rwxr-xr-x | x/4k-addmode.sh (renamed from bin/4k-addmode.sh) | 0 | ||||
| -rwxr-xr-x | x/day (renamed from bin/day) | 0 | ||||
| -rwxr-xr-x | x/mouse-props | 49 | ||||
| -rwxr-xr-x | x/night (renamed from bin/night) | 0 | ||||
| -rwxr-xr-x | x/rot (renamed from bin/rot) | 0 | ||||
| -rwxr-xr-x | x/status-bar (renamed from bin/status-bar) | 0 | ||||
| -rwxr-xr-x | x/touchpad-props (renamed from bin/touchpad-props) | 0 | ||||
| -rwxr-xr-x | x/wallpaper (renamed from bin/wallpaper) | 0 |
80 files changed, 500 insertions, 5163 deletions
diff --git a/01-keyboard.hwdb b/01-keyboard.hwdb deleted file mode 100644 index 069e253..0000000 --- a/01-keyboard.hwdb +++ /dev/null @@ -1,14 +0,0 @@ -# /etc/udev.d/hwdb/01-keyboard.hwdb -# https://wiki.archlinux.org/title/map_scancodes_to_keycodes -# also `yum -y install evtest` -# This is a fucking lifesaver -# evdev:name:AT Translated Set 2 keyboard:* -# systemd-hwdb update && udevadm trigger -# on other systems -# udevadm hwdb -u -# This should match all AT keyboards, apparently -evdev:atkbd:dmi:bvn*:bvr*:bd*:svn*:pn*:pvr* - KEYBOARD_KEY_3a=leftctrl - KEYBOARD_KEY_1d=leftctrl - KEYBOARD_KEY_9d=capslock - @@ -1,4 +1,4 @@ -Copyright 2021 Mitchell Riedstra +Copyright 2024 Mitchell Riedstra Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/alacritty.yml b/alacritty.yml deleted file mode 100644 index 17e6d69..0000000 --- a/alacritty.yml +++ /dev/null @@ -1,68 +0,0 @@ -window: - opacity: 1.0 - -# Font configuration -font: - size: 11.0 - normal: - Default: - - (macOS) Menlo - - (Linux/BSD) monospace - - (Windows) Consolas - - # family: Curie - # style: Italic - # family: IBM 3270 - family: IBM Plex Mono - # family: Terminus (TTF) - # style: regular - -# nord -colors: - primary: - background: '#2e3440' - foreground: '#d8dee9' - dim_foreground: '#a5abb6' - cursor: - text: '#2e3440' - cursor: '#d8dee9' - vi_mode_cursor: - text: '#2e3440' - cursor: '#d8dee9' - selection: - text: CellForeground - background: '#4c566a' - search: - matches: - foreground: CellBackground - background: '#88c0d0' - footer_bar: - background: '#434c5e' - foreground: '#d8dee9' - normal: - black: '#3b4252' - red: '#bf616a' - green: '#a3be8c' - yellow: '#ebcb8b' - blue: '#81a1c1' - magenta: '#b48ead' - cyan: '#88c0d0' - white: '#e5e9f0' - bright: - black: '#4c566a' - red: '#bf616a' - green: '#a3be8c' - yellow: '#ebcb8b' - blue: '#81a1c1' - magenta: '#b48ead' - cyan: '#8fbcbb' - white: '#eceff4' - dim: - black: '#373e4d' - red: '#94545d' - green: '#809575' - yellow: '#b29e75' - blue: '#68809a' - magenta: '#8c738c' - cyan: '#6d96a5' - white: '#aeb3bb' diff --git a/openbsd-laptop.yml b/ansible/openbsd-laptop.yml index bc19dc7..bc19dc7 100644 --- a/openbsd-laptop.yml +++ b/ansible/openbsd-laptop.yml diff --git a/arch-pkgs b/arch-pkgs deleted file mode 100644 index 5ca62a1..0000000 --- a/arch-pkgs +++ /dev/null @@ -1,105 +0,0 @@ -base -linux -linux-zen -linux-firmware -vim -lvm2 -xfsprogs -gdisk -dosfstools -btrfs-progs -networkmanager -wireless_tools -xorg-server -lightdm -lightdm-gtk-greeter -base-devel -libconfig # dmenu-pinentry -neovim -git -picom -chromium -firefox -openssh -feh -qt5ct # https://wiki.archlinux.org/title/qt#Appearance -oxygen -oxygen-icons -oxygen-icons-svg -pass -pass-otp -xclip -redshift -pulseaudio -pavucontrol -xorg-apps -alsa-utils -usbutils -tmux -vlc -xdotool -podman -gimp -rlwrap # used for clj -lxappearance -gdb -mandoc -man-pages -libfido2 -scrot -rsync -shellcheck -fuse -net-tools -efibootmgr -evolution -arandr -seahorse -mpd -ncmpc -noto-fonts-emoji -the_silver_searcher -pwgen -openbsd-netcat -bluez-utils bluez -pulseaudio-bluetooth -bluez-tools -python-pip -python-pyscard # for pip3 install --user ykman -swig # ykman -dunst -buildah -sipcalc -docker -ansible -jdk11-openjdk -jdk8-openjdk -libvirt # If you want -virt-manager -qemu -nsd # for drill a `dig` replacement -rclone -git-lfs -avr-gcc -avr-libc -multipath-tools # kpartx -ctags -smartmontools -gpa -xfce4 -xfce4-goodies -picard # musicbrainz -inkscape -ncdu -nm-connection-editor -speedtest-cli -iperf3 -ntfs-3g -pv -exfat-utils -zstd -bind -evince -nload -iotop -hdparm diff --git a/bin/Makefile b/bin/Makefile deleted file mode 100644 index 56afbe8..0000000 --- a/bin/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -WHEEL ?= wheel - -default: install - -install-zzz: zzz - install -D -o root -g $(WHEEL) -m 755 zzz /sbin/ - chmod 6750 /sbin/zzz - -install-linux: backlight - install -D -o root -g $(WHEEL) -m 755 backlight /sbin/ - chmod 6750 /sbin/backlight - -linux: - install wpa $(HOME)/bin - install touchpad-props $(HOME)/bin - -OpenBSD: - install OpenBSDStatus.sh $(HOME)/bin/ - -install: - install -d $(HOME)/bin - sed "s|__REPLACE__|$$(dirname `pwd`)/snips|g" < snipmenu > $(HOME)/bin/snipmenu - chmod +x $(HOME)/bin/snipmenu - install day $(HOME)/bin/ - install ddmenu $(HOME)/bin/ - install night $(HOME)/bin/ - install wallpaper $(HOME)/bin/ - install status-bar $(HOME)/bin/ - install vol $(HOME)/bin/ - install 4k-addmode.sh $(HOME)/bin/ - diff --git a/bin/OpenBSDStatus.sh b/bin/OpenBSDStatus.sh deleted file mode 100755 index 738f11f..0000000 --- a/bin/OpenBSDStatus.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh -timeout=1 - -_sys_memory() { - vmstat | sed -n '$p' | awk '{print $4}' -} - -_sys_uptime() { -uptime | sed -re's/^.*up[ ]+//g' -e's/^([^,]*),.*/\1/g' -e's/^([^ ]+)[ ]*(.).*/\1\2/g' -} - -wireless_info() { - _if="$1" - - printf "WiFi: %s %s %s %s" \ - "$_if" \ - "$(ifconfig "$_if" | sed -nre 's/^.*nwid ([^ ]+).*$/\1/p')" \ - "$(ifconfig "$_if" | sed -nre 's/^.* ([^ ]+dBm) .*$/\1/p')" \ - "$(ifconfig "$_if" | sed -nre 's/^.*inet ([^ ]+).*$/\1/p')" -} - -eth_info() { - _if="$1" - - printf "Eth: %s %s %s" \ - "$_if" \ - "$(ifconfig "$_if" | sed -nre 's/^.*inet ([^ ]+).*$/\1/p')" - "$(ifconfig "$_if" | grep -oE '[0-9]+baseT')" -} - -network_info() { - default_if="$(netstat -rnf inet | awk '/^default/{print $8}')" - - if [ -z "$default_if" ] ; then - echo "No conn" - elif ifconfig "$default_if" | grep -q IEEE802.11 ; then - wireless_info "$default_if" - else - eth_info "$default_if" - fi -} - - -ac_status() { - if [ `apm -a` -eq 1 ] ; then - echo "charging" - else - printf "discharging " - - if [ `apm -m` != "unknown" ] ; then - minutes="$(apm -m)" - hours="$(echo "$minutes"/60 | bc)" - hours2="$(echo "$minutes"/60 | bc -l)" - minutes="$(echo "(${hours2}-${hours})*60" | bc -l )" - printf "%d hours, %d minutes left" "$hours" "$minutes" - fi - fi -} - -cpu_temp() { - sysctl hw.sensors.cpu0.temp0 \ - | awk -F= '{print $2}' \ - | cut -d' ' -f 1 \ - | cut -d'.' -f 1 \ - | tr -d '\n' - printf "c" -} - -cpu_fan() { - sysctl hw \ - | grep fan \ - | awk -F= '{print $2;exit}' \ - | cut -d' ' -f 1 \ - | tr -d '\n' - printf "rpm" -} - -get_status_simple() { -echo \ - "Volume: $(sndioctl | awk 'BEGIN{FS="="}{if($1 ~ /output.level/){print ($2+0)*100}}') |"\ - "Fan: $(cpu_fan) |"\ - "Temp: $(cpu_temp) |"\ - "Setperf: $(sysctl hw.setperf | awk -F= '{print $2}') |"\ - "Batt: $(apm -l) $(ac_status)|"\ - "$(network_info) |"\ - "$(date '+%m.%d.%Y %H:%M:%S')" -} - -get_status() { -echo \ - "Volume: $(sndioctl | awk 'BEGIN{FS="="}{if($1 ~ /output.level/){print ($2+0)*100}}')|"\ - "Temp: $(sysctl hw.sensors.cpu0.temp0 | awk -F= '{print $2}')|"\ - "Fan: $(sysctl hw | grep fan | awk -F= '{print $2;exit}')|"\ - "Cpu Freq: $(sysctl hw.cpuspeed | awk -F= '{print $2}')mhz|"\ - "Setperf: $(sysctl hw.setperf | awk -F= '{print $2}')|"\ - "Batt: $(apm -l) $(ac_status)|"\ - "$(network_info) |"\ - "Free Mem: $(_sys_memory)|"\ - "uptime: $(_sys_uptime)|"\ - "$(date '+%m.%d.%Y %H:%M:%S')" -} - -while true ; do - -xsetroot -name "$(get_status_simple)" - -sleep "$timeout" -done diff --git a/bin/ddmenu b/bin/ddmenu deleted file mode 100755 index 3682139..0000000 --- a/bin/ddmenu +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# dmenu for dmenus -command="$(dmenu "$@" <<EOF -pass -pass-type -otp -otp-type -snip -snip-type -dmenu_run -pm -EOF -)" - -case $command in - pass) dpw-menu "$@" ;; - pass-type) dpw-menu --type "$@" ;; - otp) dpw-menu --otp "$@" ;; - otp-type) dpw-menu --otp --type "$@" ;; - snip) snipmenu copy "$@" ;; - snip-type) snipmenu "$@" ;; - dmenu_run) dmenu_run "$@" ;; - pm) pm "$@" ;; -esac diff --git a/bin/mouse-props b/bin/mouse-props deleted file mode 100755 index 1fb79ae..0000000 --- a/bin/mouse-props +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -mice="$(xinput list --name-only | grep -E 'Logitech G305|Naga Pro|Orochi V2|Viper' )" - -proplist='Accel Profile Enabled::0 1 -Accel Speed::0' -# Accel Speed::-0.7' - -IFS=' -' - -for device in $mice ; do - props=$(xinput --list-props "pointer:$device") - - for prop in $proplist ; do - propName="$(echo "$prop" | awk -F:: '{print $1}')" - propVal="$(echo "$prop" | awk -F:: '{print $2}')" - - prop="$(echo "$props" | - sed -rne 's/^.*'"$propName"' \(([0-9]+).*$/\1/ip')" - oldIFS="$IFS" - IFS=' ' - - #shellcheck disable=SC2086 - xinput --set-prop "pointer:$device" "$prop" $propVal - #shellcheck disable=SC2086 - echo xinput --set-prop "pointer:$device" "$prop" $propVal - - IFS="$oldIFS" - done -done - diff --git a/bin/snipmenu b/bin/snipmenu deleted file mode 100755 index bd54f7d..0000000 --- a/bin/snipmenu +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -set -e -snipdir="__REPLACE__" -act='type' - -while [ $# -gt 0 ] ; do case $1 in - -s) snipdir="$2"; shift ; shift ;; - copy) act='copy' ; shift ;; - type) act='type' ; shift ;; - *) break ;; -esac ; done - -cd "$snipdir" -_file=$(find -L . \! -type d | dmenu "$@") - -case $act in -copy) xclip -selection clipboard < "$_file" ;; -type) xdotool type --delay 1ms --clearmodifiers --file "$_file" ;; -esac diff --git a/build/git b/build/git deleted file mode 100644 index 4473110..0000000 --- a/build/git +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e -set -x -git clean -fdx . -make configure -./configure --prefix="$HOME/pkg" -make -j"$(nproc)" all doc -make install install-doc install-html diff --git a/build/nvim b/build/nvim deleted file mode 100755 index f7199e6..0000000 --- a/build/nvim +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# specifically for: https://github.com/neovim/neovim - -rm -rf build -make CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$HOME/pkg" -j"$(nproc)" -make install diff --git a/build/oksh b/build/oksh deleted file mode 100755 index 3588d76..0000000 --- a/build/oksh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -set -e -set -x -relver="6.9" -build_dir="/v/autobuild/oksh" - -export LDFLAGS="-static" -PREFIX="${PREFIX:-$HOME/pkg}" - -if ! [ -d "$build_dir" ] ; then - mkdir -p "$build_dir" -fi -cd "$build_dir" - -arLoc="https://github.com/ibara/oksh/releases/download/oksh-%s/oksh-%s.tar.gz" -arLoc="$(printf "$arLoc\n" "$relver" "$relver")" -arFn="oksh-${relver}.tar.gz" - -checksum=c08d97b2ac9ee5d88e9e508d27c75502b2d06c20d4c5ab87b496cb3b9951bd35 - -if ! [ -e "$arFn" ] ; then - curl -L -o "$arFn" "$arLoc" -fi - -echo "${checksum} $arFn" | sha256sum -c - -tar xzvf "$arFn" -cd "oksh-${relver}" -./configure --prefix="$PREFIX" --bindir="$PREFIX/bin" --enable-ksh \ - --enable-static -make -make install -j$(nproc) - diff --git a/build/readme.md b/build/readme.md deleted file mode 100644 index df1845d..0000000 --- a/build/readme.md +++ /dev/null @@ -1,7 +0,0 @@ -# build scripts - - -Probably not a ton of use to others, specific configuration for me -to build a few applications from source. Mostly because things on -Ubuntu LTS become rather out of date over time and there are cases -wehre I need to run that OS. diff --git a/build/socat/.gitignore b/build/socat/.gitignore deleted file mode 100644 index 378eac2..0000000 --- a/build/socat/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/build/socat/Dockerfile b/build/socat/Dockerfile deleted file mode 100644 index e872ec8..0000000 --- a/build/socat/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM alpine:latest - -RUN apk add gcc libc-dev make openssl-dev - - diff --git a/build/socat/build-int.sh b/build/socat/build-int.sh deleted file mode 100644 index 0709a90..0000000 --- a/build/socat/build-int.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -set -e -set -x -ver=1.7.3.4 -export LDFLAGS='-static' - -cd /build - -if [ -e socat ] ; then exit 0 ; fi - -if ! [ -e socat.tgz ] ; then - wget -O socat.tgz "http://www.dest-unreach.org/socat/download/socat-${ver}.tar.gz" -fi - -tar xzvf socat.tgz - -cd socat-${ver} - -./configure -make -j$(nproc) -cp socat ../ - -cd .. - -gzip -c < socat > socat.gz -base64 < socat.gz > socat.base64.gz diff --git a/build/socat/build.sh b/build/socat/build.sh deleted file mode 100644 index fbc70d9..0000000 --- a/build/socat/build.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -build=docker -if [ -x "$(command -v buildah)" ] ; then - build=buildah -fi - -run=docker -if [ -x "$(command -v podman)" ] ; then - run=podman -fi - -image="socat-builder" -$build build -t "$image" . - - -if ! [ -d build ] ; then - mkdir build; -fi - -cp build-int.sh build/build.sh -echo "chown -R $(id -u):$(id -g) /build" >> build/build.sh - -$run run --rm -it \ - -v `pwd`/build:/build \ - "$image" \ - sh /build/build.sh diff --git a/build/tmux b/build/tmux deleted file mode 100755 index f160062..0000000 --- a/build/tmux +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -set -e -set -x -relver="3.2a" -build_dir="/v/muslbuild/tmux" - -PREFIX="$HOME/musl" -export CC="musl-gcc -static -I. -I$PREFIX/include/ncursesw -DHAVE_FORKPTY=1 -DHAVE_FDFORKPTY=1" - -if ! [ -d "$build_dir" ] ; then - mkdir -p "$build_dir" -fi -cd "$build_dir" - -arLoc="https://github.com/tmux/tmux/releases/download/%s/tmux-%s.tar.gz" -arLoc="$(printf "$arLoc\n" "$relver" "$relver")" -arFn="tmux-${relver}.tar.gz" - -checksum=551553a4f82beaa8dadc9256800bcc284d7c000081e47aa6ecbb6ff36eacd05f - -if ! [ -e "$arFn" ] ; then - curl -L -o "$arFn" "$arLoc" -fi - -echo "${checksum} $arFn" | sha256sum -c - -tar xzvf "$arFn" -cd "tmux-${relver}" -./configure --prefix="$PREFIX" --bindir="$HOME/bin" \ - --enable-static \ - --host=x86_64-alpine-linux-musl \ - --build=x86_64-alpine-linux-musl -make clean -make -j$(nproc) -make install -j$(nproc) - diff --git a/build/upx b/build/upx deleted file mode 100755 index 9658832..0000000 --- a/build/upx +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -set -e -set -x -relver="3.96" -build_dir="/v/autobuild/jq" - -if ! [ -d "$build_dir" ] ; then - mkdir -p "$build_dir" -fi -cd "$build_dir" - -arLoc="https://github.com/upx/upx/releases/download/v%s/upx-%s-amd64_linux.tar.xz" -arLoc="$(printf "$arLoc\n" "$relver" "$relver")" -arFn="upx-${relver}-amd64_linux.tar.xz" - -checksum=ac75f5172c1c530d1b5ce7215ca9e94586c07b675a26af3b97f8421b8b8d413d - -if ! [ -e "$arFn" ] ; then - curl -L -o "$arFn" "$arLoc" -fi - -echo "${checksum} $arFn" | sha256sum -c - -tar xJvf "$arFn" -cd "upx-${relver}-amd64_linux" -cp upx "$HOME/bin/upx" diff --git a/build/vim b/build/vim deleted file mode 100755 index 51779e3..0000000 --- a/build/vim +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# Build vim from source code, with my usual options - -set -e -set -x - -./configure \ - --enable-multibyte \ - --with-x \ - --enable-perlinterp=yes \ - --enable-pythoninterp=yes \ - --enable-python3interp=yes \ - --enable-rubyinterp=yes \ - --with-gnome \ - --prefix=$HOME/pkg - -make -j$(nproc) -make install diff --git a/distro/arch.sh b/distro/arch.sh new file mode 100644 index 0000000..792110f --- /dev/null +++ b/distro/arch.sh @@ -0,0 +1,191 @@ +#!/bin/sh +set -e +if [ "$(id -u)" -ne 0 ] ; then + echo "Run as root" + exit 1; +fi + +pkgs=" +base +linux +linux-zen +linux-firmware +vim +lvm2 +xfsprogs +gdisk +dosfstools +btrfs-progs +networkmanager +wireless_tools +xorg-server +lightdm +lightdm-gtk-greeter +base-devel +libconfig # dmenu-pinentry +neovim +git +picom +chromium +firefox +openssh +feh +qt5ct # https://wiki.archlinux.org/title/qt#Appearance +oxygen +oxygen-icons +oxygen-icons-svg +pass +pass-otp +xclip +redshift +pulseaudio +pavucontrol +xorg-apps +alsa-utils +usbutils +tmux +vlc +xdotool +podman +gimp +rlwrap # used for clj +lxappearance +gdb +mandoc +man-pages +libfido2 +scrot +rsync +shellcheck +fuse +net-tools +efibootmgr +evolution +arandr +seahorse +mpd +ncmpc +noto-fonts-emoji +the_silver_searcher +pwgen +openbsd-netcat +bluez-utils +bluez +pulseaudio-bluetooth +bluez-tools +python-pip +python-pyscard # for pip3 install --user ykman +swig # ykman +dunst +buildah +sipcalc +docker +ansible +jdk11-openjdk +jdk8-openjdk +libvirt # If you want +virt-manager +qemu +nsd # for drill a dig replacement +rclone +git-lfs +avr-gcc +avr-libc +multipath-tools # kpartx +ctags +smartmontools +gpa +xfce4 +xfce4-goodies +picard # musicbrainz +inkscape +ncdu +nm-connection-editor +speedtest-cli +iperf3 +ntfs-3g +pv +exfat-utils +zstd +bind +evince +nload +iotop +hdparm +wlroots +fuzzel +wl-clipboard +pixz +minisign +ncspot +avaihd +colordiff +ethtool +kdenlive +zathura +zathura-pdf +zathura-mupdf +zathura-pdf-mupdf +zathura-ps +zathura-djvu +neofetch +wireguard +wireguard-tools +cmake +dia +ed +htop +whois +shellcheck +xournalpp +libxcb +xorg-xwayland +libxkbcommon +wayland-protocols" + +# pacman -S "$(echo "$pkgs" | awk '{print $1}' | tr '\n' ' ')" + +fn="/etc/systemd/logind.conf" +bak="$fn.$(date +%s)" +cp "$fn" "$bak" +ed "$fn" <<EOF +/^\[Login +/^KillUserProcesses= +d +i +KillUserProcesses=yes +. +/^HandleLidSwitch= +d +i +HandleLidSwitch=ignore +. +w +q +EOF +if diff -q "$fn" "$bak" >/dev/null ; then + rm "$bak" +fi + + +cat > /etc/udev/rules.d/99-removable.rules <<EOF +# /etc/udev/rules.d/99-removable.rules +ACTION=="add", SUBSYSTEM=="thunderbolt", ATTR{authorized}=="0", ATTR{authorized}="1" +EOF + + +cat > /etc/pacman.d/hooks/95-bootbackup.hook <<EOF +# /etc/pacman.d/hooks/95-bootbackup.hook +[Trigger] +Operation = Upgrade +Operation = Install +Operation = Remove +Type = Path +Target = usr/lib/modules/*/vmlinuz + +[Action] +Depends = rsync +Description = Backing up /boot... +When = PostTransaction +Exec = /bin/sh -c 'tar -C / -cf /.bootbackup."\$(date +%m.%d.%Y)".tar boot' +EOF diff --git a/distro/fedora.sh b/distro/fedora.sh new file mode 100644 index 0000000..a27e87d --- /dev/null +++ b/distro/fedora.sh @@ -0,0 +1,76 @@ +#!/bin/sh +set -ex +yum -y group install "Development Tools" +yum -y group install "C Development Tools and Libraries" +yum -y builddep dmenu slock st +yum -y install \ + NetworkManager-tui \ + ShellCheck \ + ansible \ + arandr \ + bear \ + bind-utils \ + bsdtar \ + buildah \ + chromium \ + dunst \ + evemu \ + evince \ + evolution \ + evolution-ews \ + feh \ + fuse \ + gdb \ + gimp \ + git \ + git-lfs \ + glibc-static \ + google-android-emoji-fonts \ + google-noto-emoji-color-fonts \ + google-noto-emoji-fonts \ + htop \ + iperf3 \ + java-1.8.0-openjdk \ + java-1.8.0-openjdk-devel \ + java-11-openjdk \ + java-11-openjdk-devel \ + kpartx \ + libXt-devel \ + libfido2 \ + libvirt \ + lm_sensors \ + maven \ + ncdu \ + ncmpc \ + neofetch \ + neovim \ + nload + npm \ + oksh \ + oksh \ + openssl \ + pass \ + pass-otp \ + picom \ + podman \ + pwgen \ + python-pip \ + python-pyscard \ + qemu \ + redshift \ + ripgrep \ + rlwrap \ + rsync \ + scrot \ + slock \ + sxiv \ + tmux \ + virt-manager \ + xclip \ + xdotool \ + xinput \ + xkill \ + xsetroot \ + zstd \ + + diff --git a/distro/void.sh b/distro/void.sh new file mode 100644 index 0000000..1853b95 --- /dev/null +++ b/distro/void.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +# yubikey rules and scdaemon rules in udev + +# 99-removable.rules for thunderbolt devices + +xbps-install \ + NetworkManager +busybox +chromium +cryptsetup +firefox +gnupg2-scdaemon +lightdm-gtk3-greeter +lvm2 +neovim +network-manager-applet +oksh +tmux +xfce4 +xorg +base-devel +xorg-server-devel +libXft-devel +libXinerama-devel +feh +htop +picom +libfido2 +openssh-sk-helper +pinentry-gtk +pcsclite +pcsc-tools +pcsc-ccid +slock +ripgrep +mesa-vaapi mesa-vdpau +evolution +lm_sensors +ncspot +curl + + +xbps-alternatives -s pinentry-gtk diff --git a/dotfiles/exclude b/dotfiles/exclude new file mode 100644 index 0000000..02a5661 --- /dev/null +++ b/dotfiles/exclude @@ -0,0 +1,22 @@ +Downloads/* +downloads/* +.steam/* +.local/share/Steam/* +VirtualBox* +.wine/* +jetbrains/* +scm/pub/linux/* +scm/go/pkg/* +scm/go1.* +.local/share/containers/* +.local/share/baloo/* +.local/share/nvim/mason/* +.local/share/Trash/* +.cache/* +.config/discord/* +.npm/* +videos/* +vms/* +.local/share/gnome-boxes/* +.local/share/flatpak/* +.config/libvirt/* diff --git a/gitconfig/mitch b/dotfiles/gitconfig index 577d4eb..485623b 100644 --- a/gitconfig/mitch +++ b/dotfiles/gitconfig @@ -1,5 +1,6 @@ [core] pager = less -FXx 4 + # pager = cat [user] email = mitch@riedstra.dev name = Mitchell Riedstra @@ -28,8 +29,5 @@ [url "git:"] insteadof = https://git.riedstra.dev/ -# [url "https://github.com/"] -# insteadof = "ssh://git@ssh.github.com/" - [init] defaultBranch = master diff --git a/dotfiles/kshrc b/dotfiles/kshrc new file mode 120000 index 0000000..d45eb83 --- /dev/null +++ b/dotfiles/kshrc @@ -0,0 +1 @@ +../kshrc
\ No newline at end of file diff --git a/mpdconf b/dotfiles/mpdconf index 2778ac4..2f994c4 100644 --- a/mpdconf +++ b/dotfiles/mpdconf @@ -21,12 +21,13 @@ db_file "~/.mpd.db" log_file "~/.mpd.log" # Optional -music_directory "~/Music" -playlist_directory "~/Music/Playlists" +music_directory "~/music/sorted" +playlist_directory "~/music/playlists" pid_file "~/.mpd.pid" state_file "~/.mpd.state" sticker_file "~/.mpd.sticker.sql" # bind_to_address "0.0.0.0" -bind_to_address "::1" -port "6600" +# bind_to_address "::1" +bind_to_address "localhost" +# port "6600" diff --git a/dotfiles/restic b/dotfiles/restic new file mode 100644 index 0000000..adb6895 --- /dev/null +++ b/dotfiles/restic @@ -0,0 +1,16 @@ +#!/bin/sh +case $0 in + *restic*) echo "meant to be sourced e.g. . ./.restic" ; exit 1 ;; +esac +export RESTIC_REPOSITORY=rest:http://home.mitch.is:8000 +if [ -z "$RESTIC_PASSWORD" ] ; then + printf "Enter password: " + stty -echo + read -r pass + stty echo + export RESTIC_PASSWORD="$pass" +fi +echo +echo hint: +echo "restic backup -v --exclude-file ~/.exclude /home/mitch" + diff --git a/rtorrent.rc b/dotfiles/rtorrent.rc index b023ca8..b023ca8 100644 --- a/rtorrent.rc +++ b/dotfiles/rtorrent.rc diff --git a/exclude b/exclude deleted file mode 100644 index 809d58d..0000000 --- a/exclude +++ /dev/null @@ -1,14 +0,0 @@ -.cache/* -.ccache/* -.config/cache/* -.config/google-chrome/*/Service Worker/CacheStorage/* -.config/google-chrome/*/Application Cache/* -.config/chromium/*/Service Worker/CacheStorage/* -.config/chromium/*/Application Cache/* -Downloads/* -.thumbnails/* -.dropbox-dist/* -.steam/* -.local/share/Steam/* -VirtualBox* -.wine/* diff --git a/install.sh b/install.sh new file mode 100755 index 0000000..b87822f --- /dev/null +++ b/install.sh @@ -0,0 +1,46 @@ +#!/bin/sh +set -e + +setLink() { + src="" + dest="" + while [ $# -gt 0 ] ; do case $1 in + -s) src="$2"; shift ; shift ;; + -d) dest="$2"; shift ; shift ;; + *) echo "unknown arg $1 invalid usage"; exit 1; ;; + esac ; done + + if [ -e "$dest" ] && ! [ -L "$dest" ] ; then + echo "Warning: $dest is not a link, no action taken" + return + fi + + [ -e "$dest" ] && rm "$dest" + + ln -s "$src" "$dest" +} + +for _f in dotfiles/* ; do + src="$(pwd)/$_f" + dest="$HOME/.$(basename "$_f")" + + setLink -s "$src" -d "$dest" +done + +if ! [ -d "$HOME/bin" ] ; then mkdir "$HOME/bin" ; fi +for _f in bin/* ; do + src="$(pwd)/$_f" + dest="$HOME/bin/$(basename "$_f")" + + setLink -s "$src" -d "$dest" +done + +if [ -n "$DISPLAY" ] && [ "$XDG_SESSION_TYPE" != "wayland" ] ; then + if ! [ -d "$HOME/x" ] ; then mkdir "$HOME/x" ; fi + for _f in x/* ; do + src="$(pwd)/$_f" + dest="$HOME/x/$(basename "$_f")" + + setLink -s "$src" -d "$dest" + done +fi @@ -1,4 +1,4 @@ -# Copyright 2022 Mitchell Riedstra +# Copyright 2024 Mitchell Riedstra # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -13,75 +13,25 @@ # PERFORMANCE OF THIS SOFTWARE. setaliases() { alias ls="ls -F"; -alias lt="ls -tF"; alias ll="ls -lhF"; -alias llt="ls -tlhF"; alias g="grep"; -alias gi="grep -i"; alias m="more"; alias j="jobs"; alias p="pwd"; -alias c="column" -alias ct="column -t" -alias eg='grep -E' -alias egi='grep -Ei' -alias egv='grep -Ev' -alias egiv='grep -Eiv' -alias search='grep -niRIE' alias rot13="tr 'A-Za-z' 'N-ZA-Mn-za-m'" alias setxkbmap-list="man xkeyboard-config" -alias csi="rlwrap chicken-csi" # docker-getip $container_id [ -x "$(command -v docker)" ] && \ alias docker-getip="docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}'" -alias xa='xargs -I{}' -[ -z "$(command -v gdb)" ] && \ - alias gdb='gdb -q' +[ -z "$(command -v gdb)" ] && alias gdb='gdb -q' #shellcheck disable=SC2139 -[ -x "$(command -v python3)" ] && \ - alias python="$(command -v python3) -q" -[ -x "$(command -v ncmpc)" ] && \ - alias ncmpc='ncmpc -C -M' -# Fun fact, Gnucash doesn't play nice when built against musl as a libc... -# go figure -[ -x "$(command -v gnucash)" ] && \ - alias gnucash_locale_fix='export LC_ALL=C; unset LANGUAGE; gnucash' +[ -x "$(command -v python3)" ] && alias python="$(command -v python3) -q" if [ "$(uname)" = "OpenBSD" ] ; then -sockstat() { - fstat | awk ' - BEGIN { - OFS="\t"; - } - { - if ( NR == 1 ) { - print($1, $2, $3, $5, $7, "ADDR"); - } - if( $0 ~ /tcp|udp/ ) { - if(!($0 ~ /[<-]-[->]/)) { - l = $1 "\t" $2 "\t" $3 "\t" $5 "\t" $7 "\t"; - if($7 == "tcp") { - services[$3] = l $9; - } else if ($7 == "udp") { - services[$3] = l $8; - } - } - } - } - END { - for(service in services) { - print(services[service]); - } - } - ' | column -t -} -! [ -x "$(which seq 2>/dev/null)" ] && alias seq="echo \"use jot(1)\"" + ! [ -x "$(which seq 2>/dev/null)" ] && alias seq="echo \"use jot(1)\"" fi if [ "$(uname)" = "Linux" ] ; then - # Sets capslock to be another control key, only works with PS2 keyboards - alias unfuck_capslock='setkeycodes 3a 29' - alias bc='bc -q' fi } @@ -206,9 +156,9 @@ set_ksh_competion() { $(showPasswordStore ~/.password-store) #shellcheck disable=SC2046 - [ -x "$(command -v dpw)" ] && set -A complete_dpw_1 -- \ - show copy type list ls mv cp rm edit otp fnd find insert \ - && set -A complete_dpw_2 -- $(dpw list) + set -A complete_dpw_1 -- \ + show copy type list ls mv cp rm edit otp fnd find insert + set -A complete_dpw_2 -- $(dpw list) #shellcheck disable=SC2046 @@ -243,21 +193,6 @@ randmacgen() { echo "" } -# First argument is the interface on which to scan -ipv6_local_hosts() { -if [ -n "$1" ] ; then - interface="$1" - ping6 -c 3 "ff02::2%$interface" \ - | grep 'bytes from' \ - | awk '{print $4}' \ - | sort \ - | uniq \ - | sed -e's/:$//' -else - echo "You need to specify an interface" -fi -} - # Add a given path to the start of your $PATH if it doesn't already # exist path_preappend() { @@ -281,11 +216,9 @@ path_list() { } set_nocaps() { - setxkbmap -layout "us,de" setxkbmap -option ctrl:nocaps setxkbmap -option shift:breaks_caps setxkbmap -option numpad:microsoft - setxkbmap -option grp:alt_space_toggle } # Usage: dir_oct:file_oct path @@ -321,8 +254,7 @@ esac # Pull a list of all our SSH hostnames out of the config and # dump them to stdout showsshhosts() { -cat ~/.ssh/config ~/.ssh/inc/* 2>/dev/null \ - | awk '/^[hH]ost /{$1=""; print $0}' +cat ~/.ssh/config ~/.ssh/inc/* 2>/dev/null | awk '/^[hH]ost /{$1=""; print $0}' } showPasswordStore() { @@ -433,71 +365,6 @@ tmux new-session -s "$session" -n "$window_name" -c "$working_directory" \;\ "$@" } - -_tmux_dev() { -session="" -working_directory="$(pwd)" -window_name="editor" -while [ $# -gt 0 ] ; do case $1 in ---) shift ; break;; --s) session="$2" ; shift ; shift ;; --n) window_name="$2" ; shift ; shift ;; --w) working_directory="$2" ; shift ; shift ;; -*)echo "Invalid option $1" ; return ;; -esac ; done - -cd "$working_directory" || { echo "Cannot change to: $working_directory" ; return; } - -_tmux_session -s "$session" -w "$working_directory" -n "$window_name" \ - -- \ - send-keys -t 0 "$EDITOR" \; send-keys -t 0 Enter \;\ - new-window -n "shell" \;\ - new-window -n "git" \;\ - send-keys -t 0 "git status" \; send-keys -t 0 Enter \;\ - "$@" - -} - -_tmux_servers_split_commands() { -n=0 -server_cmds="" -while [ $# -gt 0 ] ; do - if [ $n -eq 0 ] ; then - server_cmds='send-keys "ssh \"'"$1"'\"" \; send-keys Enter \; ' - else - server_cmds="${server_cmds} split-window \; "'send-keys "ssh \"'"$1"'\"" \; send-keys Enter \; ' - fi - n="$(echo "$n+1" | bc)" - shift -done -echo "$server_cmds" -} - -_tmux_servers() { -session="" -working_directory="$HOME" -servers="" -layout="even-vertical" -while [ $# -gt 0 ] ; do case $1 in ---) shift ; break;; --s) session="$2" ; shift ; shift ;; --w) working_directory="$2" ; shift ; shift ;; --servers) servers="$2"; shift ; shift ;; --l) layout="$2"; shift ; shift ;; -*)echo "Invalid option $1" ; return ;; -esac ; done -cd "$working_directory" || { echo "Cannot change to: $working_directory" ; return; } - -layout="select-layout $layout ';' set-window-option synchronize-panes on ';'" - -eval _tmux_session -s "\$session" -w "\$working_directory" -n "main" \ - -- \ - $(_tmux_servers_split_commands $servers) \ - "$layout" \ - "\$@" \ - -} - scangit() { ref="origin/master" while [ $# -gt 0 ] ; do case $1 in @@ -586,154 +453,6 @@ pkg_switch_branch() { cp $_f ${_f}.orig sed -e's/quarterly/latest/' < ${_f}.orig > ${_f} } -# System setup `chroot`, useful mainly on Linux -syschroot() { - CHDIR=$1 - PROG=$2 - CUR_PS1="$PS1" - PS1="(CHROOT) # " - mount -t proc none "$CHDIR/proc" - mount -o bind /dev "$CHDIR/dev" - mount -o bind /dev/pts "$CHDIR/dev/pts" - mount -o bind /sys "$CHDIR/sys" - mount -o bind /run "$CHDIR/run" - if [ "$PROG" = "/bin/bash" ] ; then - PS1="(CHROOT) [ \u@\h \w ] # " - fi - chroot "$CHDIR" "$PROG" - umount "$CHDIR/dev/pts" "$CHDIR/dev" "$CHDIR/sys" "$CHDIR/proc" \ - "$CHDIR/run" - PS1="$CUR_PS1" -} -pull() { - _f="" - _u="" - while [ $# -gt 0 ] ; do case $1 in - -f) _f="$2"; shift; shift ;; - -u) _u="$2"; shift; shift ;; - *) echo "pull usage: -f <output> -u <url>"; return ;; - esac ; done - echo "file: $_f" - echo "url: $_u" - if [ -z "$_f" ] || [ -z "$_u" ] ; then - echo "pull usage: -f <output> -u <url>"; return - fi - - if [ -n "$(command -v wget)" ] ; then - wget "$_u" -O "$_f" && return - fi - - if [ -n "$(command -v curl)" ] ; then - curl "$_u" -o "$_f" && return - fi - - if [ -n "$(command -v ftp)" ] && [ "$(uname)" = "OpenBSD" ] ; then - ftp -o "$_f" "$_u" && return - fi - - if [ -n "$(command -v fetch)" ] && [ "$(uname)" = "FreeBSD" ] ; then - fetch "$_u" -o "$_f" && return - fi - - - echo "Unable to fetch $_u" >&2 -} -pulldotfile() { - file="$1" - if [ -z "$file" ] ; then - echo "pulldotfile usage: <dotfilename>" - echo "Will pull from ${UPDATE_URL}/<dotfilename> and save to:" - #shellcheck disable=SC2088 - echo "~/.<dotfilename>" - return - fi - destfile="$(basename "${file}")" - pull -u "${UPDATE_URL}${file}" -f "$HOME/.${destfile}" -} -_make_ssh_dir_if_not_exists() { - auth_keys="$HOME/.ssh/authorized_keys" - if ! [ -d "$HOME/.ssh" ] ; then mkdir "$HOME/.ssh" ; fi - chmod 700 "$HOME/.ssh" - chmod 600 "$auth_keys" -} -_pullkeys() { - url="$1"; shift - _timestamp="$(timestamp)" - _make_ssh_dir_if_not_exists - auth_keys="$HOME/.ssh/authorized_keys" - mv "$auth_keys" "${auth_keys}.${_timestamp}" || \ - echo "Authorized Keys do not currently exist" - pull -u "$url" -f "$auth_keys" || \ - mv "${auth_keys}.${_timestamp}" "$auth_keys" - ssh-keygen -lf "$auth_keys" || \ - mv "${auth_keys}.${_timestamp}" "$auth_keys" - - chmod 600 "$auth_keys" -} -pullkeys() { - file="keys/$1"; shift; - url="${UPDATE_URL}${file}" - _pullkeys "$url" -} -pullkeys_github() { - _username="$1"; shift; - url="https://github.com/${_username}.keys" - _pullkeys "$url" -} -pulltermcolors() { - file="$HOME/bin/terminal-colors" - if ! [ -d "$HOME/bin" ] ; then - mkdir "$HOME/bin" - fi - pull -u "${UPDATE_URL}/util/terminal-colors" -f "$file" - chmod +x "$file" -} -updatetmuxconf() { - pulldotfile "tmux/tmux.conf" - pulldotfile "tmux/tmux_helper.sh" - if ! [ -e "$HOME/.tmux.conf.local" ] && [ "$(id -u)" -eq 0 ] ; then - # If I ever change the color from green this will have to be updated I guess - grep 'green' "$HOME/.tmux.conf" | sed -e's/green/red/g' > "$HOME/.tmux.conf.local" - elif ! [ -e "$HOME/.tmux.conf.local" ] ; then - touch "$HOME/.tmux.conf.local" - fi -} -updategitconf() { - file="gitconfig/$1" - pull -u "${UPDATE_URL}${file}" -f "$HOME/.gitconfig" -} -updateshell() { - pulldotfile "kshrc" - #shellcheck disable=SC1090 - . "$HOME/.kshrc" -} -updatenvim() { - OLDWD="$(pwd)" - #shellcheck disable=SC2164 - cd "$HOME" - nvimDest="$HOME/.config/nvim" - if ! [ -d "$nvimDest" ] ; then - mkdir -p "$nvimDest" - git clone "$NVIM_GIT_URL" "$nvimDest" - else - cd "$nvimDest" || { echo failed to cd "$nvimDest" ; return ; } - git pull --ff-only origin master - fi - cd "$OLDWD" -} -updatevimrc() { - OLDWD="$(pwd)" - #shellcheck disable=SC2164 - cd "$HOME" - mkdir -p "$HOME/.vim/autoload/" - pull -u "${UPDATE_URL}plug.vim" -f "$HOME/.vim/autoload/plug.vim" - pull -u "${UPDATE_URL}vimrc-full" -f "$HOME/.vimrc" - cd "$OLDWD" -} -updatevimrc_basic() { - pull -u "$VIM_BASIC_URL" -f ~/.vimrc -} - SHELL_CONFIG=".kshrc" COLOR=0 @@ -742,17 +461,13 @@ case "$TERM" in *256color) COLOR=1;; esac - path_preappend "$HOME/bin" -UPDATE_URL="https://git.riedstra.dev/mitch/dotfiles/plain/" -VIM_GIT_URL="https://git.riedstra.dev/mitch/vim-cfg" -NVIM_GIT_URL="https://git.riedstra.dev/mitch/nvim-config" -VIM_BASIC_URL="https://git.riedstra.dev/mitch/dotfiles/plain/vimrc" - PRELOAD="$HOME/${SHELL_CONFIG}.pre" LOCAL="$HOME/${SHELL_CONFIG}.local" +export PASSWORD_STORE_ENABLE_EXTENSIONS=true + # Don't put any variables below this, as they can't be overridden before the # functions if you do that @@ -764,20 +479,10 @@ set_pager # note that the use of set_editor and _set_editor on oksh may # change the input mode. ( set -o emacs ) after to go back set_editor # Also, opinionated, hope you like vim/vi -# set_go - -export PASSWORD_STORE_ENABLE_EXTENSIONS=true setaliases setsudoaliases -if [ -n "$DISPLAY" ] ; then - [ -x "$(command -v dmenu_askpass)" ] && \ - export SSH_ASKPASS=dmenu_askpass - checkSSHAgent -fi - - # Support various different shells if [ -n "$YASH_VERSION" ] ; then echo "Intentionally left blank" >/dev/null 2>&1 diff --git a/bin/.gitignore b/linux-bin/.gitignore index 4711d71..4711d71 100644 --- a/bin/.gitignore +++ b/linux-bin/.gitignore diff --git a/linux-bin/Makefile b/linux-bin/Makefile new file mode 100644 index 0000000..eb1db92 --- /dev/null +++ b/linux-bin/Makefile @@ -0,0 +1,16 @@ +WHEEL ?= wheel + +default: zzz backlight + +install-zzz: zzz + install -D -o root -g $(WHEEL) -m 755 zzz /sbin/ + chmod 6750 /sbin/zzz + +install-backlight: backlight + install -D -o root -g $(WHEEL) -m 755 backlight /sbin/ + chmod 6750 /sbin/backlight + +install: install-zzz install-backlight + +clean: + rm -f zzz backlight diff --git a/bin/backlight.c b/linux-bin/backlight.c index 497fd72..497fd72 100644 --- a/bin/backlight.c +++ b/linux-bin/backlight.c @@ -1,5 +1,6 @@ #!/bin/sh set -e +# manual configuration of wifi made a little bit easier with wpa_supplicant session="wpa" t=3 interface= diff --git a/bin/zzz.c b/linux-bin/zzz.c index ad2ef6c..8bc3c22 100644 --- a/bin/zzz.c +++ b/linux-bin/zzz.c @@ -46,12 +46,16 @@ main(int argc, char **argv) uid_t euid = geteuid(); char **a = argv+1; char *lockProg = "slock"; + char *lockProgWl= "swaylock"; pid_t pid; int ret; if (euid != 0) die("Program must be run as root/setuid"); + if (strcmp("wayland", getenv("XDG_SESSION_TYPE")) == 0) + lockProg = lockProgWl; + for (;*a;a++) { if (strcmp("-l", *a) == 0) { a++; @@ -65,7 +69,6 @@ main(int argc, char **argv) } } - pid = fork(); switch (pid) { case -1: @@ -78,7 +81,7 @@ main(int argc, char **argv) if (ret == -1) err("setgid"); - execlp(lockProg, lockProg); + execlp(lockProg, NULL); err("execlp"); default: suspend(); diff --git a/pacman_bootbackup b/pacman_bootbackup deleted file mode 100644 index 48d37db..0000000 --- a/pacman_bootbackup +++ /dev/null @@ -1,14 +0,0 @@ -# /etc/pacman.d/hooks/95-bootbackup.hook -[Trigger] -Operation = Upgrade -Operation = Install -Operation = Remove -Type = Path -Target = usr/lib/modules/*/vmlinuz - -[Action] -Depends = rsync -Description = Backing up /boot... -When = PostTransaction -Exec = /usr/bin/rsync -a --delete /boot /.bootbackup - diff --git a/picom.conf b/picom.conf deleted file mode 100644 index 4386cad..0000000 --- a/picom.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Specify the backend to use: `xrender`, `glx`, or `xr_glx_hybrid`. -# backend = "glx" -backend = "xrender"; - -# no-use-damage = false -use-damage = true; - -# inactive-opacity = 0.8; -# active-opacity = 0.9; -inactive-dim = 0.2; diff --git a/plug.vim b/plug.vim deleted file mode 100644 index d2101f7..0000000 --- a/plug.vim +++ /dev/null @@ -1,2827 +0,0 @@ -" See https://github.com/junegunn/vim-plug for more information -" for more information. Copied here since it integrates well with my -" existing dotfile management. -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" MIT License -" -" Copyright (c) 2017 Junegunn Choi -" -" Permission is hereby granted, free of charge, to any person obtaining a copy -" of this software and associated documentation files (the "Software"), to deal -" in the Software without restriction, including without limitation the rights -" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -" copies of the Software, and to permit persons to whom the Software is -" furnished to do so, subject to the following conditions: -" -" The above copyright notice and this permission notice shall be included in all -" copies or substantial portions of the Software. -" -" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -" SOFTWARE. -" vim-plug: Vim plugin manager -" ============================ -" -" Download plug.vim and put it in ~/.vim/autoload -" -" curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ -" https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim -" -" Edit your .vimrc -" -" call plug#begin('~/.vim/plugged') -" -" " Make sure you use single quotes -" -" " Shorthand notation; fetches https://github.com/junegunn/vim-easy-align -" Plug 'junegunn/vim-easy-align' -" -" " Any valid git URL is allowed -" Plug 'https://github.com/junegunn/vim-github-dashboard.git' -" -" " Multiple Plug commands can be written in a single line using | separators -" Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' -" -" " On-demand loading -" Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } -" Plug 'tpope/vim-fireplace', { 'for': 'clojure' } -" -" " Using a non-default branch -" Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' } -" -" " Using a tagged release; wildcard allowed (requires git 1.9.2 or above) -" Plug 'fatih/vim-go', { 'tag': '*' } -" -" " Plugin options -" Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' } -" -" " Plugin outside ~/.vim/plugged with post-update hook -" Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } -" -" " Unmanaged plugin (manually installed and updated) -" Plug '~/my-prototype-plugin' -" -" " Initialize plugin system -" call plug#end() -" -" Then reload .vimrc and :PlugInstall to install plugins. -" -" Plug options: -" -"| Option | Description | -"| ----------------------- | ------------------------------------------------ | -"| `branch`/`tag`/`commit` | Branch/tag/commit of the repository to use | -"| `rtp` | Subdirectory that contains Vim plugin | -"| `dir` | Custom directory for the plugin | -"| `as` | Use different name for the plugin | -"| `do` | Post-update hook (string or funcref) | -"| `on` | On-demand loading: Commands or `<Plug>`-mappings | -"| `for` | On-demand loading: File types | -"| `frozen` | Do not update unless explicitly specified | -" -" More information: https://github.com/junegunn/vim-plug -" -" -" Copyright (c) 2017 Junegunn Choi -" -" MIT License -" -" Permission is hereby granted, free of charge, to any person obtaining -" a copy of this software and associated documentation files (the -" "Software"), to deal in the Software without restriction, including -" without limitation the rights to use, copy, modify, merge, publish, -" distribute, sublicense, and/or sell copies of the Software, and to -" permit persons to whom the Software is furnished to do so, subject to -" the following conditions: -" -" The above copyright notice and this permission notice shall be -" included in all copies or substantial portions of the Software. -" -" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -" NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -" LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -if exists('g:loaded_plug') - finish -endif -let g:loaded_plug = 1 - -let s:cpo_save = &cpo -set cpo&vim - -let s:plug_src = 'https://github.com/junegunn/vim-plug.git' -let s:plug_tab = get(s:, 'plug_tab', -1) -let s:plug_buf = get(s:, 'plug_buf', -1) -let s:mac_gui = has('gui_macvim') && has('gui_running') -let s:is_win = has('win32') -let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win) -let s:vim8 = has('patch-8.0.0039') && exists('*job_start') -if s:is_win && &shellslash - set noshellslash - let s:me = resolve(expand('<sfile>:p')) - set shellslash -else - let s:me = resolve(expand('<sfile>:p')) -endif -let s:base_spec = { 'branch': '', 'frozen': 0 } -let s:TYPE = { -\ 'string': type(''), -\ 'list': type([]), -\ 'dict': type({}), -\ 'funcref': type(function('call')) -\ } -let s:loaded = get(s:, 'loaded', {}) -let s:triggers = get(s:, 'triggers', {}) - -function! s:is_powershell(shell) - return a:shell =~# 'powershell\(\.exe\)\?$' || a:shell =~# 'pwsh\(\.exe\)\?$' -endfunction - -function! s:isabsolute(dir) abort - return a:dir =~# '^/' || (has('win32') && a:dir =~? '^\%(\\\|[A-Z]:\)') -endfunction - -function! s:git_dir(dir) abort - let gitdir = s:trim(a:dir) . '/.git' - if isdirectory(gitdir) - return gitdir - endif - if !filereadable(gitdir) - return '' - endif - let gitdir = matchstr(get(readfile(gitdir), 0, ''), '^gitdir: \zs.*') - if len(gitdir) && !s:isabsolute(gitdir) - let gitdir = a:dir . '/' . gitdir - endif - return isdirectory(gitdir) ? gitdir : '' -endfunction - -function! s:git_origin_url(dir) abort - let gitdir = s:git_dir(a:dir) - let config = gitdir . '/config' - if empty(gitdir) || !filereadable(config) - return '' - endif - return matchstr(join(readfile(config)), '\[remote "origin"\].\{-}url\s*=\s*\zs\S*\ze') -endfunction - -function! s:git_revision(dir) abort - let gitdir = s:git_dir(a:dir) - let head = gitdir . '/HEAD' - if empty(gitdir) || !filereadable(head) - return '' - endif - - let line = get(readfile(head), 0, '') - let ref = matchstr(line, '^ref: \zs.*') - if empty(ref) - return line - endif - - if filereadable(gitdir . '/' . ref) - return get(readfile(gitdir . '/' . ref), 0, '') - endif - - if filereadable(gitdir . '/packed-refs') - for line in readfile(gitdir . '/packed-refs') - if line =~# ' ' . ref - return matchstr(line, '^[0-9a-f]*') - endif - endfor - endif - - return '' -endfunction - -function! s:git_local_branch(dir) abort - let gitdir = s:git_dir(a:dir) - let head = gitdir . '/HEAD' - if empty(gitdir) || !filereadable(head) - return '' - endif - let branch = matchstr(get(readfile(head), 0, ''), '^ref: refs/heads/\zs.*') - return len(branch) ? branch : 'HEAD' -endfunction - -function! s:git_origin_branch(spec) - if len(a:spec.branch) - return a:spec.branch - endif - - " The file may not be present if this is a local repository - let gitdir = s:git_dir(a:spec.dir) - let origin_head = gitdir.'/refs/remotes/origin/HEAD' - if len(gitdir) && filereadable(origin_head) - return matchstr(get(readfile(origin_head), 0, ''), - \ '^ref: refs/remotes/origin/\zs.*') - endif - - " The command may not return the name of a branch in detached HEAD state - let result = s:lines(s:system('git symbolic-ref --short HEAD', a:spec.dir)) - return v:shell_error ? '' : result[-1] -endfunction - -if s:is_win - function! s:plug_call(fn, ...) - let shellslash = &shellslash - try - set noshellslash - return call(a:fn, a:000) - finally - let &shellslash = shellslash - endtry - endfunction -else - function! s:plug_call(fn, ...) - return call(a:fn, a:000) - endfunction -endif - -function! s:plug_getcwd() - return s:plug_call('getcwd') -endfunction - -function! s:plug_fnamemodify(fname, mods) - return s:plug_call('fnamemodify', a:fname, a:mods) -endfunction - -function! s:plug_expand(fmt) - return s:plug_call('expand', a:fmt, 1) -endfunction - -function! s:plug_tempname() - return s:plug_call('tempname') -endfunction - -function! plug#begin(...) - if a:0 > 0 - let s:plug_home_org = a:1 - let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p')) - elseif exists('g:plug_home') - let home = s:path(g:plug_home) - elseif !empty(&rtp) - let home = s:path(split(&rtp, ',')[0]) . '/plugged' - else - return s:err('Unable to determine plug home. Try calling plug#begin() with a path argument.') - endif - if s:plug_fnamemodify(home, ':t') ==# 'plugin' && s:plug_fnamemodify(home, ':h') ==# s:first_rtp - return s:err('Invalid plug home. '.home.' is a standard Vim runtime path and is not allowed.') - endif - - let g:plug_home = home - let g:plugs = {} - let g:plugs_order = [] - let s:triggers = {} - - call s:define_commands() - return 1 -endfunction - -function! s:define_commands() - command! -nargs=+ -bar Plug call plug#(<args>) - if !executable('git') - return s:err('`git` executable not found. Most commands will not be available. To suppress this message, prepend `silent!` to `call plug#begin(...)`.') - endif - if has('win32') - \ && &shellslash - \ && (&shell =~# 'cmd\(\.exe\)\?$' || s:is_powershell(&shell)) - return s:err('vim-plug does not support shell, ' . &shell . ', when shellslash is set.') - endif - if !has('nvim') - \ && (has('win32') || has('win32unix')) - \ && !has('multi_byte') - return s:err('Vim needs +multi_byte feature on Windows to run shell commands. Enable +iconv for best results.') - endif - command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install(<bang>0, [<f-args>]) - command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate call s:update(<bang>0, [<f-args>]) - command! -nargs=0 -bar -bang PlugClean call s:clean(<bang>0) - command! -nargs=0 -bar PlugUpgrade if s:upgrade() | execute 'source' s:esc(s:me) | endif - command! -nargs=0 -bar PlugStatus call s:status() - command! -nargs=0 -bar PlugDiff call s:diff() - command! -nargs=? -bar -bang -complete=file PlugSnapshot call s:snapshot(<bang>0, <f-args>) -endfunction - -function! s:to_a(v) - return type(a:v) == s:TYPE.list ? a:v : [a:v] -endfunction - -function! s:to_s(v) - return type(a:v) == s:TYPE.string ? a:v : join(a:v, "\n") . "\n" -endfunction - -function! s:glob(from, pattern) - return s:lines(globpath(a:from, a:pattern)) -endfunction - -function! s:source(from, ...) - let found = 0 - for pattern in a:000 - for vim in s:glob(a:from, pattern) - execute 'source' s:esc(vim) - let found = 1 - endfor - endfor - return found -endfunction - -function! s:assoc(dict, key, val) - let a:dict[a:key] = add(get(a:dict, a:key, []), a:val) -endfunction - -function! s:ask(message, ...) - call inputsave() - echohl WarningMsg - let answer = input(a:message.(a:0 ? ' (y/N/a) ' : ' (y/N) ')) - echohl None - call inputrestore() - echo "\r" - return (a:0 && answer =~? '^a') ? 2 : (answer =~? '^y') ? 1 : 0 -endfunction - -function! s:ask_no_interrupt(...) - try - return call('s:ask', a:000) - catch - return 0 - endtry -endfunction - -function! s:lazy(plug, opt) - return has_key(a:plug, a:opt) && - \ (empty(s:to_a(a:plug[a:opt])) || - \ !isdirectory(a:plug.dir) || - \ len(s:glob(s:rtp(a:plug), 'plugin')) || - \ len(s:glob(s:rtp(a:plug), 'after/plugin'))) -endfunction - -function! plug#end() - if !exists('g:plugs') - return s:err('plug#end() called without calling plug#begin() first') - endif - - if exists('#PlugLOD') - augroup PlugLOD - autocmd! - augroup END - augroup! PlugLOD - endif - let lod = { 'ft': {}, 'map': {}, 'cmd': {} } - - if exists('g:did_load_filetypes') - filetype off - endif - for name in g:plugs_order - if !has_key(g:plugs, name) - continue - endif - let plug = g:plugs[name] - if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for') - let s:loaded[name] = 1 - continue - endif - - if has_key(plug, 'on') - let s:triggers[name] = { 'map': [], 'cmd': [] } - for cmd in s:to_a(plug.on) - if cmd =~? '^<Plug>.\+' - if empty(mapcheck(cmd)) && empty(mapcheck(cmd, 'i')) - call s:assoc(lod.map, cmd, name) - endif - call add(s:triggers[name].map, cmd) - elseif cmd =~# '^[A-Z]' - let cmd = substitute(cmd, '!*$', '', '') - if exists(':'.cmd) != 2 - call s:assoc(lod.cmd, cmd, name) - endif - call add(s:triggers[name].cmd, cmd) - else - call s:err('Invalid `on` option: '.cmd. - \ '. Should start with an uppercase letter or `<Plug>`.') - endif - endfor - endif - - if has_key(plug, 'for') - let types = s:to_a(plug.for) - if !empty(types) - augroup filetypedetect - call s:source(s:rtp(plug), 'ftdetect/**/*.vim', 'after/ftdetect/**/*.vim') - augroup END - endif - for type in types - call s:assoc(lod.ft, type, name) - endfor - endif - endfor - - for [cmd, names] in items(lod.cmd) - execute printf( - \ 'command! -nargs=* -range -bang -complete=file %s call s:lod_cmd(%s, "<bang>", <line1>, <line2>, <q-args>, %s)', - \ cmd, string(cmd), string(names)) - endfor - - for [map, names] in items(lod.map) - for [mode, map_prefix, key_prefix] in - \ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] - execute printf( - \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, %s, "%s")<CR>', - \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix) - endfor - endfor - - for [ft, names] in items(lod.ft) - augroup PlugLOD - execute printf('autocmd FileType %s call <SID>lod_ft(%s, %s)', - \ ft, string(ft), string(names)) - augroup END - endfor - - call s:reorg_rtp() - filetype plugin indent on - if has('vim_starting') - if has('syntax') && !exists('g:syntax_on') - syntax enable - end - else - call s:reload_plugins() - endif -endfunction - -function! s:loaded_names() - return filter(copy(g:plugs_order), 'get(s:loaded, v:val, 0)') -endfunction - -function! s:load_plugin(spec) - call s:source(s:rtp(a:spec), 'plugin/**/*.vim', 'after/plugin/**/*.vim') -endfunction - -function! s:reload_plugins() - for name in s:loaded_names() - call s:load_plugin(g:plugs[name]) - endfor -endfunction - -function! s:trim(str) - return substitute(a:str, '[\/]\+$', '', '') -endfunction - -function! s:version_requirement(val, min) - for idx in range(0, len(a:min) - 1) - let v = get(a:val, idx, 0) - if v < a:min[idx] | return 0 - elseif v > a:min[idx] | return 1 - endif - endfor - return 1 -endfunction - -function! s:git_version_requirement(...) - if !exists('s:git_version') - let s:git_version = map(split(split(s:system(['git', '--version']))[2], '\.'), 'str2nr(v:val)') - endif - return s:version_requirement(s:git_version, a:000) -endfunction - -function! s:progress_opt(base) - return a:base && !s:is_win && - \ s:git_version_requirement(1, 7, 1) ? '--progress' : '' -endfunction - -function! s:rtp(spec) - return s:path(a:spec.dir . get(a:spec, 'rtp', '')) -endfunction - -if s:is_win - function! s:path(path) - return s:trim(substitute(a:path, '/', '\', 'g')) - endfunction - - function! s:dirpath(path) - return s:path(a:path) . '\' - endfunction - - function! s:is_local_plug(repo) - return a:repo =~? '^[a-z]:\|^[%~]' - endfunction - - " Copied from fzf - function! s:wrap_cmds(cmds) - let cmds = [ - \ '@echo off', - \ 'setlocal enabledelayedexpansion'] - \ + (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) - \ + ['endlocal'] - if has('iconv') - if !exists('s:codepage') - let s:codepage = libcallnr('kernel32.dll', 'GetACP', 0) - endif - return map(cmds, printf('iconv(v:val."\r", "%s", "cp%d")', &encoding, s:codepage)) - endif - return map(cmds, 'v:val."\r"') - endfunction - - function! s:batchfile(cmd) - let batchfile = s:plug_tempname().'.bat' - call writefile(s:wrap_cmds(a:cmd), batchfile) - let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 0}) - if s:is_powershell(&shell) - let cmd = '& ' . cmd - endif - return [batchfile, cmd] - endfunction -else - function! s:path(path) - return s:trim(a:path) - endfunction - - function! s:dirpath(path) - return substitute(a:path, '[/\\]*$', '/', '') - endfunction - - function! s:is_local_plug(repo) - return a:repo[0] =~ '[/$~]' - endfunction -endif - -function! s:err(msg) - echohl ErrorMsg - echom '[vim-plug] '.a:msg - echohl None -endfunction - -function! s:warn(cmd, msg) - echohl WarningMsg - execute a:cmd 'a:msg' - echohl None -endfunction - -function! s:esc(path) - return escape(a:path, ' ') -endfunction - -function! s:escrtp(path) - return escape(a:path, ' ,') -endfunction - -function! s:remove_rtp() - for name in s:loaded_names() - let rtp = s:rtp(g:plugs[name]) - execute 'set rtp-='.s:escrtp(rtp) - let after = globpath(rtp, 'after') - if isdirectory(after) - execute 'set rtp-='.s:escrtp(after) - endif - endfor -endfunction - -function! s:reorg_rtp() - if !empty(s:first_rtp) - execute 'set rtp-='.s:first_rtp - execute 'set rtp-='.s:last_rtp - endif - - " &rtp is modified from outside - if exists('s:prtp') && s:prtp !=# &rtp - call s:remove_rtp() - unlet! s:middle - endif - - let s:middle = get(s:, 'middle', &rtp) - let rtps = map(s:loaded_names(), 's:rtp(g:plugs[v:val])') - let afters = filter(map(copy(rtps), 'globpath(v:val, "after")'), '!empty(v:val)') - let rtp = join(map(rtps, 'escape(v:val, ",")'), ',') - \ . ','.s:middle.',' - \ . join(map(afters, 'escape(v:val, ",")'), ',') - let &rtp = substitute(substitute(rtp, ',,*', ',', 'g'), '^,\|,$', '', 'g') - let s:prtp = &rtp - - if !empty(s:first_rtp) - execute 'set rtp^='.s:first_rtp - execute 'set rtp+='.s:last_rtp - endif -endfunction - -function! s:doautocmd(...) - if exists('#'.join(a:000, '#')) - execute 'doautocmd' ((v:version > 703 || has('patch442')) ? '<nomodeline>' : '') join(a:000) - endif -endfunction - -function! s:dobufread(names) - for name in a:names - let path = s:rtp(g:plugs[name]) - for dir in ['ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin'] - if len(finddir(dir, path)) - if exists('#BufRead') - doautocmd BufRead - endif - return - endif - endfor - endfor -endfunction - -function! plug#load(...) - if a:0 == 0 - return s:err('Argument missing: plugin name(s) required') - endif - if !exists('g:plugs') - return s:err('plug#begin was not called') - endif - let names = a:0 == 1 && type(a:1) == s:TYPE.list ? a:1 : a:000 - let unknowns = filter(copy(names), '!has_key(g:plugs, v:val)') - if !empty(unknowns) - let s = len(unknowns) > 1 ? 's' : '' - return s:err(printf('Unknown plugin%s: %s', s, join(unknowns, ', '))) - end - let unloaded = filter(copy(names), '!get(s:loaded, v:val, 0)') - if !empty(unloaded) - for name in unloaded - call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - endfor - call s:dobufread(unloaded) - return 1 - end - return 0 -endfunction - -function! s:remove_triggers(name) - if !has_key(s:triggers, a:name) - return - endif - for cmd in s:triggers[a:name].cmd - execute 'silent! delc' cmd - endfor - for map in s:triggers[a:name].map - execute 'silent! unmap' map - execute 'silent! iunmap' map - endfor - call remove(s:triggers, a:name) -endfunction - -function! s:lod(names, types, ...) - for name in a:names - call s:remove_triggers(name) - let s:loaded[name] = 1 - endfor - call s:reorg_rtp() - - for name in a:names - let rtp = s:rtp(g:plugs[name]) - for dir in a:types - call s:source(rtp, dir.'/**/*.vim') - endfor - if a:0 - if !s:source(rtp, a:1) && !empty(s:glob(rtp, a:2)) - execute 'runtime' a:1 - endif - call s:source(rtp, a:2) - endif - call s:doautocmd('User', name) - endfor -endfunction - -function! s:lod_ft(pat, names) - let syn = 'syntax/'.a:pat.'.vim' - call s:lod(a:names, ['plugin', 'after/plugin'], syn, 'after/'.syn) - execute 'autocmd! PlugLOD FileType' a:pat - call s:doautocmd('filetypeplugin', 'FileType') - call s:doautocmd('filetypeindent', 'FileType') -endfunction - -function! s:lod_cmd(cmd, bang, l1, l2, args, names) - call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - call s:dobufread(a:names) - execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args) -endfunction - -function! s:lod_map(map, names, with_prefix, prefix) - call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - call s:dobufread(a:names) - let extra = '' - while 1 - let c = getchar(0) - if c == 0 - break - endif - let extra .= nr2char(c) - endwhile - - if a:with_prefix - let prefix = v:count ? v:count : '' - let prefix .= '"'.v:register.a:prefix - if mode(1) == 'no' - if v:operator == 'c' - let prefix = "\<esc>" . prefix - endif - let prefix .= v:operator - endif - call feedkeys(prefix, 'n') - endif - call feedkeys(substitute(a:map, '^<Plug>', "\<Plug>", '') . extra) -endfunction - -function! plug#(repo, ...) - if a:0 > 1 - return s:err('Invalid number of arguments (1..2)') - endif - - try - let repo = s:trim(a:repo) - let opts = a:0 == 1 ? s:parse_options(a:1) : s:base_spec - let name = get(opts, 'as', s:plug_fnamemodify(repo, ':t:s?\.git$??')) - let spec = extend(s:infer_properties(name, repo), opts) - if !has_key(g:plugs, name) - call add(g:plugs_order, name) - endif - let g:plugs[name] = spec - let s:loaded[name] = get(s:loaded, name, 0) - catch - return s:err(repo . ' ' . v:exception) - endtry -endfunction - -function! s:parse_options(arg) - let opts = copy(s:base_spec) - let type = type(a:arg) - let opt_errfmt = 'Invalid argument for "%s" option of :Plug (expected: %s)' - if type == s:TYPE.string - if empty(a:arg) - throw printf(opt_errfmt, 'tag', 'string') - endif - let opts.tag = a:arg - elseif type == s:TYPE.dict - for opt in ['branch', 'tag', 'commit', 'rtp', 'dir', 'as'] - if has_key(a:arg, opt) - \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt])) - throw printf(opt_errfmt, opt, 'string') - endif - endfor - for opt in ['on', 'for'] - if has_key(a:arg, opt) - \ && type(a:arg[opt]) != s:TYPE.list - \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt])) - throw printf(opt_errfmt, opt, 'string or list') - endif - endfor - if has_key(a:arg, 'do') - \ && type(a:arg.do) != s:TYPE.funcref - \ && (type(a:arg.do) != s:TYPE.string || empty(a:arg.do)) - throw printf(opt_errfmt, 'do', 'string or funcref') - endif - call extend(opts, a:arg) - if has_key(opts, 'dir') - let opts.dir = s:dirpath(s:plug_expand(opts.dir)) - endif - else - throw 'Invalid argument type (expected: string or dictionary)' - endif - return opts -endfunction - -function! s:infer_properties(name, repo) - let repo = a:repo - if s:is_local_plug(repo) - return { 'dir': s:dirpath(s:plug_expand(repo)) } - else - if repo =~ ':' - let uri = repo - else - if repo !~ '/' - throw printf('Invalid argument: %s (implicit `vim-scripts'' expansion is deprecated)', repo) - endif - let fmt = get(g:, 'plug_url_format', 'https://git::@github.com/%s.git') - let uri = printf(fmt, repo) - endif - return { 'dir': s:dirpath(g:plug_home.'/'.a:name), 'uri': uri } - endif -endfunction - -function! s:install(force, names) - call s:update_impl(0, a:force, a:names) -endfunction - -function! s:update(force, names) - call s:update_impl(1, a:force, a:names) -endfunction - -function! plug#helptags() - if !exists('g:plugs') - return s:err('plug#begin was not called') - endif - for spec in values(g:plugs) - let docd = join([s:rtp(spec), 'doc'], '/') - if isdirectory(docd) - silent! execute 'helptags' s:esc(docd) - endif - endfor - return 1 -endfunction - -function! s:syntax() - syntax clear - syntax region plug1 start=/\%1l/ end=/\%2l/ contains=plugNumber - syntax region plug2 start=/\%2l/ end=/\%3l/ contains=plugBracket,plugX - syn match plugNumber /[0-9]\+[0-9.]*/ contained - syn match plugBracket /[[\]]/ contained - syn match plugX /x/ contained - syn match plugDash /^-\{1}\ / - syn match plugPlus /^+/ - syn match plugStar /^*/ - syn match plugMessage /\(^- \)\@<=.*/ - syn match plugName /\(^- \)\@<=[^ ]*:/ - syn match plugSha /\%(: \)\@<=[0-9a-f]\{4,}$/ - syn match plugTag /(tag: [^)]\+)/ - syn match plugInstall /\(^+ \)\@<=[^:]*/ - syn match plugUpdate /\(^* \)\@<=[^:]*/ - syn match plugCommit /^ \X*[0-9a-f]\{7,9} .*/ contains=plugRelDate,plugEdge,plugTag - syn match plugEdge /^ \X\+$/ - syn match plugEdge /^ \X*/ contained nextgroup=plugSha - syn match plugSha /[0-9a-f]\{7,9}/ contained - syn match plugRelDate /([^)]*)$/ contained - syn match plugNotLoaded /(not loaded)$/ - syn match plugError /^x.*/ - syn region plugDeleted start=/^\~ .*/ end=/^\ze\S/ - syn match plugH2 /^.*:\n-\+$/ - syn match plugH2 /^-\{2,}/ - syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean - hi def link plug1 Title - hi def link plug2 Repeat - hi def link plugH2 Type - hi def link plugX Exception - hi def link plugBracket Structure - hi def link plugNumber Number - - hi def link plugDash Special - hi def link plugPlus Constant - hi def link plugStar Boolean - - hi def link plugMessage Function - hi def link plugName Label - hi def link plugInstall Function - hi def link plugUpdate Type - - hi def link plugError Error - hi def link plugDeleted Ignore - hi def link plugRelDate Comment - hi def link plugEdge PreProc - hi def link plugSha Identifier - hi def link plugTag Constant - - hi def link plugNotLoaded Comment -endfunction - -function! s:lpad(str, len) - return a:str . repeat(' ', a:len - len(a:str)) -endfunction - -function! s:lines(msg) - return split(a:msg, "[\r\n]") -endfunction - -function! s:lastline(msg) - return get(s:lines(a:msg), -1, '') -endfunction - -function! s:new_window() - execute get(g:, 'plug_window', 'vertical topleft new') -endfunction - -function! s:plug_window_exists() - let buflist = tabpagebuflist(s:plug_tab) - return !empty(buflist) && index(buflist, s:plug_buf) >= 0 -endfunction - -function! s:switch_in() - if !s:plug_window_exists() - return 0 - endif - - if winbufnr(0) != s:plug_buf - let s:pos = [tabpagenr(), winnr(), winsaveview()] - execute 'normal!' s:plug_tab.'gt' - let winnr = bufwinnr(s:plug_buf) - execute winnr.'wincmd w' - call add(s:pos, winsaveview()) - else - let s:pos = [winsaveview()] - endif - - setlocal modifiable - return 1 -endfunction - -function! s:switch_out(...) - call winrestview(s:pos[-1]) - setlocal nomodifiable - if a:0 > 0 - execute a:1 - endif - - if len(s:pos) > 1 - execute 'normal!' s:pos[0].'gt' - execute s:pos[1] 'wincmd w' - call winrestview(s:pos[2]) - endif -endfunction - -function! s:finish_bindings() - nnoremap <silent> <buffer> R :call <SID>retry()<cr> - nnoremap <silent> <buffer> D :PlugDiff<cr> - nnoremap <silent> <buffer> S :PlugStatus<cr> - nnoremap <silent> <buffer> U :call <SID>status_update()<cr> - xnoremap <silent> <buffer> U :call <SID>status_update()<cr> - nnoremap <silent> <buffer> ]] :silent! call <SID>section('')<cr> - nnoremap <silent> <buffer> [[ :silent! call <SID>section('b')<cr> -endfunction - -function! s:prepare(...) - if empty(s:plug_getcwd()) - throw 'Invalid current working directory. Cannot proceed.' - endif - - for evar in ['$GIT_DIR', '$GIT_WORK_TREE'] - if exists(evar) - throw evar.' detected. Cannot proceed.' - endif - endfor - - call s:job_abort() - if s:switch_in() - if b:plug_preview == 1 - pc - endif - enew - else - call s:new_window() - endif - - nnoremap <silent> <buffer> q :call <SID>close_pane()<cr> - if a:0 == 0 - call s:finish_bindings() - endif - let b:plug_preview = -1 - let s:plug_tab = tabpagenr() - let s:plug_buf = winbufnr(0) - call s:assign_name() - - for k in ['<cr>', 'L', 'o', 'X', 'd', 'dd'] - execute 'silent! unmap <buffer>' k - endfor - setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell - if exists('+colorcolumn') - setlocal colorcolumn= - endif - setf vim-plug - if exists('g:syntax_on') - call s:syntax() - endif -endfunction - -function! s:close_pane() - if b:plug_preview == 1 - pc - let b:plug_preview = -1 - else - bd - endif -endfunction - -function! s:assign_name() - " Assign buffer name - let prefix = '[Plugins]' - let name = prefix - let idx = 2 - while bufexists(name) - let name = printf('%s (%s)', prefix, idx) - let idx = idx + 1 - endwhile - silent! execute 'f' fnameescape(name) -endfunction - -function! s:chsh(swap) - let prev = [&shell, &shellcmdflag, &shellredir] - if !s:is_win - set shell=sh - endif - if a:swap - if s:is_powershell(&shell) - let &shellredir = '2>&1 | Out-File -Encoding UTF8 %s' - elseif &shell =~# 'sh' || &shell =~# 'cmd\(\.exe\)\?$' - set shellredir=>%s\ 2>&1 - endif - endif - return prev -endfunction - -function! s:bang(cmd, ...) - let batchfile = '' - try - let [sh, shellcmdflag, shrd] = s:chsh(a:0) - " FIXME: Escaping is incomplete. We could use shellescape with eval, - " but it won't work on Windows. - let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd - if s:is_win - let [batchfile, cmd] = s:batchfile(cmd) - endif - let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%') - execute "normal! :execute g:_plug_bang\<cr>\<cr>" - finally - unlet g:_plug_bang - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win && filereadable(batchfile) - call delete(batchfile) - endif - endtry - return v:shell_error ? 'Exit status: ' . v:shell_error : '' -endfunction - -function! s:regress_bar() - let bar = substitute(getline(2)[1:-2], '.*\zs=', 'x', '') - call s:progress_bar(2, bar, len(bar)) -endfunction - -function! s:is_updated(dir) - return !empty(s:system_chomp(['git', 'log', '--pretty=format:%h', 'HEAD...HEAD@{1}'], a:dir)) -endfunction - -function! s:do(pull, force, todo) - for [name, spec] in items(a:todo) - if !isdirectory(spec.dir) - continue - endif - let installed = has_key(s:update.new, name) - let updated = installed ? 0 : - \ (a:pull && index(s:update.errors, name) < 0 && s:is_updated(spec.dir)) - if a:force || installed || updated - execute 'cd' s:esc(spec.dir) - call append(3, '- Post-update hook for '. name .' ... ') - let error = '' - let type = type(spec.do) - if type == s:TYPE.string - if spec.do[0] == ':' - if !get(s:loaded, name, 0) - let s:loaded[name] = 1 - call s:reorg_rtp() - endif - call s:load_plugin(spec) - try - execute spec.do[1:] - catch - let error = v:exception - endtry - if !s:plug_window_exists() - cd - - throw 'Warning: vim-plug was terminated by the post-update hook of '.name - endif - else - let error = s:bang(spec.do) - endif - elseif type == s:TYPE.funcref - try - call s:load_plugin(spec) - let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged') - call spec.do({ 'name': name, 'status': status, 'force': a:force }) - catch - let error = v:exception - endtry - else - let error = 'Invalid hook type' - endif - call s:switch_in() - call setline(4, empty(error) ? (getline(4) . 'OK') - \ : ('x' . getline(4)[1:] . error)) - if !empty(error) - call add(s:update.errors, name) - call s:regress_bar() - endif - cd - - endif - endfor -endfunction - -function! s:hash_match(a, b) - return stridx(a:a, a:b) == 0 || stridx(a:b, a:a) == 0 -endfunction - -function! s:checkout(spec) - let sha = a:spec.commit - let output = s:git_revision(a:spec.dir) - if !empty(output) && !s:hash_match(sha, s:lines(output)[0]) - let credential_helper = s:git_version_requirement(2) ? '-c credential.helper= ' : '' - let output = s:system( - \ 'git '.credential_helper.'fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir) - endif - return output -endfunction - -function! s:finish(pull) - let new_frozen = len(filter(keys(s:update.new), 'g:plugs[v:val].frozen')) - if new_frozen - let s = new_frozen > 1 ? 's' : '' - call append(3, printf('- Installed %d frozen plugin%s', new_frozen, s)) - endif - call append(3, '- Finishing ... ') | 4 - redraw - call plug#helptags() - call plug#end() - call setline(4, getline(4) . 'Done!') - redraw - let msgs = [] - if !empty(s:update.errors) - call add(msgs, "Press 'R' to retry.") - endif - if a:pull && len(s:update.new) < len(filter(getline(5, '$'), - \ "v:val =~ '^- ' && v:val !~# 'Already up.to.date'")) - call add(msgs, "Press 'D' to see the updated changes.") - endif - echo join(msgs, ' ') - call s:finish_bindings() -endfunction - -function! s:retry() - if empty(s:update.errors) - return - endif - echo - call s:update_impl(s:update.pull, s:update.force, - \ extend(copy(s:update.errors), [s:update.threads])) -endfunction - -function! s:is_managed(name) - return has_key(g:plugs[a:name], 'uri') -endfunction - -function! s:names(...) - return sort(filter(keys(g:plugs), 'stridx(v:val, a:1) == 0 && s:is_managed(v:val)')) -endfunction - -function! s:check_ruby() - silent! ruby require 'thread'; VIM::command("let g:plug_ruby = '#{RUBY_VERSION}'") - if !exists('g:plug_ruby') - redraw! - return s:warn('echom', 'Warning: Ruby interface is broken') - endif - let ruby_version = split(g:plug_ruby, '\.') - unlet g:plug_ruby - return s:version_requirement(ruby_version, [1, 8, 7]) -endfunction - -function! s:update_impl(pull, force, args) abort - let sync = index(a:args, '--sync') >= 0 || has('vim_starting') - let args = filter(copy(a:args), 'v:val != "--sync"') - let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ? - \ remove(args, -1) : get(g:, 'plug_threads', 16) - - let managed = filter(copy(g:plugs), 's:is_managed(v:key)') - let todo = empty(args) ? filter(managed, '!v:val.frozen || !isdirectory(v:val.dir)') : - \ filter(managed, 'index(args, v:key) >= 0') - - if empty(todo) - return s:warn('echo', 'No plugin to '. (a:pull ? 'update' : 'install')) - endif - - if !s:is_win && s:git_version_requirement(2, 3) - let s:git_terminal_prompt = exists('$GIT_TERMINAL_PROMPT') ? $GIT_TERMINAL_PROMPT : '' - let $GIT_TERMINAL_PROMPT = 0 - for plug in values(todo) - let plug.uri = substitute(plug.uri, - \ '^https://git::@github\.com', 'https://github.com', '') - endfor - endif - - if !isdirectory(g:plug_home) - try - call mkdir(g:plug_home, 'p') - catch - return s:err(printf('Invalid plug directory: %s. '. - \ 'Try to call plug#begin with a valid directory', g:plug_home)) - endtry - endif - - if has('nvim') && !exists('*jobwait') && threads > 1 - call s:warn('echom', '[vim-plug] Update Neovim for parallel installer') - endif - - let use_job = s:nvim || s:vim8 - let python = (has('python') || has('python3')) && !use_job - let ruby = has('ruby') && !use_job && (v:version >= 703 || v:version == 702 && has('patch374')) && !(s:is_win && has('gui_running')) && threads > 1 && s:check_ruby() - - let s:update = { - \ 'start': reltime(), - \ 'all': todo, - \ 'todo': copy(todo), - \ 'errors': [], - \ 'pull': a:pull, - \ 'force': a:force, - \ 'new': {}, - \ 'threads': (python || ruby || use_job) ? min([len(todo), threads]) : 1, - \ 'bar': '', - \ 'fin': 0 - \ } - - call s:prepare(1) - call append(0, ['', '']) - normal! 2G - silent! redraw - - " Set remote name, overriding a possible user git config's clone.defaultRemoteName - let s:clone_opt = ['--origin', 'origin'] - if get(g:, 'plug_shallow', 1) - call extend(s:clone_opt, ['--depth', '1']) - if s:git_version_requirement(1, 7, 10) - call add(s:clone_opt, '--no-single-branch') - endif - endif - - if has('win32unix') || has('wsl') - call extend(s:clone_opt, ['-c', 'core.eol=lf', '-c', 'core.autocrlf=input']) - endif - - let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : '' - - " Python version requirement (>= 2.7) - if python && !has('python3') && !ruby && !use_job && s:update.threads > 1 - redir => pyv - silent python import platform; print platform.python_version() - redir END - let python = s:version_requirement( - \ map(split(split(pyv)[0], '\.'), 'str2nr(v:val)'), [2, 6]) - endif - - if (python || ruby) && s:update.threads > 1 - try - let imd = &imd - if s:mac_gui - set noimd - endif - if ruby - call s:update_ruby() - else - call s:update_python() - endif - catch - let lines = getline(4, '$') - let printed = {} - silent! 4,$d _ - for line in lines - let name = s:extract_name(line, '.', '') - if empty(name) || !has_key(printed, name) - call append('$', line) - if !empty(name) - let printed[name] = 1 - if line[0] == 'x' && index(s:update.errors, name) < 0 - call add(s:update.errors, name) - end - endif - endif - endfor - finally - let &imd = imd - call s:update_finish() - endtry - else - call s:update_vim() - while use_job && sync - sleep 100m - if s:update.fin - break - endif - endwhile - endif -endfunction - -function! s:log4(name, msg) - call setline(4, printf('- %s (%s)', a:msg, a:name)) - redraw -endfunction - -function! s:update_finish() - if exists('s:git_terminal_prompt') - let $GIT_TERMINAL_PROMPT = s:git_terminal_prompt - endif - if s:switch_in() - call append(3, '- Updating ...') | 4 - for [name, spec] in items(filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && (s:update.force || s:update.pull || has_key(s:update.new, v:key))')) - let [pos, _] = s:logpos(name) - if !pos - continue - endif - if has_key(spec, 'commit') - call s:log4(name, 'Checking out '.spec.commit) - let out = s:checkout(spec) - elseif has_key(spec, 'tag') - let tag = spec.tag - if tag =~ '\*' - let tags = s:lines(s:system('git tag --list '.plug#shellescape(tag).' --sort -version:refname 2>&1', spec.dir)) - if !v:shell_error && !empty(tags) - let tag = tags[0] - call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag)) - call append(3, '') - endif - endif - call s:log4(name, 'Checking out '.tag) - let out = s:system('git checkout -q '.plug#shellescape(tag).' -- 2>&1', spec.dir) - else - let branch = s:git_origin_branch(spec) - call s:log4(name, 'Merging origin/'.s:esc(branch)) - let out = s:system('git checkout -q '.plug#shellescape(branch).' -- 2>&1' - \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only '.plug#shellescape('origin/'.branch).' 2>&1')), spec.dir) - endif - if !v:shell_error && filereadable(spec.dir.'/.gitmodules') && - \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir)) - call s:log4(name, 'Updating submodules. This may take a while.') - let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir) - endif - let msg = s:format_message(v:shell_error ? 'x': '-', name, out) - if v:shell_error - call add(s:update.errors, name) - call s:regress_bar() - silent execute pos 'd _' - call append(4, msg) | 4 - elseif !empty(out) - call setline(pos, msg[0]) - endif - redraw - endfor - silent 4 d _ - try - call s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && has_key(v:val, "do")')) - catch - call s:warn('echom', v:exception) - call s:warn('echo', '') - return - endtry - call s:finish(s:update.pull) - call setline(1, 'Updated. Elapsed time: ' . split(reltimestr(reltime(s:update.start)))[0] . ' sec.') - call s:switch_out('normal! gg') - endif -endfunction - -function! s:job_abort() - if (!s:nvim && !s:vim8) || !exists('s:jobs') - return - endif - - for [name, j] in items(s:jobs) - if s:nvim - silent! call jobstop(j.jobid) - elseif s:vim8 - silent! call job_stop(j.jobid) - endif - if j.new - call s:rm_rf(g:plugs[name].dir) - endif - endfor - let s:jobs = {} -endfunction - -function! s:last_non_empty_line(lines) - let len = len(a:lines) - for idx in range(len) - let line = a:lines[len-idx-1] - if !empty(line) - return line - endif - endfor - return '' -endfunction - -function! s:job_out_cb(self, data) abort - let self = a:self - let data = remove(self.lines, -1) . a:data - let lines = map(split(data, "\n", 1), 'split(v:val, "\r", 1)[-1]') - call extend(self.lines, lines) - " To reduce the number of buffer updates - let self.tick = get(self, 'tick', -1) + 1 - if !self.running || self.tick % len(s:jobs) == 0 - let bullet = self.running ? (self.new ? '+' : '*') : (self.error ? 'x' : '-') - let result = self.error ? join(self.lines, "\n") : s:last_non_empty_line(self.lines) - call s:log(bullet, self.name, result) - endif -endfunction - -function! s:job_exit_cb(self, data) abort - let a:self.running = 0 - let a:self.error = a:data != 0 - call s:reap(a:self.name) - call s:tick() -endfunction - -function! s:job_cb(fn, job, ch, data) - if !s:plug_window_exists() " plug window closed - return s:job_abort() - endif - call call(a:fn, [a:job, a:data]) -endfunction - -function! s:nvim_cb(job_id, data, event) dict abort - return (a:event == 'stdout' || a:event == 'stderr') ? - \ s:job_cb('s:job_out_cb', self, 0, join(a:data, "\n")) : - \ s:job_cb('s:job_exit_cb', self, 0, a:data) -endfunction - -function! s:spawn(name, cmd, opts) - let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''], - \ 'new': get(a:opts, 'new', 0) } - let s:jobs[a:name] = job - - if s:nvim - if has_key(a:opts, 'dir') - let job.cwd = a:opts.dir - endif - let argv = a:cmd - call extend(job, { - \ 'on_stdout': function('s:nvim_cb'), - \ 'on_stderr': function('s:nvim_cb'), - \ 'on_exit': function('s:nvim_cb'), - \ }) - let jid = s:plug_call('jobstart', argv, job) - if jid > 0 - let job.jobid = jid - else - let job.running = 0 - let job.error = 1 - let job.lines = [jid < 0 ? argv[0].' is not executable' : - \ 'Invalid arguments (or job table is full)'] - endif - elseif s:vim8 - let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"script": 0})')) - if has_key(a:opts, 'dir') - let cmd = s:with_cd(cmd, a:opts.dir, 0) - endif - let argv = s:is_win ? ['cmd', '/s', '/c', '"'.cmd.'"'] : ['sh', '-c', cmd] - let jid = job_start(s:is_win ? join(argv, ' ') : argv, { - \ 'out_cb': function('s:job_cb', ['s:job_out_cb', job]), - \ 'err_cb': function('s:job_cb', ['s:job_out_cb', job]), - \ 'exit_cb': function('s:job_cb', ['s:job_exit_cb', job]), - \ 'err_mode': 'raw', - \ 'out_mode': 'raw' - \}) - if job_status(jid) == 'run' - let job.jobid = jid - else - let job.running = 0 - let job.error = 1 - let job.lines = ['Failed to start job'] - endif - else - let job.lines = s:lines(call('s:system', has_key(a:opts, 'dir') ? [a:cmd, a:opts.dir] : [a:cmd])) - let job.error = v:shell_error != 0 - let job.running = 0 - endif -endfunction - -function! s:reap(name) - let job = s:jobs[a:name] - if job.error - call add(s:update.errors, a:name) - elseif get(job, 'new', 0) - let s:update.new[a:name] = 1 - endif - let s:update.bar .= job.error ? 'x' : '=' - - let bullet = job.error ? 'x' : '-' - let result = job.error ? join(job.lines, "\n") : s:last_non_empty_line(job.lines) - call s:log(bullet, a:name, empty(result) ? 'OK' : result) - call s:bar() - - call remove(s:jobs, a:name) -endfunction - -function! s:bar() - if s:switch_in() - let total = len(s:update.all) - call setline(1, (s:update.pull ? 'Updating' : 'Installing'). - \ ' plugins ('.len(s:update.bar).'/'.total.')') - call s:progress_bar(2, s:update.bar, total) - call s:switch_out() - endif -endfunction - -function! s:logpos(name) - let max = line('$') - for i in range(4, max > 4 ? max : 4) - if getline(i) =~# '^[-+x*] '.a:name.':' - for j in range(i + 1, max > 5 ? max : 5) - if getline(j) !~ '^ ' - return [i, j - 1] - endif - endfor - return [i, i] - endif - endfor - return [0, 0] -endfunction - -function! s:log(bullet, name, lines) - if s:switch_in() - let [b, e] = s:logpos(a:name) - if b > 0 - silent execute printf('%d,%d d _', b, e) - if b > winheight('.') - let b = 4 - endif - else - let b = 4 - endif - " FIXME For some reason, nomodifiable is set after :d in vim8 - setlocal modifiable - call append(b - 1, s:format_message(a:bullet, a:name, a:lines)) - call s:switch_out() - endif -endfunction - -function! s:update_vim() - let s:jobs = {} - - call s:bar() - call s:tick() -endfunction - -function! s:tick() - let pull = s:update.pull - let prog = s:progress_opt(s:nvim || s:vim8) -while 1 " Without TCO, Vim stack is bound to explode - if empty(s:update.todo) - if empty(s:jobs) && !s:update.fin - call s:update_finish() - let s:update.fin = 1 - endif - return - endif - - let name = keys(s:update.todo)[0] - let spec = remove(s:update.todo, name) - let new = empty(globpath(spec.dir, '.git', 1)) - - call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...') - redraw - - let has_tag = has_key(spec, 'tag') - if !new - let [error, _] = s:git_validate(spec, 0) - if empty(error) - if pull - let cmd = s:git_version_requirement(2) ? ['git', '-c', 'credential.helper=', 'fetch'] : ['git', 'fetch'] - if has_tag && !empty(globpath(spec.dir, '.git/shallow')) - call extend(cmd, ['--depth', '99999999']) - endif - if !empty(prog) - call add(cmd, prog) - endif - call s:spawn(name, cmd, { 'dir': spec.dir }) - else - let s:jobs[name] = { 'running': 0, 'lines': ['Already installed'], 'error': 0 } - endif - else - let s:jobs[name] = { 'running': 0, 'lines': s:lines(error), 'error': 1 } - endif - else - let cmd = ['git', 'clone'] - if !has_tag - call extend(cmd, s:clone_opt) - endif - if !empty(prog) - call add(cmd, prog) - endif - call s:spawn(name, extend(cmd, [spec.uri, s:trim(spec.dir)]), { 'new': 1 }) - endif - - if !s:jobs[name].running - call s:reap(name) - endif - if len(s:jobs) >= s:update.threads - break - endif -endwhile -endfunction - -function! s:update_python() -let py_exe = has('python') ? 'python' : 'python3' -execute py_exe "<< EOF" -import datetime -import functools -import os -try: - import queue -except ImportError: - import Queue as queue -import random -import re -import shutil -import signal -import subprocess -import tempfile -import threading as thr -import time -import traceback -import vim - -G_NVIM = vim.eval("has('nvim')") == '1' -G_PULL = vim.eval('s:update.pull') == '1' -G_RETRIES = int(vim.eval('get(g:, "plug_retries", 2)')) + 1 -G_TIMEOUT = int(vim.eval('get(g:, "plug_timeout", 60)')) -G_CLONE_OPT = ' '.join(vim.eval('s:clone_opt')) -G_PROGRESS = vim.eval('s:progress_opt(1)') -G_LOG_PROB = 1.0 / int(vim.eval('s:update.threads')) -G_STOP = thr.Event() -G_IS_WIN = vim.eval('s:is_win') == '1' - -class PlugError(Exception): - def __init__(self, msg): - self.msg = msg -class CmdTimedOut(PlugError): - pass -class CmdFailed(PlugError): - pass -class InvalidURI(PlugError): - pass -class Action(object): - INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-'] - -class Buffer(object): - def __init__(self, lock, num_plugs, is_pull): - self.bar = '' - self.event = 'Updating' if is_pull else 'Installing' - self.lock = lock - self.maxy = int(vim.eval('winheight(".")')) - self.num_plugs = num_plugs - - def __where(self, name): - """ Find first line with name in current buffer. Return line num. """ - found, lnum = False, 0 - matcher = re.compile('^[-+x*] {0}:'.format(name)) - for line in vim.current.buffer: - if matcher.search(line) is not None: - found = True - break - lnum += 1 - - if not found: - lnum = -1 - return lnum - - def header(self): - curbuf = vim.current.buffer - curbuf[0] = self.event + ' plugins ({0}/{1})'.format(len(self.bar), self.num_plugs) - - num_spaces = self.num_plugs - len(self.bar) - curbuf[1] = '[{0}{1}]'.format(self.bar, num_spaces * ' ') - - with self.lock: - vim.command('normal! 2G') - vim.command('redraw') - - def write(self, action, name, lines): - first, rest = lines[0], lines[1:] - msg = ['{0} {1}{2}{3}'.format(action, name, ': ' if first else '', first)] - msg.extend([' ' + line for line in rest]) - - try: - if action == Action.ERROR: - self.bar += 'x' - vim.command("call add(s:update.errors, '{0}')".format(name)) - elif action == Action.DONE: - self.bar += '=' - - curbuf = vim.current.buffer - lnum = self.__where(name) - if lnum != -1: # Found matching line num - del curbuf[lnum] - if lnum > self.maxy and action in set([Action.INSTALL, Action.UPDATE]): - lnum = 3 - else: - lnum = 3 - curbuf.append(msg, lnum) - - self.header() - except vim.error: - pass - -class Command(object): - CD = 'cd /d' if G_IS_WIN else 'cd' - - def __init__(self, cmd, cmd_dir=None, timeout=60, cb=None, clean=None): - self.cmd = cmd - if cmd_dir: - self.cmd = '{0} {1} && {2}'.format(Command.CD, cmd_dir, self.cmd) - self.timeout = timeout - self.callback = cb if cb else (lambda msg: None) - self.clean = clean if clean else (lambda: None) - self.proc = None - - @property - def alive(self): - """ Returns true only if command still running. """ - return self.proc and self.proc.poll() is None - - def execute(self, ntries=3): - """ Execute the command with ntries if CmdTimedOut. - Returns the output of the command if no Exception. - """ - attempt, finished, limit = 0, False, self.timeout - - while not finished: - try: - attempt += 1 - result = self.try_command() - finished = True - return result - except CmdTimedOut: - if attempt != ntries: - self.notify_retry() - self.timeout += limit - else: - raise - - def notify_retry(self): - """ Retry required for command, notify user. """ - for count in range(3, 0, -1): - if G_STOP.is_set(): - raise KeyboardInterrupt - msg = 'Timeout. Will retry in {0} second{1} ...'.format( - count, 's' if count != 1 else '') - self.callback([msg]) - time.sleep(1) - self.callback(['Retrying ...']) - - def try_command(self): - """ Execute a cmd & poll for callback. Returns list of output. - Raises CmdFailed -> return code for Popen isn't 0 - Raises CmdTimedOut -> command exceeded timeout without new output - """ - first_line = True - - try: - tfile = tempfile.NamedTemporaryFile(mode='w+b') - preexec_fn = not G_IS_WIN and os.setsid or None - self.proc = subprocess.Popen(self.cmd, stdout=tfile, - stderr=subprocess.STDOUT, - stdin=subprocess.PIPE, shell=True, - preexec_fn=preexec_fn) - thrd = thr.Thread(target=(lambda proc: proc.wait()), args=(self.proc,)) - thrd.start() - - thread_not_started = True - while thread_not_started: - try: - thrd.join(0.1) - thread_not_started = False - except RuntimeError: - pass - - while self.alive: - if G_STOP.is_set(): - raise KeyboardInterrupt - - if first_line or random.random() < G_LOG_PROB: - first_line = False - line = '' if G_IS_WIN else nonblock_read(tfile.name) - if line: - self.callback([line]) - - time_diff = time.time() - os.path.getmtime(tfile.name) - if time_diff > self.timeout: - raise CmdTimedOut(['Timeout!']) - - thrd.join(0.5) - - tfile.seek(0) - result = [line.decode('utf-8', 'replace').rstrip() for line in tfile] - - if self.proc.returncode != 0: - raise CmdFailed([''] + result) - - return result - except: - self.terminate() - raise - - def terminate(self): - """ Terminate process and cleanup. """ - if self.alive: - if G_IS_WIN: - os.kill(self.proc.pid, signal.SIGINT) - else: - os.killpg(self.proc.pid, signal.SIGTERM) - self.clean() - -class Plugin(object): - def __init__(self, name, args, buf_q, lock): - self.name = name - self.args = args - self.buf_q = buf_q - self.lock = lock - self.tag = args.get('tag', 0) - - def manage(self): - try: - if os.path.exists(self.args['dir']): - self.update() - else: - self.install() - with self.lock: - thread_vim_command("let s:update.new['{0}'] = 1".format(self.name)) - except PlugError as exc: - self.write(Action.ERROR, self.name, exc.msg) - except KeyboardInterrupt: - G_STOP.set() - self.write(Action.ERROR, self.name, ['Interrupted!']) - except: - # Any exception except those above print stack trace - msg = 'Trace:\n{0}'.format(traceback.format_exc().rstrip()) - self.write(Action.ERROR, self.name, msg.split('\n')) - raise - - def install(self): - target = self.args['dir'] - if target[-1] == '\\': - target = target[0:-1] - - def clean(target): - def _clean(): - try: - shutil.rmtree(target) - except OSError: - pass - return _clean - - self.write(Action.INSTALL, self.name, ['Installing ...']) - callback = functools.partial(self.write, Action.INSTALL, self.name) - cmd = 'git clone {0} {1} {2} {3} 2>&1'.format( - '' if self.tag else G_CLONE_OPT, G_PROGRESS, self.args['uri'], - esc(target)) - com = Command(cmd, None, G_TIMEOUT, callback, clean(target)) - result = com.execute(G_RETRIES) - self.write(Action.DONE, self.name, result[-1:]) - - def repo_uri(self): - cmd = 'git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url' - command = Command(cmd, self.args['dir'], G_TIMEOUT,) - result = command.execute(G_RETRIES) - return result[-1] - - def update(self): - actual_uri = self.repo_uri() - expect_uri = self.args['uri'] - regex = re.compile(r'^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$') - ma = regex.match(actual_uri) - mb = regex.match(expect_uri) - if ma is None or mb is None or ma.groups() != mb.groups(): - msg = ['', - 'Invalid URI: {0}'.format(actual_uri), - 'Expected {0}'.format(expect_uri), - 'PlugClean required.'] - raise InvalidURI(msg) - - if G_PULL: - self.write(Action.UPDATE, self.name, ['Updating ...']) - callback = functools.partial(self.write, Action.UPDATE, self.name) - fetch_opt = '--depth 99999999' if self.tag and os.path.isfile(os.path.join(self.args['dir'], '.git/shallow')) else '' - cmd = 'git fetch {0} {1} 2>&1'.format(fetch_opt, G_PROGRESS) - com = Command(cmd, self.args['dir'], G_TIMEOUT, callback) - result = com.execute(G_RETRIES) - self.write(Action.DONE, self.name, result[-1:]) - else: - self.write(Action.DONE, self.name, ['Already installed']) - - def write(self, action, name, msg): - self.buf_q.put((action, name, msg)) - -class PlugThread(thr.Thread): - def __init__(self, tname, args): - super(PlugThread, self).__init__() - self.tname = tname - self.args = args - - def run(self): - thr.current_thread().name = self.tname - buf_q, work_q, lock = self.args - - try: - while not G_STOP.is_set(): - name, args = work_q.get_nowait() - plug = Plugin(name, args, buf_q, lock) - plug.manage() - work_q.task_done() - except queue.Empty: - pass - -class RefreshThread(thr.Thread): - def __init__(self, lock): - super(RefreshThread, self).__init__() - self.lock = lock - self.running = True - - def run(self): - while self.running: - with self.lock: - thread_vim_command('noautocmd normal! a') - time.sleep(0.33) - - def stop(self): - self.running = False - -if G_NVIM: - def thread_vim_command(cmd): - vim.session.threadsafe_call(lambda: vim.command(cmd)) -else: - def thread_vim_command(cmd): - vim.command(cmd) - -def esc(name): - return '"' + name.replace('"', '\"') + '"' - -def nonblock_read(fname): - """ Read a file with nonblock flag. Return the last line. """ - fread = os.open(fname, os.O_RDONLY | os.O_NONBLOCK) - buf = os.read(fread, 100000).decode('utf-8', 'replace') - os.close(fread) - - line = buf.rstrip('\r\n') - left = max(line.rfind('\r'), line.rfind('\n')) - if left != -1: - left += 1 - line = line[left:] - - return line - -def main(): - thr.current_thread().name = 'main' - nthreads = int(vim.eval('s:update.threads')) - plugs = vim.eval('s:update.todo') - mac_gui = vim.eval('s:mac_gui') == '1' - - lock = thr.Lock() - buf = Buffer(lock, len(plugs), G_PULL) - buf_q, work_q = queue.Queue(), queue.Queue() - for work in plugs.items(): - work_q.put(work) - - start_cnt = thr.active_count() - for num in range(nthreads): - tname = 'PlugT-{0:02}'.format(num) - thread = PlugThread(tname, (buf_q, work_q, lock)) - thread.start() - if mac_gui: - rthread = RefreshThread(lock) - rthread.start() - - while not buf_q.empty() or thr.active_count() != start_cnt: - try: - action, name, msg = buf_q.get(True, 0.25) - buf.write(action, name, ['OK'] if not msg else msg) - buf_q.task_done() - except queue.Empty: - pass - except KeyboardInterrupt: - G_STOP.set() - - if mac_gui: - rthread.stop() - rthread.join() - -main() -EOF -endfunction - -function! s:update_ruby() - ruby << EOF - module PlugStream - SEP = ["\r", "\n", nil] - def get_line - buffer = '' - loop do - char = readchar rescue return - if SEP.include? char.chr - buffer << $/ - break - else - buffer << char - end - end - buffer - end - end unless defined?(PlugStream) - - def esc arg - %["#{arg.gsub('"', '\"')}"] - end - - def killall pid - pids = [pid] - if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM - pids.each { |pid| Process.kill 'INT', pid.to_i rescue nil } - else - unless `which pgrep 2> /dev/null`.empty? - children = pids - until children.empty? - children = children.map { |pid| - `pgrep -P #{pid}`.lines.map { |l| l.chomp } - }.flatten - pids += children - end - end - pids.each { |pid| Process.kill 'TERM', pid.to_i rescue nil } - end - end - - def compare_git_uri a, b - regex = %r{^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$} - regex.match(a).to_a.drop(1) == regex.match(b).to_a.drop(1) - end - - require 'thread' - require 'fileutils' - require 'timeout' - running = true - iswin = VIM::evaluate('s:is_win').to_i == 1 - pull = VIM::evaluate('s:update.pull').to_i == 1 - base = VIM::evaluate('g:plug_home') - all = VIM::evaluate('s:update.todo') - limit = VIM::evaluate('get(g:, "plug_timeout", 60)') - tries = VIM::evaluate('get(g:, "plug_retries", 2)') + 1 - nthr = VIM::evaluate('s:update.threads').to_i - maxy = VIM::evaluate('winheight(".")').to_i - vim7 = VIM::evaluate('v:version').to_i <= 703 && RUBY_PLATFORM =~ /darwin/ - cd = iswin ? 'cd /d' : 'cd' - tot = VIM::evaluate('len(s:update.todo)') || 0 - bar = '' - skip = 'Already installed' - mtx = Mutex.new - take1 = proc { mtx.synchronize { running && all.shift } } - logh = proc { - cnt = bar.length - $curbuf[1] = "#{pull ? 'Updating' : 'Installing'} plugins (#{cnt}/#{tot})" - $curbuf[2] = '[' + bar.ljust(tot) + ']' - VIM::command('normal! 2G') - VIM::command('redraw') - } - where = proc { |name| (1..($curbuf.length)).find { |l| $curbuf[l] =~ /^[-+x*] #{name}:/ } } - log = proc { |name, result, type| - mtx.synchronize do - ing = ![true, false].include?(type) - bar += type ? '=' : 'x' unless ing - b = case type - when :install then '+' when :update then '*' - when true, nil then '-' else - VIM::command("call add(s:update.errors, '#{name}')") - 'x' - end - result = - if type || type.nil? - ["#{b} #{name}: #{result.lines.to_a.last || 'OK'}"] - elsif result =~ /^Interrupted|^Timeout/ - ["#{b} #{name}: #{result}"] - else - ["#{b} #{name}"] + result.lines.map { |l| " " << l } - end - if lnum = where.call(name) - $curbuf.delete lnum - lnum = 4 if ing && lnum > maxy - end - result.each_with_index do |line, offset| - $curbuf.append((lnum || 4) - 1 + offset, line.gsub(/\e\[./, '').chomp) - end - logh.call - end - } - bt = proc { |cmd, name, type, cleanup| - tried = timeout = 0 - begin - tried += 1 - timeout += limit - fd = nil - data = '' - if iswin - Timeout::timeout(timeout) do - tmp = VIM::evaluate('tempname()') - system("(#{cmd}) > #{tmp}") - data = File.read(tmp).chomp - File.unlink tmp rescue nil - end - else - fd = IO.popen(cmd).extend(PlugStream) - first_line = true - log_prob = 1.0 / nthr - while line = Timeout::timeout(timeout) { fd.get_line } - data << line - log.call name, line.chomp, type if name && (first_line || rand < log_prob) - first_line = false - end - fd.close - end - [$? == 0, data.chomp] - rescue Timeout::Error, Interrupt => e - if fd && !fd.closed? - killall fd.pid - fd.close - end - cleanup.call if cleanup - if e.is_a?(Timeout::Error) && tried < tries - 3.downto(1) do |countdown| - s = countdown > 1 ? 's' : '' - log.call name, "Timeout. Will retry in #{countdown} second#{s} ...", type - sleep 1 - end - log.call name, 'Retrying ...', type - retry - end - [false, e.is_a?(Interrupt) ? "Interrupted!" : "Timeout!"] - end - } - main = Thread.current - threads = [] - watcher = Thread.new { - if vim7 - while VIM::evaluate('getchar(1)') - sleep 0.1 - end - else - require 'io/console' # >= Ruby 1.9 - nil until IO.console.getch == 3.chr - end - mtx.synchronize do - running = false - threads.each { |t| t.raise Interrupt } unless vim7 - end - threads.each { |t| t.join rescue nil } - main.kill - } - refresh = Thread.new { - while true - mtx.synchronize do - break unless running - VIM::command('noautocmd normal! a') - end - sleep 0.2 - end - } if VIM::evaluate('s:mac_gui') == 1 - - clone_opt = VIM::evaluate('s:clone_opt').join(' ') - progress = VIM::evaluate('s:progress_opt(1)') - nthr.times do - mtx.synchronize do - threads << Thread.new { - while pair = take1.call - name = pair.first - dir, uri, tag = pair.last.values_at *%w[dir uri tag] - exists = File.directory? dir - ok, result = - if exists - chdir = "#{cd} #{iswin ? dir : esc(dir)}" - ret, data = bt.call "#{chdir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url", nil, nil, nil - current_uri = data.lines.to_a.last - if !ret - if data =~ /^Interrupted|^Timeout/ - [false, data] - else - [false, [data.chomp, "PlugClean required."].join($/)] - end - elsif !compare_git_uri(current_uri, uri) - [false, ["Invalid URI: #{current_uri}", - "Expected: #{uri}", - "PlugClean required."].join($/)] - else - if pull - log.call name, 'Updating ...', :update - fetch_opt = (tag && File.exist?(File.join(dir, '.git/shallow'))) ? '--depth 99999999' : '' - bt.call "#{chdir} && git fetch #{fetch_opt} #{progress} 2>&1", name, :update, nil - else - [true, skip] - end - end - else - d = esc dir.sub(%r{[\\/]+$}, '') - log.call name, 'Installing ...', :install - bt.call "git clone #{clone_opt unless tag} #{progress} #{uri} #{d} 2>&1", name, :install, proc { - FileUtils.rm_rf dir - } - end - mtx.synchronize { VIM::command("let s:update.new['#{name}'] = 1") } if !exists && ok - log.call name, result, ok - end - } if running - end - end - threads.each { |t| t.join rescue nil } - logh.call - refresh.kill if refresh - watcher.kill -EOF -endfunction - -function! s:shellesc_cmd(arg, script) - let escaped = substitute('"'.a:arg.'"', '[&|<>()@^!"]', '^&', 'g') - return substitute(escaped, '%', (a:script ? '%' : '^') . '&', 'g') -endfunction - -function! s:shellesc_ps1(arg) - return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'" -endfunction - -function! s:shellesc_sh(arg) - return "'".substitute(a:arg, "'", "'\\\\''", 'g')."'" -endfunction - -" Escape the shell argument based on the shell. -" Vim and Neovim's shellescape() are insufficient. -" 1. shellslash determines whether to use single/double quotes. -" Double-quote escaping is fragile for cmd.exe. -" 2. It does not work for powershell. -" 3. It does not work for *sh shells if the command is executed -" via cmd.exe (ie. cmd.exe /c sh -c command command_args) -" 4. It does not support batchfile syntax. -" -" Accepts an optional dictionary with the following keys: -" - shell: same as Vim/Neovim 'shell' option. -" If unset, fallback to 'cmd.exe' on Windows or 'sh'. -" - script: If truthy and shell is cmd.exe, escape for batchfile syntax. -function! plug#shellescape(arg, ...) - if a:arg =~# '^[A-Za-z0-9_/:.-]\+$' - return a:arg - endif - let opts = a:0 > 0 && type(a:1) == s:TYPE.dict ? a:1 : {} - let shell = get(opts, 'shell', s:is_win ? 'cmd.exe' : 'sh') - let script = get(opts, 'script', 1) - if shell =~# 'cmd\(\.exe\)\?$' - return s:shellesc_cmd(a:arg, script) - elseif s:is_powershell(shell) - return s:shellesc_ps1(a:arg) - endif - return s:shellesc_sh(a:arg) -endfunction - -function! s:glob_dir(path) - return map(filter(s:glob(a:path, '**'), 'isdirectory(v:val)'), 's:dirpath(v:val)') -endfunction - -function! s:progress_bar(line, bar, total) - call setline(a:line, '[' . s:lpad(a:bar, a:total) . ']') -endfunction - -function! s:compare_git_uri(a, b) - " See `git help clone' - " https:// [user@] github.com[:port] / junegunn/vim-plug [.git] - " [git@] github.com[:port] : junegunn/vim-plug [.git] - " file:// / junegunn/vim-plug [/] - " / junegunn/vim-plug [/] - let pat = '^\%(\w\+://\)\='.'\%([^@/]*@\)\='.'\([^:/]*\%(:[0-9]*\)\=\)'.'[:/]'.'\(.\{-}\)'.'\%(\.git\)\=/\?$' - let ma = matchlist(a:a, pat) - let mb = matchlist(a:b, pat) - return ma[1:2] ==# mb[1:2] -endfunction - -function! s:format_message(bullet, name, message) - if a:bullet != 'x' - return [printf('%s %s: %s', a:bullet, a:name, s:lastline(a:message))] - else - let lines = map(s:lines(a:message), '" ".v:val') - return extend([printf('x %s:', a:name)], lines) - endif -endfunction - -function! s:with_cd(cmd, dir, ...) - let script = a:0 > 0 ? a:1 : 1 - return printf('cd%s %s && %s', s:is_win ? ' /d' : '', plug#shellescape(a:dir, {'script': script}), a:cmd) -endfunction - -function! s:system(cmd, ...) - let batchfile = '' - try - let [sh, shellcmdflag, shrd] = s:chsh(1) - if type(a:cmd) == s:TYPE.list - " Neovim's system() supports list argument to bypass the shell - " but it cannot set the working directory for the command. - " Assume that the command does not rely on the shell. - if has('nvim') && a:0 == 0 - return system(a:cmd) - endif - let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"shell": &shell, "script": 0})')) - if s:is_powershell(&shell) - let cmd = '& ' . cmd - endif - else - let cmd = a:cmd - endif - if a:0 > 0 - let cmd = s:with_cd(cmd, a:1, type(a:cmd) != s:TYPE.list) - endif - if s:is_win && type(a:cmd) != s:TYPE.list - let [batchfile, cmd] = s:batchfile(cmd) - endif - return system(cmd) - finally - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win && filereadable(batchfile) - call delete(batchfile) - endif - endtry -endfunction - -function! s:system_chomp(...) - let ret = call('s:system', a:000) - return v:shell_error ? '' : substitute(ret, '\n$', '', '') -endfunction - -function! s:git_validate(spec, check_branch) - let err = '' - if isdirectory(a:spec.dir) - let result = [s:git_local_branch(a:spec.dir), s:git_origin_url(a:spec.dir)] - let remote = result[-1] - if empty(remote) - let err = join([remote, 'PlugClean required.'], "\n") - elseif !s:compare_git_uri(remote, a:spec.uri) - let err = join(['Invalid URI: '.remote, - \ 'Expected: '.a:spec.uri, - \ 'PlugClean required.'], "\n") - elseif a:check_branch && has_key(a:spec, 'commit') - let sha = s:git_revision(a:spec.dir) - if empty(sha) - let err = join(add(result, 'PlugClean required.'), "\n") - elseif !s:hash_match(sha, a:spec.commit) - let err = join([printf('Invalid HEAD (expected: %s, actual: %s)', - \ a:spec.commit[:6], sha[:6]), - \ 'PlugUpdate required.'], "\n") - endif - elseif a:check_branch - let current_branch = result[0] - " Check tag - let origin_branch = s:git_origin_branch(a:spec) - if has_key(a:spec, 'tag') - let tag = s:system_chomp('git describe --exact-match --tags HEAD 2>&1', a:spec.dir) - if a:spec.tag !=# tag && a:spec.tag !~ '\*' - let err = printf('Invalid tag: %s (expected: %s). Try PlugUpdate.', - \ (empty(tag) ? 'N/A' : tag), a:spec.tag) - endif - " Check branch - elseif origin_branch !=# current_branch - let err = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.', - \ current_branch, origin_branch) - endif - if empty(err) - let [ahead, behind] = split(s:lastline(s:system([ - \ 'git', 'rev-list', '--count', '--left-right', - \ printf('HEAD...origin/%s', origin_branch) - \ ], a:spec.dir)), '\t') - if !v:shell_error && ahead - if behind - " Only mention PlugClean if diverged, otherwise it's likely to be - " pushable (and probably not that messed up). - let err = printf( - \ "Diverged from origin/%s (%d commit(s) ahead and %d commit(s) behind!\n" - \ .'Backup local changes and run PlugClean and PlugUpdate to reinstall it.', origin_branch, ahead, behind) - else - let err = printf("Ahead of origin/%s by %d commit(s).\n" - \ .'Cannot update until local changes are pushed.', - \ origin_branch, ahead) - endif - endif - endif - endif - else - let err = 'Not found' - endif - return [err, err =~# 'PlugClean'] -endfunction - -function! s:rm_rf(dir) - if isdirectory(a:dir) - return s:system(s:is_win - \ ? 'rmdir /S /Q '.plug#shellescape(a:dir) - \ : ['rm', '-rf', a:dir]) - endif -endfunction - -function! s:clean(force) - call s:prepare() - call append(0, 'Searching for invalid plugins in '.g:plug_home) - call append(1, '') - - " List of valid directories - let dirs = [] - let errs = {} - let [cnt, total] = [0, len(g:plugs)] - for [name, spec] in items(g:plugs) - if !s:is_managed(name) - call add(dirs, spec.dir) - else - let [err, clean] = s:git_validate(spec, 1) - if clean - let errs[spec.dir] = s:lines(err)[0] - else - call add(dirs, spec.dir) - endif - endif - let cnt += 1 - call s:progress_bar(2, repeat('=', cnt), total) - normal! 2G - redraw - endfor - - let allowed = {} - for dir in dirs - let allowed[s:dirpath(s:plug_fnamemodify(dir, ':h:h'))] = 1 - let allowed[dir] = 1 - for child in s:glob_dir(dir) - let allowed[child] = 1 - endfor - endfor - - let todo = [] - let found = sort(s:glob_dir(g:plug_home)) - while !empty(found) - let f = remove(found, 0) - if !has_key(allowed, f) && isdirectory(f) - call add(todo, f) - call append(line('$'), '- ' . f) - if has_key(errs, f) - call append(line('$'), ' ' . errs[f]) - endif - let found = filter(found, 'stridx(v:val, f) != 0') - end - endwhile - - 4 - redraw - if empty(todo) - call append(line('$'), 'Already clean.') - else - let s:clean_count = 0 - call append(3, ['Directories to delete:', '']) - redraw! - if a:force || s:ask_no_interrupt('Delete all directories?') - call s:delete([6, line('$')], 1) - else - call setline(4, 'Cancelled.') - nnoremap <silent> <buffer> d :set opfunc=<sid>delete_op<cr>g@ - nmap <silent> <buffer> dd d_ - xnoremap <silent> <buffer> d :<c-u>call <sid>delete_op(visualmode(), 1)<cr> - echo 'Delete the lines (d{motion}) to delete the corresponding directories' - endif - endif - 4 - setlocal nomodifiable -endfunction - -function! s:delete_op(type, ...) - call s:delete(a:0 ? [line("'<"), line("'>")] : [line("'["), line("']")], 0) -endfunction - -function! s:delete(range, force) - let [l1, l2] = a:range - let force = a:force - let err_count = 0 - while l1 <= l2 - let line = getline(l1) - if line =~ '^- ' && isdirectory(line[2:]) - execute l1 - redraw! - let answer = force ? 1 : s:ask('Delete '.line[2:].'?', 1) - let force = force || answer > 1 - if answer - let err = s:rm_rf(line[2:]) - setlocal modifiable - if empty(err) - call setline(l1, '~'.line[1:]) - let s:clean_count += 1 - else - delete _ - call append(l1 - 1, s:format_message('x', line[1:], err)) - let l2 += len(s:lines(err)) - let err_count += 1 - endif - let msg = printf('Removed %d directories.', s:clean_count) - if err_count > 0 - let msg .= printf(' Failed to remove %d directories.', err_count) - endif - call setline(4, msg) - setlocal nomodifiable - endif - endif - let l1 += 1 - endwhile -endfunction - -function! s:upgrade() - echo 'Downloading the latest version of vim-plug' - redraw - let tmp = s:plug_tempname() - let new = tmp . '/plug.vim' - - try - let out = s:system(['git', 'clone', '--depth', '1', s:plug_src, tmp]) - if v:shell_error - return s:err('Error upgrading vim-plug: '. out) - endif - - if readfile(s:me) ==# readfile(new) - echo 'vim-plug is already up-to-date' - return 0 - else - call rename(s:me, s:me . '.old') - call rename(new, s:me) - unlet g:loaded_plug - echo 'vim-plug has been upgraded' - return 1 - endif - finally - silent! call s:rm_rf(tmp) - endtry -endfunction - -function! s:upgrade_specs() - for spec in values(g:plugs) - let spec.frozen = get(spec, 'frozen', 0) - endfor -endfunction - -function! s:status() - call s:prepare() - call append(0, 'Checking plugins') - call append(1, '') - - let ecnt = 0 - let unloaded = 0 - let [cnt, total] = [0, len(g:plugs)] - for [name, spec] in items(g:plugs) - let is_dir = isdirectory(spec.dir) - if has_key(spec, 'uri') - if is_dir - let [err, _] = s:git_validate(spec, 1) - let [valid, msg] = [empty(err), empty(err) ? 'OK' : err] - else - let [valid, msg] = [0, 'Not found. Try PlugInstall.'] - endif - else - if is_dir - let [valid, msg] = [1, 'OK'] - else - let [valid, msg] = [0, 'Not found.'] - endif - endif - let cnt += 1 - let ecnt += !valid - " `s:loaded` entry can be missing if PlugUpgraded - if is_dir && get(s:loaded, name, -1) == 0 - let unloaded = 1 - let msg .= ' (not loaded)' - endif - call s:progress_bar(2, repeat('=', cnt), total) - call append(3, s:format_message(valid ? '-' : 'x', name, msg)) - normal! 2G - redraw - endfor - call setline(1, 'Finished. '.ecnt.' error(s).') - normal! gg - setlocal nomodifiable - if unloaded - echo "Press 'L' on each line to load plugin, or 'U' to update" - nnoremap <silent> <buffer> L :call <SID>status_load(line('.'))<cr> - xnoremap <silent> <buffer> L :call <SID>status_load(line('.'))<cr> - end -endfunction - -function! s:extract_name(str, prefix, suffix) - return matchstr(a:str, '^'.a:prefix.' \zs[^:]\+\ze:.*'.a:suffix.'$') -endfunction - -function! s:status_load(lnum) - let line = getline(a:lnum) - let name = s:extract_name(line, '-', '(not loaded)') - if !empty(name) - call plug#load(name) - setlocal modifiable - call setline(a:lnum, substitute(line, ' (not loaded)$', '', '')) - setlocal nomodifiable - endif -endfunction - -function! s:status_update() range - let lines = getline(a:firstline, a:lastline) - let names = filter(map(lines, 's:extract_name(v:val, "[x-]", "")'), '!empty(v:val)') - if !empty(names) - echo - execute 'PlugUpdate' join(names) - endif -endfunction - -function! s:is_preview_window_open() - silent! wincmd P - if &previewwindow - wincmd p - return 1 - endif -endfunction - -function! s:find_name(lnum) - for lnum in reverse(range(1, a:lnum)) - let line = getline(lnum) - if empty(line) - return '' - endif - let name = s:extract_name(line, '-', '') - if !empty(name) - return name - endif - endfor - return '' -endfunction - -function! s:preview_commit() - if b:plug_preview < 0 - let b:plug_preview = !s:is_preview_window_open() - endif - - let sha = matchstr(getline('.'), '^ \X*\zs[0-9a-f]\{7,9}') - if empty(sha) - return - endif - - let name = s:find_name(line('.')) - if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir) - return - endif - - if exists('g:plug_pwindow') && !s:is_preview_window_open() - execute g:plug_pwindow - execute 'e' sha - else - execute 'pedit' sha - wincmd P - endif - setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable - let batchfile = '' - try - let [sh, shellcmdflag, shrd] = s:chsh(1) - let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha - if s:is_win - let [batchfile, cmd] = s:batchfile(cmd) - endif - execute 'silent %!' cmd - finally - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win && filereadable(batchfile) - call delete(batchfile) - endif - endtry - setlocal nomodifiable - nnoremap <silent> <buffer> q :q<cr> - wincmd p -endfunction - -function! s:section(flags) - call search('\(^[x-] \)\@<=[^:]\+:', a:flags) -endfunction - -function! s:format_git_log(line) - let indent = ' ' - let tokens = split(a:line, nr2char(1)) - if len(tokens) != 5 - return indent.substitute(a:line, '\s*$', '', '') - endif - let [graph, sha, refs, subject, date] = tokens - let tag = matchstr(refs, 'tag: [^,)]\+') - let tag = empty(tag) ? ' ' : ' ('.tag.') ' - return printf('%s%s%s%s%s (%s)', indent, graph, sha, tag, subject, date) -endfunction - -function! s:append_ul(lnum, text) - call append(a:lnum, ['', a:text, repeat('-', len(a:text))]) -endfunction - -function! s:diff() - call s:prepare() - call append(0, ['Collecting changes ...', '']) - let cnts = [0, 0] - let bar = '' - let total = filter(copy(g:plugs), 's:is_managed(v:key) && isdirectory(v:val.dir)') - call s:progress_bar(2, bar, len(total)) - for origin in [1, 0] - let plugs = reverse(sort(items(filter(copy(total), (origin ? '' : '!').'(has_key(v:val, "commit") || has_key(v:val, "tag"))')))) - if empty(plugs) - continue - endif - call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:') - for [k, v] in plugs - let branch = s:git_origin_branch(v) - if len(branch) - let range = origin ? '..origin/'.branch : 'HEAD@{1}..' - let cmd = ['git', 'log', '--graph', '--color=never'] - if s:git_version_requirement(2, 10, 0) - call add(cmd, '--no-show-signature') - endif - call extend(cmd, ['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range]) - if has_key(v, 'rtp') - call extend(cmd, ['--', v.rtp]) - endif - let diff = s:system_chomp(cmd, v.dir) - if !empty(diff) - let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : '' - call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)'))) - let cnts[origin] += 1 - endif - endif - let bar .= '=' - call s:progress_bar(2, bar, len(total)) - normal! 2G - redraw - endfor - if !cnts[origin] - call append(5, ['', 'N/A']) - endif - endfor - call setline(1, printf('%d plugin(s) updated.', cnts[0]) - \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : '')) - - if cnts[0] || cnts[1] - nnoremap <silent> <buffer> <plug>(plug-preview) :silent! call <SID>preview_commit()<cr> - if empty(maparg("\<cr>", 'n')) - nmap <buffer> <cr> <plug>(plug-preview) - endif - if empty(maparg('o', 'n')) - nmap <buffer> o <plug>(plug-preview) - endif - endif - if cnts[0] - nnoremap <silent> <buffer> X :call <SID>revert()<cr> - echo "Press 'X' on each block to revert the update" - endif - normal! gg - setlocal nomodifiable -endfunction - -function! s:revert() - if search('^Pending updates', 'bnW') - return - endif - - let name = s:find_name(line('.')) - if empty(name) || !has_key(g:plugs, name) || - \ input(printf('Revert the update of %s? (y/N) ', name)) !~? '^y' - return - endif - - call s:system('git reset --hard HEAD@{1} && git checkout '.plug#shellescape(g:plugs[name].branch).' --', g:plugs[name].dir) - setlocal modifiable - normal! "_dap - setlocal nomodifiable - echo 'Reverted' -endfunction - -function! s:snapshot(force, ...) abort - call s:prepare() - setf vim - call append(0, ['" Generated by vim-plug', - \ '" '.strftime("%c"), - \ '" :source this file in vim to restore the snapshot', - \ '" or execute: vim -S snapshot.vim', - \ '', '', 'PlugUpdate!']) - 1 - let anchor = line('$') - 3 - let names = sort(keys(filter(copy(g:plugs), - \'has_key(v:val, "uri") && !has_key(v:val, "commit") && isdirectory(v:val.dir)'))) - for name in reverse(names) - let sha = s:git_revision(g:plugs[name].dir) - if !empty(sha) - call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha)) - redraw - endif - endfor - - if a:0 > 0 - let fn = s:plug_expand(a:1) - if filereadable(fn) && !(a:force || s:ask(a:1.' already exists. Overwrite?')) - return - endif - call writefile(getline(1, '$'), fn) - echo 'Saved as '.a:1 - silent execute 'e' s:esc(fn) - setf vim - endif -endfunction - -function! s:split_rtp() - return split(&rtp, '\\\@<!,') -endfunction - -let s:first_rtp = s:escrtp(get(s:split_rtp(), 0, '')) -let s:last_rtp = s:escrtp(get(s:split_rtp(), -1, '')) - -if exists('g:plugs') - let g:plugs_order = get(g:, 'plugs_order', keys(g:plugs)) - call s:upgrade_specs() - call s:define_commands() -endif - -let &cpo = s:cpo_save -unlet s:cpo_save @@ -1,93 +1,25 @@ -# Mitch's scripts, utilities, and configuration +# dotfiles and misc configuration -I copy this down to my personal machines. +## Usage -Things of interest: +`./install.sh` For the basics. - * shell configuration ( See more information below ) - * tmux configuration ( see more info below ) - * tmux helper script ( For load average, uptime and memory in the status bar ) - * basic configuration ( For if you don't want the custom status bar ) - * [`scripts/key-check.sh`](../tree/scripts/key-check.sh) Quick little script / - one liner to dump a SSH key to the terminal in red. Nice for people who are - new to SSH Keys - * Snapshot scripts. Snapshots your entire OS see below for more details. - * A basic vim configuration ( also see [`vim-cfg`](https://git.riedstra.dev/mitch/vim-cfg/about) ) - * A handful of build scripts with my options for some open source projects such as Vim +### Key remappings ( Linux specific ) -## Snapshot Scripts +`./remap.sh` -These alter the fstab in the snapshot so you can boot to it just by changing kernel boot parameters +### Distro specific -[`scripts/snap-btrfs.sh`](`../tree/scripts/snap-btrfs.sh`) -Automatically snapshot a btrfs root filesystem assuming you're using a -subvolume and the base FS is mounted in `/ROOT` +`sudo sh ./distro/<distro>.sh` -[`scripts/snap-lvm.sh`](`../tree/scripts/snap-lvm.sh`) +## Installing ssh keys -Same as above, except it doesn't keep RO snapshots around, and doesn't remove -old ones. Requires LVM but the underlying FS doesn't matter ( `ext4`, `xfs`, -etc ) +``` +umask 077 +mkdir ~/.ssh +curl https://git.riedstra.dev/mitch/dotfiles/plain/ssh > ~/.ssh/authorized_keys +``` -## `bin` directory / desktop utilities - - * `snipmenu`, a small [dmenu](https://dmenu.suckless.org) script for pasting - snippets from the `snips` directory. - * `status-bar` a *very* messy script for a `dwm` status - * `vol` small script to adjust pulseaudio volume on linux - * `day`/`night` scripts for turning off/on `redshift` - * `wallpaper` small script to continuously adjust the wallpaper, useful - for when your screen resolution changes - * `backlight` directly adjust the backlight on Linux systems - * `ddmenu` dmenu for demenus. Dmenu script that launches other dmenu scripts. - -## Shell Configuration - -`kshrc` - -Specifically targets ksh which has been my default shell for quite a long time -now. Though I do test it against `bash` and `ash` occasionally as well. - -Some useful features are: - - * Aliases - * `ll`, `lt`, `g` for `grep`, `j` for `jobs`, `p` for `pwd`, etc. - * `ls -F` by default - * Aliases for `apt`, `yum`, `pacman`, etc to use `sudo` by default. - * Utilize `doas` as `sudo` if installed, for instance on OpenBSD. - * Utils - * `set_go` can be called in `~/.kshrc.local` or similar to add the - `GOROOT` and `GOPATH` `bin`'s to your `PATH`. - * Aggressively set the editor based off of a list in order of ascending preference. ( `set_editor` ) - * `set_pager` same thing, except for your pager. - * `debugstarttls` Useful to debug starttls. - * `randmacgen` generate a random mac address. - * `ipv6_local_hosts <interface>` Returns the IPs of local nodes by using the IPv6 all nodes multicast ping. - * `set_nocaps` Eliminates capslock, makes it another control key. Makes the - numberpad act like it does on Windows. `alt+space` switches between US - and DE layouts. - * `setperms <directory_octal>:<file_octal> <paths>...` Sets file and - directory modes separately and recursively across the paths - * `set_title <title>` Sets the title of the terminal to the first argument - * `timestamp`: `date +%m.%d.%y_%H.%M.%S` - * `checkSSHAgent` Checks to see if there's a running SSH agent, if not it - starts one and writes a configuration file. - * `passenv` runs `pass` and sources the output into the shell - * `_tmux_servers`, `_tmux_servers_split_commands`, `_tmux_dev`, - `_tmux_session` Utilities for building tmux development environments. - * Colors - * Automatically assume that anything `xterm*` or `screen*` is a 256 color terminal - * Colored `ls` by default. - * Colored man pages - * Update<br /> - This provides utilities that allow for easy updating of configuration files. - The most useful ones are as follows - * `updatevimrc` Installs [my full vim configuration](https://git.riedstra.dev/mitch/vim-cfg/about) - * `updatevimrc_basic` Installs the `.vimrc` file which is a basic but useful vim configuration. - * `updatetmuxconf` Pulls in the tmux configuration from this repository. - * `updateshell` Pulls the latest version of `kshrc` from this repository. - * `pullkeys_github <github_username>` Creates the `~/.ssh/authorized_keys` - file with the SSH keys for a given github username - * `updategitconf <name>` Creates `~/.gitconfig` with the file from - `gitconfig/<name>` +## Other potential files of interest + - kshrc diff --git a/linux-ncaps.sh b/remap.sh index 82d3aa4..37ae9a6 100644 --- a/linux-ncaps.sh +++ b/remap.sh @@ -1,6 +1,5 @@ #!/bin/sh -set -e -set -x +set -ex _s="sudo" [ "$(id -u)" -eq 0 ] && _s="" hwdb_f="$(mktemp)" @@ -8,7 +7,6 @@ cat > "$hwdb_f" <<EOF # /etc/udev.d/hwdb/01-keyboard.hwdb # https://wiki.archlinux.org/title/map_scancodes_to_keycodes # also 'yum -y install evtest' -# This is a fucking lifesaver # evdev:name:AT Translated Set 2 keyboard:* # systemd-hwdb update && udevadm trigger # or perhaps: diff --git a/scripts/httpsvr b/scripts/httpsvr deleted file mode 100755 index ffc816a..0000000 --- a/scripts/httpsvr +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# Stupid basic http server using OpenBSD netcat -set -e - -PORT="${PORT:-8900}" -ADDR="${ADDR:-127.0.0.1}" - -ncpid= - -send_index() { -cat <<EOF -HTTP/1.1 200 OK -Server: shell -Content-Type: text/html; charset=UTF-8 - -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="UTF-8"> - <title>Netcat HTTP</title> -</head> -<body> - Minimal HTTP server in posix SH and OpenBSD's netcat -</body> -</html> -EOF -} - -cleanup() { - set +e - kill "$ncpid" >/dev/null 2>&1 - rm "$_f" "$_inF" >/dev/null 2>&1 - exit 0 -} -trap cleanup EXIT INT - -while true ; do - _f="$(mktemp)" - - _inF="$(mktemp)" - rm -f "$_inF" - mkfifo "$_inF" - - #shellcheck disable=SC2002 - cat "$_inF" | nc -l "$ADDR" "$PORT" > "$_f" & # | tee /dev/fd/2 >"$_f" & - ncpid=$! - - counter=0 - while [ $counter -lt 100 ] || [ -s "$_f" ] ; do - if grep -qi "^Accept:" "$_f" ; then - pth="$(sed -nre 's@^GET ([^ ][^ ]*) HTTP/1.1.*@\1@gp' < "$_f")" - - echo "Request for path: $pth" - - case $pth in - /) send_index >"$_inF" ;; - esac - - break - fi - sleep .01 - [ -s "$_f" ] && counter=$((counter += 1)) - ps $ncpid >/dev/null 2>&1 || break - done - - kill $ncpid || echo "" - rm "$_f" "$_inF" -done diff --git a/scripts/key-check.sh b/scripts/key-check.sh deleted file mode 100755 index 1672bc4..0000000 --- a/scripts/key-check.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# Check for a public key, and create one for the user if it -# does not exist. Spit the key in red to stdout. Not so much for me, -# but as a convienient script to give to others who aren't so familiar -# with how SSH key authorization works. - -keyf="$HOME/.ssh/id_ed25519"; -! [ -e "$keyf" ] && ssh-keygen -t ed25519 -f "$keyf" -P ""; -printf '\033[1;31m%s\033[0m\n' "$(cat "$keyf.pub")"; - -# One line version for pasting into chat: -# keyf="$HOME/.ssh/id_ed25519"; ! [ -e "$keyf" ] && ssh-keygen -t ed25519 -f "$keyf" -P ""; printf '\033[1;31m%s\033[0m\n' "$(cat "$keyf.pub")"; diff --git a/scripts/readme.md b/scripts/readme.md deleted file mode 100644 index 60c79c1..0000000 --- a/scripts/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# scripts - -A couple of misc scripts that may be of some utility. diff --git a/scripts/snap-btrfs.sh b/scripts/snap-btrfs.sh deleted file mode 100755 index cc2e5a9..0000000 --- a/scripts/snap-btrfs.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -set -x -set -e -timestamp() { - date +%m.%d.%y_%H.%M.%S -} - -rootfs="glibc" -snap="${rootfs}-snap" - -cd /ROOT - -if [ -e "$snap" ] ; then - btrfs sub del "$snap" -fi - -if ! [ -e "bak" ] ; then - btrfs sub create "bak" -fi - -btrfs sub snap -r "$rootfs" "bak/${rootfs}-$(timestamp)" -btrfs sub snap "$rootfs" "$snap" -sed -i.bak -e"s/subvol=${rootfs}/subvol=${snap}/g" "${snap}/etc/fstab" diff --git a/scripts/snap-lvm.sh b/scripts/snap-lvm.sh deleted file mode 100755 index 4991495..0000000 --- a/scripts/snap-lvm.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -set -e - -vg="x230" -lv="root" -snap_name="${lv}-snap" -mountpoint="/mnt/snap" -PERCENT="100" - -mount_fs() { - _device="$1"; shift - _opts="nouuid,rw" - _mntpoint="$1"; shift - if ! [ -d "$_mntpoint" ] ; then - mkdir "$_mntpoint" - fi - mount -o "$_opts" "$_device" "$_mntpoint" -} - -# If snapshot doesn't exist -if ! lvm lvs "$vg/$snap_name" >/dev/null 2>&1 ; then - lvm lvcreate "$vg/$lv" -s --name "$snap_name" -l "${PERCENT}%ORIGIN" - mount_fs "/dev/$vg/$snap_name" "$mountpoint" - sed -i.bak -r "s@(/dev/${vg}/${lv})@\1${snap_name}@" \ - "$mountpoint/etc/fstab" - umount "$mountpoint" -else - printf 'Cannot continue snapshot "%s" already exists.\n' \ - "$vg/$snap_name" - exit 1; -fi diff --git a/scripts/syncthing-cert.sh b/scripts/syncthing-cert.sh deleted file mode 100644 index 0dd460b..0000000 --- a/scripts/syncthing-cert.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -set -e -days="3650" -keyout="syncthing.key" -reqout="$(mktemp)" -certout="syncthing.crt" -alg="ED25519" - -help() { -cat <<EOF -$0 [ -c <certificate_out> ] [ -k <key_out> ] [ -448 ] -Defaults are: -certificate_out: 'syncthing.crt' -key_out: 'syncthing.key' - -Optionally, the -448 option will generate an ED448 key instead of ED25519. - -EOF -exit 1 -} - -while [ $# -gt 0 ] ; do case $1 in - -c) certout="$2" ; shift ; shift ;; - -k) keyout="$2" ; shift ; shift ;; - -448) alg="ED448"; shift ;; - *) help ;; -esac ; done - -v3Section=" -basicConstraints = CA:FALSE -keyUsage = digitalSignature, keyEncipherment, dataEncipherment -extendedKeyUsage = serverAuth, clientAuth -subjectAltName = @alt_names -[alt_names] -DNS.1 = syncthing -" - -openssl genpkey -algorithm $alg > "$keyout" - -cnf="$(mktemp)" -cat > "$cnf" <<EOF -[req] -distinguished_name = req_distinguished_name -prompt = no -req_extensions = v3_req -[req_distinguished_name] -OU = Automatically Generated -O = Syncthing -CN = syncthing -[v3_req] -$v3Section -EOF - -extfile="$(mktemp)" -cat > "$extfile" <<EOF -[v3_ca] -$v3Section -EOF - -openssl req -new -out "$reqout" -key "$keyout" -config "$cnf" - -rm "$cnf" - -openssl x509 -req -days "$days" -in "$reqout" -signkey "$keyout" \ - -extensions v3_ca \ - -extfile "$extfile" \ - -out "$certout" - -rm "$extfile" -rm "$reqout" diff --git a/scripts/webhook.py b/scripts/webhook.py deleted file mode 100755 index 3db70a8..0000000 --- a/scripts/webhook.py +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env python3 -import requests, json, sys - -expected_status = 204 -url = "" -# Default for discord, easy enough to override -msg = { - "username": "{hostname} script", - "content": "```{stdin}```", -} - -customVars = {} - -def merge_dicts(*dict_args): - result = {} - for dictionary in dict_args: - result.update(dictionary) - return result - -def template(msg, fmt): - out = {} - for k, v in msg.items(): - if isinstance(v, dict): - out[k] = template(v, fmt) - else: - out[k] = v.format(**fmt) - return out - - -def help(): - print("Usage: {} [-m msg] [-u url] [-s expected_status] [-V var content]...".format(sys.argv[0])) - print("A small python script to send webhooks easily from the command line utilizing arguments and stdin") - print("Only requrement is the requests library") - print("Defaults:") - print("\tmsg: " + json.dumps(msg)) - print("\turl: " + url) - print("\texpected_status: ", expected_status) - print("") - print("The [-V var content] arguments allow you to specifiy custom vars to be overridden in the json msg.") - sys.exit(2) - -n = 1 -while n < len(sys.argv): - if sys.argv[n] == "-u": - url = sys.argv[n+1] - n += 2 - elif sys.argv[n] == "-m": - msg = json.loads(sys.argv[n+1]) - n += 2 - elif sys.argv[n] == "-s": - expected_status = int(sys.argv[n+1]) - n += 2 - elif sys.argv[n] == "-V": - customVars[sys.argv[n+1]] = sys.argv[n+2] - n += 3 - else: - help() - -if url == "": - sys.stderr.write("No URL provided\n") - help() - -msg2 = template(msg, merge_dicts(customVars , {"stdin": sys.stdin.read()})) -r = requests.post(url, json=msg2) - -if r.status_code != expected_status: - print(r) - print(r.text) - sys.exit(1) - diff --git a/snips/aws/ami b/snips/aws/ami deleted file mode 100644 index ca5dba9..0000000 --- a/snips/aws/ami +++ /dev/null @@ -1 +0,0 @@ -curl http://169.254.169.254/latest/meta-data/ami-id ; echo diff --git a/snips/aws/id b/snips/aws/id deleted file mode 100644 index 12c2147..0000000 --- a/snips/aws/id +++ /dev/null @@ -1 +0,0 @@ -curl http://169.254.169.254/latest/meta-data/instance-id ; echo diff --git a/snips/aws/ip b/snips/aws/ip deleted file mode 100644 index f7ea033..0000000 --- a/snips/aws/ip +++ /dev/null @@ -1 +0,0 @@ -curl http://169.254.169.254/latest/meta-data/local-ipv4 ; echo diff --git a/snips/aws/ip-pub b/snips/aws/ip-pub deleted file mode 100644 index 1852bb7..0000000 --- a/snips/aws/ip-pub +++ /dev/null @@ -1 +0,0 @@ -curl http://169.254.169.254/latest/meta-data/public-ipv4 ; echo diff --git a/snips/aws/user-data b/snips/aws/user-data deleted file mode 100644 index 3c33572..0000000 --- a/snips/aws/user-data +++ /dev/null @@ -1 +0,0 @@ -curl http://169.254.169.254/2009-04-04/user-data ; echo diff --git a/snips/bash_history b/snips/bash_history deleted file mode 100644 index a2dfbe7..0000000 --- a/snips/bash_history +++ /dev/null @@ -1,7 +0,0 @@ -if [ -n "$BASH" ] ; then - HISTFILE="$HOME/.bash_history" - HISTSIZE=10000 - HISTFILESIZE=10000 - shopt -s histappend - export PROMPT_COMMAND="set_my_title;history -a; history -c; history -r" -fi diff --git a/snips/docker-registry/all-repos b/snips/docker-registry/all-repos deleted file mode 100644 index 9a3ffa4..0000000 --- a/snips/docker-registry/all-repos +++ /dev/null @@ -1,2 +0,0 @@ -# export registry=https://my-registry.example.com -# curl -X GET $registry/v2/_catalog diff --git a/snips/docker-registry/tags-for-repo b/snips/docker-registry/tags-for-repo deleted file mode 100644 index f69420b..0000000 --- a/snips/docker-registry/tags-for-repo +++ /dev/null @@ -1 +0,0 @@ -# export repo=example ; curl -X GET $registry/v2/$repo/tags/list diff --git a/snips/keys b/snips/keys deleted file mode 120000 index b660cfb..0000000 --- a/snips/keys +++ /dev/null @@ -1 +0,0 @@ -../keys
\ No newline at end of file diff --git a/snips/mpdconf b/snips/mpdconf deleted file mode 120000 index f3308d3..0000000 --- a/snips/mpdconf +++ /dev/null @@ -1 +0,0 @@ -../mpdconf
\ No newline at end of file diff --git a/snips/rtorrent.rc b/snips/rtorrent.rc deleted file mode 120000 index 35dd860..0000000 --- a/snips/rtorrent.rc +++ /dev/null @@ -1 +0,0 @@ -../rtorrent.rc
\ No newline at end of file diff --git a/snips/tmux.conf b/snips/tmux.conf deleted file mode 120000 index ae52063..0000000 --- a/snips/tmux.conf +++ /dev/null @@ -1 +0,0 @@ -../tmux/basic.conf
\ No newline at end of file diff --git a/snips/vimrc b/snips/vimrc deleted file mode 120000 index 5615dc5..0000000 --- a/snips/vimrc +++ /dev/null @@ -1 +0,0 @@ -../vimrc
\ No newline at end of file diff --git a/tezos/install.sh b/tezos/install.sh deleted file mode 100644 index bcfb39e..0000000 --- a/tezos/install.sh +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/sh -set -e - -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH -# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -# FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, -# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR -# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. - -# Add a given path to the start of your $PATH if it doesn't already -# exist -path_preappend() { - if [ -z "$1" ] ; then echo "need something to preappend" ; return ; fi - pth="$1"; shift - if ! echo "$PATH" | grep -qF "$pth" ; then - export PATH="$pth:$PATH" - fi -} - -ubuntuOpam() { -if grep -qi ubuntu /etc/os-release ; then - # Check and see if we have the ppa already, if not let's go ahead and add it - if ! apt policy 2>/dev/null | grep -q avsm/ppa ; then - sudo add-apt-repository ppa:avsm/ppa - sudo apt update - fi - sudo apt install opam -fi -} - -otherOpam() { -if ! grep -qi ubuntu /etc/os-release ; then - mkdir -p ~/bin - checksum="b727fa6c91b8a8d261dbbad3b16687db8364b49f57c934d2d751c8ee7153cb88" - curl -L -sS \ - "https://github.com/ocaml/opam/releases/download/2.0.10/opam-2.0.10-x86_64-linux" \ - > ~/bin/opam - - if ! sha256sum ~/bin/opam | grep -qi "$checksum" ; then - printf "\033[1;31m%s\033[0m\n" "Invalid checksum for ~/bin/opam" - exit 1 - fi - chmod +x ~/bin/opam -fi -} - -path_preappend "$HOME/bin" - -ocaml_version="4.12.1" # overridden later -ocaml_switch_name="for_tezos" - -envvars="$(curl -sS \ - 'https://gitlab.com/tezos/tezos/raw/latest-release/scripts/version.sh' \ - | sed -e '/^#/d' -e '/^$/d' )" - -printf "\033[1;33m" -printf "Fetched environment vars: \n%s\n" "$envvars" -printf "\033[0m" -printf "Does this look okay? [Yy]: " -read -r resp -case $resp in - [Yy]*) ;; - *) exit 0 ;; -esac - -eval "$(echo "$envvars")" - -printf "\033[1;31m" -echo "**********************************************************************" -echo "* Short install script for tezos from source code, loosely based on: *" -echo "* https://tezos.gitlab.io/introduction/howtoget.html *" -echo "* *" -echo "* This script was created on 09-12-2020 and may need some checking *" -echo "* over for updates in the future *" -echo "* *" -printf "* ocaml_version: %-51s *\n" "$ocaml_version" -printf "* ocaml_switch_name: %-47s *\n" "$ocaml_switch_name" -printf "* recommended_rust_version: %-40s *\n" "$recommended_rust_version" -echo "**********************************************************************" -echo -printf "\033[0m" - -set -x - -# Check and see if cargo is in the path, if not let's add it -path_preappend "$HOME/.cargo/bin" - -# Check and see if rustc is available, if not we're going to go ahead -# and try to install it from their main source -if ! stat "$(which rustc | sed 1q)" >/dev/null 2>&1 ; then - echo "Need rustc... installing" - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -fi - -rustup set profile minimal -rustup toolchain install "$recommended_rust_version" -rustup default "$recommended_rust_version" -. $HOME/.cargo/env - -if ! [ -x "$(command -v opam)" ] ; then - otherOpam ; ubuntuOpam -fi - -err=0 -for cmd in unzip ocamlc ; do -if ! [ -x "$(command -v $cmd)" ] ; then - echo "You need '$cmd' to continue" - err=1 -fi -done -if [ $err -ne 0 ] ; then - exit 1 -fi - -if ! [ -x "$(command -v opam)" ] ; then - printf "\033[1;31m" - printf "You need 'opam' installed in order to continue\n" - printf "\033[0m" -fi - -if ! [ -d "$HOME/tezos" ] ; then - git clone https://gitlab.com/tezos/tezos.git "$HOME/tezos" -fi - -cd "$HOME/tezos" - -git checkout latest-release - -make build-deps - -eval $(opam env) - -make - -cp -vf ~/tezos/tezos-* ~/bin/ diff --git a/tezos/start.sh b/tezos/start.sh deleted file mode 100644 index 2e6feb2..0000000 --- a/tezos/start.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -set -e -session="tezos-node" - -unset TMUX - -if tmux ls -F '#{session_name}' | grep -q "^$session" ; then - exec tmux att -t "$session" -fi - -ver="-011" - -exec tmux new-session -s "$session" \;\ - send-keys "tezos-node run --rpc-addr localhost:8732 --history-mode experimental-rolling" \;\ - send-keys Enter \;\ - \ - new-window -n "endorser" \;\ - send-keys -t "$session:endorser" "sleep 5 ; tezos-endorser$ver" \;\ - send-keys -t "$session:endorser" Tab \;\ - send-keys -t "$session:endorser" "run" \;\ - send-keys -t "$session:endorser" Enter \;\ - \ - new-window -n "baker" \;\ - send-keys -t "$session:baker" "sleep 5 ; tezos-baker$ver" \;\ - send-keys -t "$session:baker" Tab \;\ - send-keys -t "$session:baker" "run with local node \"$HOME/.tezos-node\" " \;\ - send-keys -t "$session:baker" Enter \;\ - \ - new-window -n "accuser" \;\ - send-keys -t "$session:accuser" "sleep 5 ; tezos-accuser$ver" \;\ - send-keys -t "$session:accuser" Tab \;\ - send-keys -t "$session:accuser" " run" \;\ - send-keys -t "$session:accuser" Enter \;\ diff --git a/util/backlight.sh b/util/backlight.sh deleted file mode 100755 index 15a8423..0000000 --- a/util/backlight.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -set -x -set -e -# Note the trailing slash -# base="/sys/class/backlight/amdgpu_bl0/" -base="/sys/class/backlight/intel_backlight/" - -percent="$1"; shift -_backlight="${base}brightness" -_max="${base}max_brightness" - -# Since `bc` is often not installed by default, just use awk -_max="$(awk '{print $1/100;}' "$_max")" -percent="$(echo "${percent}" | awk '{print int($1*'"$_max"');}')" - -echo $percent - - -sudo sh -c "echo \"$percent\" > $_backlight" diff --git a/util/hexify.c b/util/hexify.c deleted file mode 100644 index 3aec576..0000000 --- a/util/hexify.c +++ /dev/null @@ -1,11 +0,0 @@ -#include <stdio.h> - -int main() { - int c; - while ((c = getchar()) != EOF) { - printf("\\x%X", c); - if ( c == '\n' ) { - puts(""); - } - } -} diff --git a/util/terminal-colors b/util/terminal-colors deleted file mode 100644 index cbd7dcb..0000000 --- a/util/terminal-colors +++ /dev/null @@ -1,585 +0,0 @@ -#!/usr/bin/env python - -"""2.3.0 John Eikenberry <jae@zhar.net> GPL-3+ http://zhar.net/projects/ - -Copyright - Copyright (C) 2010-2015 John Eikenberry <jae@zhar.net> - -License - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - -Description - My goal in writing this script was to provide all the functionality of all - the various perl/sh scripts found around the web in one place with some - additional bells and whistles. - - It automatically detects 8, 16, 88, 256 color capabilities (via ncurses) - and displays the appropriate color charts. It can display the colors as - blocks or (2d) cubes optionally with color values overlaid in int or hex - values. It can show the full rgb text string as well. It can also show the - display with a vertical (default) or horizontal orientation. It has the - option of additional padding and supports -h --help as well. - - It also works as a utility for converting between 256 and 88 color values. - -Development - A note on coding style. I was playing around with using classes as simple - module-esque namespaces; i.e. having classes that have all staticmethods - and never get instatiated. As a side effect of this it makes calls at the - module level thus this script is not really importable, thus limiting - reuse. - -Contributors - Isaac Cammann <icammann@gmail.com> - cube display bugfix - Jan Larres <jan@majutsushi.net> - submitted patches for.. - - compact rgb display - - use of color intensity to determine foreground contrast color - - 16 color SGR ANSI chart - - 88 color rgb display bugfix - -""" -from __future__ import print_function - -__version__ = __doc__.split('\n')[0] - -import sys -import curses -from optparse import OptionParser, OptionGroup, make_option -from math import ceil, sqrt -from inspect import getdoc -from functools import wraps - -# output constants -fg_escape = "\x1b[38;5;%dm" -bg_escape = "\x1b[48;5;%dm" -clear = "\x1b[0m" - -def _get_options(args): - """ Setup and parse options. - """ - option_list = [ - make_option("-b", "--block", action="store_true", dest="block", - default=True, help="Display as block format (vs cube) [default]."), - make_option("-c", "--cube-slice", action="store_true", dest="cube", - default=False, help="Display as cube slices (vs block)."), - make_option("-f", "--foreground", action="store_true", - dest="foreground", default=False, - help="Use color for foreground text."), - make_option("-l", "--rgb", action="store_true", dest="rgb", - default=False, help="Long format. RGB values as text."), - make_option("-n", "--numbers", action="store_true", dest="numbers", - default=False, help="Include color escape numbers on chart."), - make_option("-o", "--ansicodes", action="store_true", - dest="ansicodes", default=False, - help="Display 16 color chart with SGR ANSI escape codes."), - make_option("-p", "--padding", action="store_true", dest="padding", - default=False, help="Add extra padding (helps discern colors)."), - make_option("-t", "--test", action="store_true", dest="test", - default=False, help="Run tests."), - make_option("-v", "--vertical", action="store_true", dest="vertical", - default=True, help="Display with vertical orientation [default]."), - make_option("-x", "--hex", action="store_true", dest="hex", - default=False, help="Include hex color numbers on chart."), - make_option("-z", "--horizontal", action="store_true", - dest="horizontal", default=False, - help="Display with horizontal orientation."), - ] - - parser = OptionParser(version=__version__, option_list=option_list) - - convert_option_list = [ - make_option("-r", "--256to88", action="store", dest="reduce", - metavar="N", type="int", - help="Convert (reduce) 256 color value N to an 88 color value."), - make_option("-e", "--88to256", action="store", dest="expand", - metavar="N", type="int", - help="Convert (expand) 88 color value N to an 256 color value."), - ] - group = OptionGroup(parser, "Conversion options") - group.add_options(option_list=convert_option_list) - parser.add_option_group(group) - - (opts, args) = parser.parse_args(args) - return opts - -# instantiate global options based on command arguments -options = _get_options(sys.argv[1:]) -# don't allow -f by itself -options.foreground = options.foreground and ( - options.numbers or options.hex or options.rgb) - -class _staticmethods(type): - """ Got tired of adding @staticmethod in front of every method. - """ - def __new__(mcs, n, b, d): - """ turn all methods in to staticmethods. - staticmethod() deals correctly with class attributes. - """ - for (n, f) in d.items(): - if callable(f): - d[n] = staticmethod(f) - return type.__new__(mcs, n, b, d) - -def _cached(f): - """ Memoize function w/ no params - """ - _cache = {} - @wraps(f) - def cache(): - if None not in _cache: - _cache[None] = f() - return _cache[None] - return cache - - -class term16(object): - """ Basic 16 color terminal. - """ - __metaclass__ = _staticmethods - - def label(n, esc): - """ color label for 256 color values - >>> options.numbers = True - >>> term16.label(95, lambda n: '') - ' 95 ' - >>> options.numbers = False - >>> options.hex = True - >>> term16.label(95, lambda n: '') - ' 5f ' - """ - if options.numbers: - return esc(n) + "%3d " % n - elif options.hex: - return esc(n) + " %2x " % n - return esc(n) + " " - - def _render(): - """ 16 color info - >>> term16._render()[0][-1] - '\\x1b[48;5;7m\\x1b[38;5;15m \\x1b[0m' - >>> len(term16._render()) - 2 - >>> len(term16._render()[0]) - 8 - """ - if options.foreground: - esc = lambda n: fg_escape % n - else: - esc = lambda n: bg_escape % n + fg_escape % (15 if n < 9 else 0) - return [[term16.label(n, esc) + clear for n in range(8)], - [term16.label(n, esc) + clear for n in range(8, 16)]] - - def ansicodes(): - """ base 16 SGR ANSI escape codes - >>> term16.ansicodes()[0][:6] - [' 0m ', ' 1m ', ' 30m ', ' 1;30m ', ' 31m ', ' 1;31m '] - >>> term16.ansicodes()[1][:6] - [' ', ' _ ', ' 40m ', ' 41m ', ' 42m ', ' 43m '] - >>> len(term16.ansicodes()[2]) - 18 - >>> term16.ansicodes()[2][17][0] - '\\x1b[1;37m\\x1b[_ gYw \\x1b[0m' - """ - fg_codes = ['0m', '1m'] + [fg for pair in - [["{}m".format(i), "1;{}m".format(i)] for i in range(30, 38)] - for fg in pair] - bg_codes = ["_"] + ["{}m".format(n) for n in range(40, 48)] - - x_labels = ["%6s " % fg for fg in fg_codes] - y_labels = [' ' * 6] - y_labels.extend(["{: ^5}".format(bg) for bg in bg_codes]) - - text, esc_code = " gYw ", "\x1b[%s" - - codes = [[esc_code % fg + esc_code % bg + text + clear - for bg in bg_codes] for fg in fg_codes] - - return x_labels, y_labels, codes - - def ansicodes_display(): - """ 16 SGR ANSI escape codes in traditional format - """ - x_labels, y_labels, codes = term16.ansicodes() - - print(' '.join(y_labels)) - for i, code in enumerate(codes): - print(x_labels[i], end='') - print(' '.join(code)) - - def display(): - """ display 16 color info - """ - print("System colors:") - colors = term16._render() - padding = ' ' if options.padding else '' - for r in colors: - print(padding.join(i for i in r)) - if options.padding: print() - - -class term256(term16): - """ eg. xterm-256 - """ - - @_cached - def _rgb_lookup(): - """ color rgb lookup dict - >>> term256._rgb_lookup()[16] - (0, 0, 0) - >>> term256._rgb_lookup()[128] - (175, 0, 215) - >>> term256._rgb_lookup()[255] - (238, 238, 238) - """ - # color increment is based on xterm/rxvt palette - cincr = [0] + [95+40*n for n in range(5)] - color_rgb = [rgb(i, j, k) - for i in cincr for j in cincr for k in cincr] - color_rgb = dict(zip(range(16, len(color_rgb)+16), color_rgb)) - greys = [rgb(*((n,)*3)) for n in range(8, 248, 10)] - greys = dict(zip(range(232, 256), greys)) - color_rgb.update(greys) - return color_rgb - - def _to_rgb(n): - """ Convert color value to rgb tuple. - >>> term256._to_rgb(128) - (175, 0, 215) - """ - return term256._rgb_lookup()[n] - - def _rgb_color_table(): - """ 256 color info - >>> term256._rgb_color_table()[0][0] - '\\x1b[38;5;16m 16: \\x1b[38;5;255m\\x1b[48;5;16m#000000\\x1b[0m' - >>> term256._rgb_color_table()[-1][-1] - '\\x1b[38;5;255m 255: \\x1b[38;5;16m\\x1b[48;5;255m#eeeeee\\x1b[0m' - """ - rgbl = term256._rgb_lookup() - label_num = "% 4d: " - label_val = "%s" - if options.foreground: - render = lambda n: fg_escape % n + label_num % n + \ - label_val % str(rgbl[n]) + clear - else: - render = lambda n: fg_escape % n + label_num % n + \ - fg_escape % (16 if rgbl[n].is_light() else 255) \ - + bg_escape % n + label_val % str(rgbl[n]) + clear - return [[render(n) for n in [i+j for j in range(6)]] - for i in range(16, 256, 6)] - - def _rgb_display(): - """ display colors with rgb hex info - """ - colors = term256._rgb_color_table() - padding = ' ' if options.padding else '' - while colors: - rows, colors = colors[:6], colors[6:] - if not options.horizontal: - rows = zip(*rows) - for r in rows: - print(padding.join(i for i in r)) - if options.padding: print() - print() - - def _colors(): - """ 256 color numbers - """ - return [[i+j for j in range(6)] for i in range(16, 232, 6)] - - def _greyscale(): - """ 256 greyscale numbers - """ - return [[i+j for j in range(12)] for i in range(232, 256, 12)] - - def _render(palette): - """ compact 256 color info - """ - if options.foreground: - esc = lambda n: fg_escape % n - render = lambda n: term256.label(n, esc) + clear - else: - esc = lambda n: fg_escape % \ - (16 if term256._to_rgb(n).is_light() else 255) - render = lambda n: bg_escape % n + term256.label(n, esc) + clear - return [[render(n) for n in i] for i in iter(palette)] - - def _compact_display(): - """ display colors in compact format - """ - colors = term256._render(term256._colors()) - if options.cube: - _cube_display(colors) - elif options.block: - _block_display(colors) - print() - greys = term256._render(term256._greyscale()) - padding = ' ' if options.padding else '' - for r in greys: - print(padding.join(i for i in r)) - if options.padding: print() - - def display(): - """ display 256 color info (+ 16 in compact format) - """ - if options.rgb: - print("Xterm RGB values for 6x6x6 color cube and greyscale.") - print() - term256._rgb_display() - else: - term16.display() - print() - print("6x6x6 color cube and greyscale:") - term256._compact_display() - - -class term88(term16): - """ xterm-88 or urxvt - """ - - @_cached - def _rgb_lookup(): - """ color rgb lookup dict - """ - # color increment is based on rxvt palette - cincr = [0, 0x8b, 0xcd, 0xff] - color_rgb = [rgb(i, j, k) - for i in cincr for j in cincr for k in cincr] - color_rgb = dict(zip(range(16, len(color_rgb)+16), color_rgb)) - greys = [rgb(*((n,)*3)) - for n in [0x2e, 0x5c, 0x73, 0x8b, 0xa2, 0xb9, 0xd0, 0xe7]] - greys = dict(zip(range(80, 88), greys)) - color_rgb.update(greys) - return color_rgb - - def _to_rgb(n): - """ Convert color value to rgb tuple. - """ - return term88._rgb_lookup()[n] - - def _rgb_color_table(): - """ 88 color info - """ - rgbl = term88._rgb_lookup() - label_num = "% 4d: " - label_val = "%s" - if options.foreground: - render = lambda n: fg_escape % n + label_num % n + \ - label_val % str(rgbl[n]) + clear - else: - render = lambda n: fg_escape % n + label_num % n + \ - fg_escape % (16 if rgbl[n].is_light() else 87) \ - + bg_escape % n + label_val % str(rgbl[n]) + clear - return [[render(n) for n in [i+j for j in range(4)]] - for i in range(16, 88, 4)] - - def _rgb_display(): - """ display colors with rgb hex info - """ - colors = term88._rgb_color_table() - while colors: - rows, colors = colors[:4], colors[4:] - for r in zip(*rows): - print(''.join(i for i in r)) - print() - - def _render(palette): - """ 88 color info - """ - if options.foreground: - esc = lambda n: fg_escape % n - render = lambda n: term88.label(n, esc) + clear - else: - esc = lambda n: fg_escape % \ - (16 if term88._to_rgb(n).is_light() else 87) - render = lambda n: bg_escape % n + term88.label(n, esc) + clear - return [[render(n) for n in i] for i in iter(palette)] - - def _colors(): - """ 88 color numbers - """ - return [[i+j for j in range(4)] for i in range(16, 80, 4)] - - def _greyscale(): - """ 88 greyscale numbers - """ - return [range(80, 88)] - - - def display(): - """ display 16 + 88 color info - """ - if options.rgb: - print("Xterm RGB values for 4x4x4 color cube and greyscale.") - print() - term88._rgb_display() - else: - padding = ' ' if options.padding else '' - term16.display() - print() - print("4x4x4 color cube and greyscale:") - colors = term88._render(term88._colors()) - if options.cube: - _cube_display(colors) - elif options.block: - _block_display(colors) - print() - greys = term88._render(term88._greyscale()) - for r in greys: - print(padding.join(i for i in r)) - -class rgb(tuple): - """ An RGB, (red, green, blue) tuple. Takes integers. - """ - def __new__(cls, r, g, b): - """ We want 3 colors. - """ - return super(rgb, cls).__new__(cls, (r, g, b)) - - def __str__(self): - """ Display in compact rgb format. - """ - return "#%02x%02x%02x" % self - - def is_light(self): - """ Is this color light (or dark). - """ - red, green, blue = self[0], self[1], self[2] - intensity = red*0.2126 + green*0.7152 + blue*0.0722 - return intensity > 127 - - -def _cube_display(colors): - """ Display color cube as color aligned flatten cube sides. - """ - padding = ' ' if options.padding else '' - if options.horizontal: - def _horizontal(colors): - size = int(sqrt(len(colors))) - for n in (n*size for n in range(size)): - colors[n:n+size] = zip(*colors[n:n+size]) - while colors: - rows, colors = colors[:size*2], colors[size*2:] - for n in range(size): - print(padding.join(i - for i in rows[n]+tuple(reversed(rows[n+size])))) - if options.padding: print(padding) - if colors: print() - _horizontal(colors) - else: #options.vertical - default - def _vertical(colors): - size = int(sqrt(len(colors))) - top = [colors[n:len(colors):size*2] for n in range(size)] - bottom = [colors[n+size:len(colors):size*2] - for n in reversed(range(size))] - for group in [top, bottom]: - for rows in group: - for r in rows: - print(padding.join(i for i in r), end=' ') - if options.padding: print(padding, end=' ') - if options.padding: print() - print() - _vertical(colors) - -def _block_display(colors): - """ Display color cube as cube sides organized by color #s (default). - """ - padding = ' ' if options.padding else '' - size = int(sqrt(len(colors))) - if not options.horizontal: - for n in (n*size for n in range(size)): - colors[n:n+size] = zip(*colors[n:n+size]) - while colors: - half = size*(size//2) - rows, colors = colors[:half], colors[half:] - for n in range(size): - for r in rows[n:len(rows):size]: - print(padding.join(i for i in r), end=' ') - if options.padding: print(padding, end=' ') - if options.padding: print() - print() - if colors: print() - -def convert88to256(n): - """ 88 (4x4x4) color cube to 256 (6x6x6) color cube values - """ - if n < 16: - return n - elif n > 79: - return 234 + (3 * (n - 80)) - else: - def m(n): - "0->0, 1->1, 2->3, 3->5" - return n and n + n-1 or n - b = n - 16 - x = b % 4 - y = (b // 4) % 4 - z = b // 16 - return 16 + m(x) + (6 * m(y) + 36 * m(z)) - -def convert256to88(n): - """ 256 (6x6x6) color cube to 88 (4x4x4) color cube values - """ - if n < 16: - return n - elif n > 231: - if n < 234: - return 0 - return 80 + ((n - 234) // 3) - else: - def m(n, _ratio=(4./6.)): - if n < 2: - return int(ceil(_ratio*n)) - else: - return int(_ratio*n) - b = n - 16 - x = b % 6 - y = (b // 6) % 6 - z = b // 36 - return 16 + m(x) + (4 * m(y) + 16 * m(z)) - -def _terminal(): - """ detect # of colors supported by terminal and return appropriate - terminal class - """ - curses.setupterm() - num_colors = curses.tigetnum('colors') - if num_colors > 0: - return {16:term16, 88:term88, 256:term256}.get(num_colors, term16) - -def main(): - if options.test: - print("Running tests...") - import doctest - doctest.testmod() - print("Done.") - elif options.reduce: - v = convert256to88(options.reduce) - # reconvert back to display reduction in context - print("%s (equivalent to 256 value: %s)" % (v, convert88to256(v))) - elif options.expand: - print(convert88to256(options.expand)) - else: - term = _terminal() - if term is None: - print("Your terminal reports that it has no color support.") - else: - if options.ansicodes: - print(getdoc(term16.ansicodes_display)) - term16.ansicodes_display() - else: - term.display() - -if __name__ == "__main__": - main() diff --git a/util/zram.sh b/util/zram.sh deleted file mode 100755 index bacfb1f..0000000 --- a/util/zram.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -if [ $(id -u) -ne 0 ] ; then - echo "Please run as root" - exit 1; -fi - - -start() { - modprobe zram - echo lz4 > /sys/block/zram0/comp_algorithm - echo 2G > /sys/block/zram0/disksize - - mkswap --label zram0 /dev/zram0 - swapon --priority 100 /dev/zram0 - - sysctl vm.swappiness=100 -} - -stop() { - swapoff /dev/zram0 - modprobe -r zram - - sysctl vm.swappiness=60 -} - -$1 diff --git a/vimrc-full b/vimrc-full deleted file mode 100644 index 0c3c76c..0000000 --- a/vimrc-full +++ /dev/null @@ -1,190 +0,0 @@ -set encoding=utf-8 -set fileencoding=utf-8 -set nu -set rnu -set listchars=tab:▸\ ,eol:¬,trail:• -" set listchars=tab:\|\ " Alternative listchars w/o special chars. -set tw=80 -set colorcolumn=80 -set ic -set hls -set updatecount=0 -set nocompatible -set tabstop=4 -set shiftwidth=4 -set noexpandtab -set mouse+=a -syntax on -"if &term =~ '^screen' -" " tmux knows the extended mouse mode -" set ttymouse=xterm2 -"endif - - -" I know how to setup my editor, I don't need your changes to my vim -" configuration. -set nomodeline - -" Use \-n in normal mode to toggle line numbers -nmap <leader>n :set invnu<CR> -nmap <leader>r :set invrnu<CR> -" Use \-l in normal mode to toggle listchars -nmap <leader>l :set list!<CR> - -" Use \-s to pop open a spelling menu. use ]s to search forwards and [s to go -" backwards. -" Apparently this also doesn't work if spell checking isn't enabled -" at the time you enable it. -set spell -nnoremap \s ea<C-X><C-S> -set nospell - -" set hidden " This will allow you to change buffers w/o saving - -" Omni completion, c-x c-o in insert/append mode -filetype plugin on -set omnifunc=syntaxcomplete#Complete - -" Stolen from the help page: -" -" One typical way to use the netrw tree display is to: > -" -" vim . -" (use i until a tree display shows) -" navigate to a file -" v (edit as desired in vertically split window) -" ctrl-w h (to return to the netrw listing) -" P (edit newly selected file in the previous window) -" ctrl-w h (to return to the netrw listing) -" P (edit newly selected file in the previous window) -let g:netrw_liststyle=3 - -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -call plug#begin('~/.vim/plugged') - -Plug 'scrooloose/nerdtree' -Plug 'scrooloose/syntastic' - -Plug 'tpope/vim-fugitive' -Plug 'preservim/tagbar' -Plug 'rking/ag.vim' -Plug 'sjl/gundo.vim' -Plug 'ctrlpvim/ctrlp.vim' -Plug 'godlygeek/tabular' -Plug 'vim-airline/vim-airline' -Plug 'vim-airline/vim-airline-themes/' -Plug 'mattn/emmet-vim' -Plug 'tpope/vim-commentary' -Plug 'takac/vim-hardtime' - -" Misc -Plug 'https://git.riedstra.dev/vim/vim-l9' -Plug 'https://git.riedstra.dev/vim/mitch' - -" Languages -Plug 'fatih/vim-go' -Plug 'hashivim/vim-terraform' -Plug 'MaxMEllon/vim-jsx-pretty' -" Plug 'xavierd/clang_complete' - -" Color schemes -Plug 't184256/vim-boring' -Plug 'plan9-for-vimspace/acme-colors' -Plug 'huyvohcmc/atlas.vim' -Plug 'w0ng/vim-hybrid' -Plug 'altercation/vim-colors-solarized' -Plug 'kristijanhusak/vim-hybrid-material' -Plug 'Lokaltog/vim-monotone' -Plug 'arcticicestudio/nord-vim' - -call plug#end() - -" This is needed for the riedstra.dev plugins above, because -" the HTTP transport doesn't support a shallow clone -" let g:plug_shallow = 0 - -map <C-n> :NERDTreeToggle<CR> - -let g:ctrlp_follow_symlinks = 1 -let g:ctrlp_working_path_mode = 0 - -" Always show status line -" set laststatus=2 - -" Enable the list of buffers -let g:airline#extensions#tabline#enabled = 1 -" Show just the filename -let g:airline#extensions#tabline#fnamemod = ':t' -if !exists('g:airline_symbols') - let g:airline_symbols = {} -endif -let g:airline_symbols.space = "\ua0" -let g:airline_section_z = airline#section#create(['windowswap', '%3p%% ', 'linenr', ':%3v']) - - -" Persistent undo -set undofile -set undodir=~/.nvimundo -set undolevels=1000 -set undoreload=10000 - -" lots of history, it's always nice to find old nasty command that happen -" to be really useful -set history=10000 - - -" Useful on some terminals, not always supported in old tmux versions -" set termguicolors -" let g:airline_theme="monochrome" -" let g:airline_theme="distinguished" -" let g:airline_theme="hybrid" - -" colorscheme 256_noir -" colorscheme distinguished -" colorscheme sane -" set background=dark -" let g:hybrid_transparent_background = 1 -" colorscheme hybrid_material - -" autocmd ColorScheme nord highlight vimCommentTitle ctermfg=10 guifg=#8FBCBB - -autocmd ColorScheme nord highlight Comment ctermfg=14 guifg=#8FBCBB -let g:nord_uniform_diff_background = 1 -colorscheme nord - - -" For syntastic it's worth running -" SyntasticInfo : to see what's available for the given open file -" SyntasticCheck yamllint : if you want to say manually run the `yamllint` -" checker - -let g:syntastic_yaml_checkers = ['yamllint'] -let g:syntastic_go_checkers = [ 'go', 'gofmt', 'golangci_lint' ] -let g:syntastic_lua_checkers = [ 'luac', 'luacheck' ] - -" This lets :lopen / :lwindow always be populated work -let g:syntastic_always_populate_loc_list = 1 - -" some info on the Tabular plugin: -" http://vimcasts.org/episodes/aligning-text-with-tabular-vim/ - -" Commenting in and out blocks can be done with `gc` -" https://github.com/tpope/vim-commentary - -" For improved Go support -" go get github.com/jstemmer/gotags -nmap <F8> :TagbarToggle<CR> -" let g:tagbar_ctags_bin='uctags' -" let g:tagbar_ctags_bin='uctags' -let g:tagbar_ctags_bin='ctags' - -" For clang complete -" path to directory where library can be found -" let g:clang_library_path='/usr/local/lib' -" let g:clang_library_path='/usr/lib/clang/12/lib' -" let g:clang_library_path='/usr/lib/llvm-12/lib/libclang.so' -" package clang-tools-extra on OpenBSD provides the library - - -" For info on fugitive -" https://github.com/tpope/vim-fugitive diff --git a/bin/4k-addmode.sh b/x/4k-addmode.sh index ca5b712..ca5b712 100755 --- a/bin/4k-addmode.sh +++ b/x/4k-addmode.sh diff --git a/x/mouse-props b/x/mouse-props new file mode 100755 index 0000000..a2c0d5f --- /dev/null +++ b/x/mouse-props @@ -0,0 +1,49 @@ +#!/bin/sh + +mice="G305|Viper|Naga Pro|Orochi V2|Viper V2" + +listMice() { + xinput --list \ + | awk -v "search=$mice" \ + '{ + if ($0 ~ search) { + if ( $0 ~ /pointer/ ) { + $1=$2=""; + print $0 + } + } + }' \ + | sed -re's/.* id=([0-9]*).*/\1/g' # -e's/^[ \t]*//g' +} +xinput --list | grep pointer | grep -E "$mice" +mice="$(listMice)" + +proplist='Accel Profile Enabled::0 1 +Accel Speed::0' +# Accel Speed::-0.7' + +IFS=' +' + +for device in $mice ; do + # props=$(xinput --list-props "pointer:$device") + props=$(xinput --list-props "$device") + + for prop in $proplist ; do + propName="$(echo "$prop" | awk -F:: '{print $1}')" + propVal="$(echo "$prop" | awk -F:: '{print $2}')" + + prop="$(echo "$props" | + sed -rne 's/^.*'"$propName"' \(([0-9]+).*$/\1/ip')" + oldIFS="$IFS" + IFS=' ' + + #shellcheck disable=SC2086 + xinput --set-prop "$device" "$prop" $propVal + #shellcheck disable=SC2086 + echo xinput --set-prop "$device" "$prop" $propVal + + IFS="$oldIFS" + done +done + diff --git a/bin/status-bar b/x/status-bar index 30fdbd7..30fdbd7 100755 --- a/bin/status-bar +++ b/x/status-bar diff --git a/bin/touchpad-props b/x/touchpad-props index 0851486..0851486 100755 --- a/bin/touchpad-props +++ b/x/touchpad-props diff --git a/bin/wallpaper b/x/wallpaper index 73f9871..73f9871 100755 --- a/bin/wallpaper +++ b/x/wallpaper |