From 1a332553c19193deac598aa6a1fe9f086d525ee1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 18 Apr 2020 14:49:06 -0400 Subject: x --- .config/X11/modmap | 4 ++-- .config/X11/resources | 5 ++++ .config/wmii-hg/rbar.sh | 7 ++++++ .config/wmii-hg/rbar_wifi | 31 ++++++++++++++++-------- .local/bin/Su | 6 +++++ .local/bin/Sy | 6 +++++ .local/bin/Syu | 4 ++++ .local/bin/docker-archive | 6 +++++ .local/bin/get-dpi | 2 +- .local/bin/set-audio-sink | 61 +++++++++++++++++++++++++++++++++++++++++++++++ .local/bin/y2j | 6 +++++ 11 files changed, 125 insertions(+), 13 deletions(-) create mode 100755 .local/bin/Su create mode 100755 .local/bin/Sy create mode 100755 .local/bin/Syu create mode 100755 .local/bin/docker-archive create mode 100755 .local/bin/set-audio-sink create mode 100755 .local/bin/y2j diff --git a/.config/X11/modmap b/.config/X11/modmap index 22d2ac6..5d94726 100644 --- a/.config/X11/modmap +++ b/.config/X11/modmap @@ -34,8 +34,8 @@ clear mod5 add shift = Shift_L Shift_R add lock = Caps_Lock add control = Control_L Control_R -add mod1 = Num_Lock -add mod2 = Alt_L Alt_R Meta_L Meta_R +add mod1 = Alt_L Alt_R Meta_L Meta_R +add mod2 = Num_Lock add mod3 = ISO_Level3_Shift add mod4 = Super_L Super_R add mod5 = Hyper_L Hyper_R diff --git a/.config/X11/resources b/.config/X11/resources index c85fdaf..64cad98 100644 --- a/.config/X11/resources +++ b/.config/X11/resources @@ -1,5 +1,10 @@ ! -*- Mode: Conf-xdefaults -*- +! with scaling on some monitors, subpixel rendering doesn't make sense +Xft.rgba: none +! when doing the scaling, avoid letting sampling artifacts hide thin lines +Xft.embolden: true + ! "native" colors URxvt.background: #000000 URxvt.foreground: #CCCCCC diff --git a/.config/wmii-hg/rbar.sh b/.config/wmii-hg/rbar.sh index b02c2e9..4180444 100644 --- a/.config/wmii-hg/rbar.sh +++ b/.config/wmii-hg/rbar.sh @@ -13,6 +13,13 @@ write() { sponge|tee -a "${dirs[@]/%/${1}}" > /dev/null || true } +type left-click &>/dev/null || left-click() { :; } +type middle-click &>/dev/null || middle-click() { :; } +type right-click &>/dev/null || right-click() { :; } +type scroll-up &>/dev/null || scroll-up() { :; } +type scroll-down &>/dev/null || scroll-down() { :; } +type update &>/dev/null || update() { :; } + set -eE shopt -s nullglob case "$1" in diff --git a/.config/wmii-hg/rbar_wifi b/.config/wmii-hg/rbar_wifi index c77efa5..48ea06c 100755 --- a/.config/wmii-hg/rbar_wifi +++ b/.config/wmii-hg/rbar_wifi @@ -53,20 +53,31 @@ update() { } right-click() { - local list cur item + local list + mapfile -t list < <({ netctl-auto list | sort -k1.2; printf '> %s\n' 'New Network' 'Disable All' 'Enable All';} | sed 's,$,$,' | column -s '$' -t) - list=() - IFS='' - while read -r line; do - list+=("$line") - done < <({ netctl-auto list | sort -k1.2; printf '> %s\n' 'New Network' 'Disable All' 'Enable All';} | sed 's,$,$,' | column -s '$' -t) - - cur='' + local cur='' + local any_enabled=false + local item_enable_all='' + local item_new_network='' + local item for item in "${list[@]}"; do - if [[ "$item" = '* '* ]]; then - cur="$item" + case "$item" in + '* '*) cur="$item";; + '> New Network'*) item_new_network=$item;; + '> Enable All'*) item_enable_all=$item;; + esac + if [[ "$item" != '! '* ]] && [[ "$item" != '> '* ]]; then + any_enabled=true fi done + if [[ -z $cur ]]; then + if $any_enabled; then + cur=$item_new_network + else + cur=$item_enable_all + fi + fi IFS=$' \t\n' item=$(wmii9menu -i "$cur" "${list[@]}") diff --git a/.local/bin/Su b/.local/bin/Su new file mode 100755 index 0000000..afedb89 --- /dev/null +++ b/.local/bin/Su @@ -0,0 +1,6 @@ +#!/bin/bash +set -ev +comm -12 \ + <(expac 'arch-import/%n' | sort -u) \ + <(expac -S '%r/%n' | grep ^arch-import/ | sort -u) \ +| tee >(sed 's/^/explicit: /' >/dev/stderr) | sudo pacman -Su --needed - diff --git a/.local/bin/Sy b/.local/bin/Sy new file mode 100755 index 0000000..d44cace --- /dev/null +++ b/.local/bin/Sy @@ -0,0 +1,6 @@ +#!/bin/bash +set -ev +(cd ~/repos/zoom-import && ./zoom-import.sh) +(cd ~/repos/arch-import && ./arch-import.sh) +(cd ~/repos/lukeshu-sysconfig && git pull && art) || true +sudo pacman -Sy diff --git a/.local/bin/Syu b/.local/bin/Syu new file mode 100755 index 0000000..31755a3 --- /dev/null +++ b/.local/bin/Syu @@ -0,0 +1,4 @@ +#!/bin/bash +set -ev +Sy +Su diff --git a/.local/bin/docker-archive b/.local/bin/docker-archive new file mode 100755 index 0000000..df3276f --- /dev/null +++ b/.local/bin/docker-archive @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -ex +image="$1" +container=$(docker run --detach=true --entrypoint=true "$image") +docker export "$container" +docker container rm "$container" diff --git a/.local/bin/get-dpi b/.local/bin/get-dpi index 3fba920..6af0f2a 100755 --- a/.local/bin/get-dpi +++ b/.local/bin/get-dpi @@ -23,7 +23,7 @@ usage() { printf 'Usage: %s [OPTIONS]\n' "${0##*/}" printf "Report DPI settings\n" echo - printf 'OPTIONS:\n': + printf 'OPTIONS:\n' printf ' -h, --help Show this message\n' printf ' --device-geometry=OUTPUT=x[x]\n' printf ' Override the hardware-reported physical\n' diff --git a/.local/bin/set-audio-sink b/.local/bin/set-audio-sink new file mode 100755 index 0000000..20ade7a --- /dev/null +++ b/.local/bin/set-audio-sink @@ -0,0 +1,61 @@ +#!/usr/bin/env bash +# Copyright 2020 Luke Shumaker + +errusage() { + if (( $# > 0 )); then + printf '%s: %s\n' "${0##*/}" "$(printf "$@")" >&2 + fi + printf "Try '%s --help' for more information.\n" "${0##*/}" >&2 + exit 2 +} + +usage() { + printf 'Usage: %s [OPTIONS] PULSE_SINK\n' "${0##*/}" + printf "Adjust default audio sink, and move currently running programs\n" + printf "to that sink.\n" + echo + printf 'OPTIONS:\n' + printf ' -h, --help Show this message\n' + printf ' -n, --dry-run Print what would be done, without doing it\n' +} + +set -euE -o pipefail +args=$(getopt -n "${0##*/}" -o 'hn' -l 'help,dry-run' -- "$@") || errusage +eval "set -- $args" + +arg_dry_run=false +while (( $# > 0 )); do + case "$1" in + -h|--help) + usage + exit 0 + ;; + -n|--dry-run) + arg_dry_run=true + shift + ;; + --) + shift + break + ;; + esac +done +if (( $# != 1 )); then + errusage +fi + +( + + new_sink=$1 + printf 'pactl set-default-sink %q\n' "$new_sink" + while IFS=$'\t' read -r sink_input current_sink client driver sample_spec; do + printf 'pactl move-sink-input %q %q\n' "$sink_input" "$new_sink" + done < <(pactl list short sink-inputs) +) | ( + if $arg_dry_run; then + cat + else + bash -v + fi +) + diff --git a/.local/bin/y2j b/.local/bin/y2j new file mode 100755 index 0000000..f75295d --- /dev/null +++ b/.local/bin/y2j @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 +import sys +import yaml +import json + +print(json.dumps(yaml.load(sys.stdin, Loader=yaml.BaseLoader))) -- cgit v1.1-4-g5e80