diff --git a/dotfiles-old/.config/sxhkd/sxhkdrc-base b/dotfiles-old/.config/sxhkd/sxhkdrc-base index 0c4affb..c1c3bdd 100755 --- a/dotfiles-old/.config/sxhkd/sxhkdrc-base +++ b/dotfiles-old/.config/sxhkd/sxhkdrc-base @@ -1,8 +1,18 @@ +XF86AudioMicMute + pactl set-source-mute @DEFAULT_SOURCE@ toggle +XF86AudioMute + pactl -- set-sink-mute @DEFAULT_SINK@ toggle +XF86Audio{Lower,Raise}Volume + pactl set-sink-volume @DEFAULT_SINK@ {"-5%","+5%"} +XF86Audio{Play,Pause,Next,Prev} + playerctl {play,pause,next,previous} +XF86Launch1 + $TERMINAL + control + shift + Escape $TERMINAL -e htop - -mod1 + d - dmenu_run +Print + scrot # cred 4 https://github.com/patrickbolle/dotfiles/ mod1 + equal @@ -14,28 +24,29 @@ mod1 + minus mod1 + shift + minus light -U 1 +mod1 + shift + r + pkill -USR1 sxhkd + +mod1 + i + ps aux | grep dmenubar | grep -v grep && pkill dmenubar; \ + data | /home/trinity/src/dmenubar/dmenubar -b + +mod1 + shift + i + pkill dmenubar + +mod1 + d + dmenu_run + +mod1 + Return + $TERMINAL + +mod1 + v + $TERMINAL -e pulsemixer + +mod1 + b + $BROWSER mod1 + m pactl -- set-sink-mute @DEFAULT_SINK@ toggle mod1 + shift + m pactl set-source-mute @DEFAULT_SOURCE@ toggle - -mod1 + v - $TERMINAL -e pulsemixer - -mod1 + Return - uxterm - -Print - scrot - -XF86AudioMicMute - pactl set-source-mute @DEFAULT_SOURCE@ toggle -XF86AudioMute - pactl -- set-sink-mute @DEFAULT_SINK@ toggle -XF86Audio{Lower,Raise}Volume - pactl set-sink-volume @DEFAULT_SINK@ {"-5%","+5%"} -XF86Audio{Play,Pause,Next,Prev} - playerctl {play,pause,next,previous} -XF86Launch1 - uxterm diff --git a/dotfiles-old/.config/sxhkd/sxhkdrc-bspwm b/dotfiles-old/.config/sxhkd/sxhkdrc-bspwm index 237c6eb..f279101 100644 --- a/dotfiles-old/.config/sxhkd/sxhkdrc-bspwm +++ b/dotfiles-old/.config/sxhkd/sxhkdrc-bspwm @@ -3,8 +3,8 @@ mod1 + {_,shift + }F4 bspc node -{c,k} -mod1 + {_,shift + }{1-9,0} - bspc {desktop -f,node -d} '^{1-9,10}' +mod1 + {_,shift + }{1-4,q,w,e,r,a,s} + bspc {desktop -f,node -d} '^{1-4,5,6,7,8,9,10}' mod1 + shift + e [ "Yes." = $(printf "No.\nYes." | dmenu -p "You pressed the exit shortcut. Do you really want to exit? This will end your X session.") ] && bspc quit diff --git a/dotfiles-old/.profile b/dotfiles-old/.profile index 83a666c..c4a9fa4 100644 --- a/dotfiles-old/.profile +++ b/dotfiles-old/.profile @@ -10,6 +10,3 @@ VISUAL=vi; export VISUAL ENV=$HOME/.env; export ENV . $ENV - -if [ "$0" = "bash" ] || [ "$0" = "-bash" ]; then complete -c man which; fi - diff --git a/dotfiles-old/.vimrc b/dotfiles-old/.vimrc index 1b2a329..a89146f 100644 --- a/dotfiles-old/.vimrc +++ b/dotfiles-old/.vimrc @@ -1,3 +1,6 @@ +set noexpandtab set nowrap set relativenumber +set tabstop=8 +set visualbell syntax on diff --git a/dotfiles-old/packages/all b/dotfiles-old/packages/all index 2f49f91..5c848b5 100644 --- a/dotfiles-old/packages/all +++ b/dotfiles-old/packages/all @@ -1,4 +1,3 @@ -adb alsa-utils anki audacious @@ -65,5 +64,4 @@ xterm zathura zathura-cb zathura-djvu -zathura-mupdf zathura-ps diff --git a/dotfiles-old/packages/alpine_apk b/dotfiles-old/packages/alpine_apk new file mode 100644 index 0000000..e5011ea --- /dev/null +++ b/dotfiles-old/packages/alpine_apk @@ -0,0 +1,30 @@ +xorg-xserver +xterm +udev +util-linux +vim +git +xf86-input-libinput +xf86-video-intel +lynx +firefox +ttf-liberation +make +tcc +gcc +scrot +neofetch +build-base +libx11-dev +libxft-dev +libxinerama-dev +gwenview +mpv +pulseaudio +pulsemixer +dbus +consolekit2 +pulseaudio-alsa +alsa-plugins-nice +dbus-x11 +pulseaudio-utils diff --git a/dotfiles-old/packages/artix_pacman b/dotfiles-old/packages/artix_pacman index 6e228df..68b946f 100644 --- a/dotfiles-old/packages/artix_pacman +++ b/dotfiles-old/packages/artix_pacman @@ -5,4 +5,3 @@ iwd-openrc libvirt-openrc openresolv wireguard-openrc -virtualbox-host-modules-artix diff --git a/dotfiles-old/packages/common-arch_pacman-artix_pacman b/dotfiles-old/packages/common-arch_pacman-artix_pacman index 28dc6f6..63b8020 100644 --- a/dotfiles-old/packages/common-arch_pacman-artix_pacman +++ b/dotfiles-old/packages/common-arch_pacman-artix_pacman @@ -13,7 +13,6 @@ iwd jre11-openjdk jre8-openjdk kimageformats -lastpass-cli libreoffice-fresh light ntfs-3g @@ -33,3 +32,4 @@ xorg-xauth xorg-xinit xorg-xrdb youtube-dl +zathura-pdf-mupdf diff --git a/dotfiles-old/scripts/oneliners.sh b/dotfiles-old/scripts/oneliners.sh index b73c222..6dc0787 100755 --- a/dotfiles-old/scripts/oneliners.sh +++ b/dotfiles-old/scripts/oneliners.sh @@ -1,75 +1,51 @@ #!/bin/sh -# a bunch of one-line programs i want in my dmenu (and sometimes elsewhere) -# these have use outside the terminal and thus are generated here -# - because why make fifty files when i can make one file that does that for me? - -cde() { - cd $1 - printf "Entered %s.\n" $(pwd) -} +# This is the place for the scripts that are a bit more involved than can be +# expressed in shell aliases or functions, or that I want to access from dmenu. +# These are pretty messy but most of them work. Pretty easy for bugs to hide in +# here so I go in with pesticide often. +set -x mkdir -p $HOME/bin/oneliners || exit -cde $HOME/bin/oneliners +cd $HOME/bin/oneliners -SHABANG="#!/bin/sh\n" -BASH_SHABANG="#!/bin/bash\n" +SUDO=doas +SHEBANG="#!/bin/sh\n" +BASH_SHEBANG="#!/bin/bash\n" DMENU_LINES="40" -TEXTS_LIBRARY="/mnt/partone/texts/" -MUSIC_LIBRARY="/mnt/audio/" - -# music stuff -printf $SHABANG"selection=\"\$(find $MUSIC_LIBRARY -type d -mindepth 2 2>/dev/null | sort | dmenu -l $DMENU_LINES)\"\n[ \$selection = \$(printf \"\\n\") ] 2>/dev/null || audacious \"\$selection\"\n" >play_album -printf $SHABANG"selection=\"\$(find $MUSIC_LIBRARY -type f | sort | dmenu -l $DMENU_LINES)\"\n[ \$selection = \$(printf \"\\n\") ] 2>/dev/null || audacious \"\$selection\"\n" >play_song - -# reading -printf $SHABANG"SELECTION=\"\$(find $TEXTS_LIBRARY -type f | sort | dmenu -l $DMENU_LINES)\" -EXTENSION=\"\$(echo \$SELECTION | asplit . 1)\" -case \$EXTENSION in - (djvu) zathura \"\$SELECTION\" ;; - (epub) zathura \"\$SELECTION\" ;; - (html) firefox \"\$SELECTION\" ;; - (pdf) zathura \"\$SELECTION\" ;; - (*) xterm -e \"cat \"\"\$SELECTION\"\" | nl | less\" ;; -esac -" >read_book # broken, xterm things flash and exit 0. - # private bookmarks -printf $SHABANG"firefox file://$HOME/bookmarks.html\n" >bmarks +printf $SHEBANG'$BROWSER file://$HOME/bookmarks.html\n' >bmarks # deemix -printf $SHABANG"python $HOME/src/deemix-pyweb/deemix-pyweb.py\n" >deemix - -# firefox (launches firefox-developer-edition) -printf $BASH_SHABANG"firefox-developer-edition \"\$@\"\n" >firefox +printf $SHEBANG'python $HOME/src/deemix-pyweb/deemix-pyweb.py\n' >deemix # settings for specific monitors -printf $SHABANG"xrandr --output HDMI-1 --auto --mode 720x480 --right-of LVDS-1\n" >1702 -printf $SHABANG"xrandr --output VGA-1 --auto --right-of LVDS-1\n" >mv720 +printf $SHEBANG'xrandr --output HDMI-1 --auto --mode 720x480 --right-of LVDS-1\n' >1702 +printf $SHEBANG'xrandr --output VGA-1 --auto --right-of LVDS-1\n' >mv720 # more monitor settings -printf $SHABANG"xrandr --output HDMI-1 --off\n" >hdmioff -printf $SHABANG"xrandr --output VGA-1 --off\n" >vgaoff +printf $SHEBANG"xrandr --output HDMI-1 --off\n" >hdmioff +printf $SHEBANG"xrandr --output VGA-1 --off\n" >vgaoff # wireguard vpn stuff -printf $BASH_SHABANG"sudo wg-quick up \"\$@\"\n" >vpn-connect -printf $BASH_SHABANG"sudo wg-quick down \"\$@\"\n" >vpn-disconnect -printf $SHABANG"sudo ls /etc/wireguard/ | grep \"conf$\" | asplit .conf 0\n" >vpn-list -printf $SHABANG"xterm -e \"vpn-connect \$(vpn-list | dmenu); read -s -n 1\"\n" >vpn-quick # not to be confused with wg-quick - -# i always forget to use multimc -printf $SHABANG"multimc\n" >minecraft - -# project i'm working on -printf $SHABANG"xterm -e \". $HOME/src/ytfeed.py/bin/activate && python $HOME/src/ytfeed.py/cli.py\"\n" >ytfeed -printf $BASH_SHABANG"cd $HOME/src/ytfeed.sh/\n./renew.sh \"\$@\"\n" >ytfeed-renew +printf $BASH_SHEBANG$SUDO' wg-quick up "$@"\n' >vpn-connect +printf $BASH_SHEBANG$SUDO' wg-quick down "$@"\n' >vpn-disconnect +printf $SHEBANG$SUDO' ls /etc/wireguard/ | grep "conf$" | awk -F ".conf" "{print $1}"\n' >vpn-list +printf $SHEBANG'xterm -e "vpn-connect $(vpn-list | dmenu); read -s -n 1"\n' >vpn-quick # not to be confused with wg-quick # youtube-dl stuff -printf $BASH_SHABANG"youtube-dl --add-metadata -i -o \"$HOME/%%(upload_date)s %%(title)s.%%(ext)s\" \"\$@\"\n" >youtube-dlo -printf $BASH_SHABANG"youtube-dlo -f \"bestvideo[vcodec=vp9]+bestaudio[acodec=opus]\" \"\$@\"\n" >youtube-dlp -printf $BASH_SHABANG"youtube-dlp -f \$(youtube-dl -F \$1 | tail +4 | dmenu -p \"Choose a format.\" -l $DMENU_LINES | awk '{ print \$1 }') \"\$@\"\n" >youtube-dl-interactive -printf $BASH_SHABANG"youtube-dl-interactive \"\$@\" -o - | mpv -\n" >youtube-dl-mpv +printf $BASH_SHEBANG"youtube-dl --add-metadata -i -o \"$HOME/%%(upload_date)s %%(title)s.%%(ext)s\" \"\$@\"\n" >youtube-dlo +printf $BASH_SHEBANG"youtube-dlo -f \"bestvideo[vcodec=vp9]+bestaudio[acodec=opus]\" \"\$@\"\n" >youtube-dlp +printf $BASH_SHEBANG"youtube-dlp -f \$(youtube-dl -F \$1 | tail +4 | dmenu -p \"Choose a format.\" -l $DMENU_LINES | awk '{ print \$1 }') \"\$@\"\n" >youtube-dl-interactive +printf $BASH_SHEBANG"youtube-dl-interactive \"\$@\" -o - | mpv -\n" >youtube-dl-mpv + +# sxhkd +printf $SHEBANG"cd '$HOME/.config/sxhkd/' +cat sxhkdrc-base sxhkdrc-bspwm >sxhkdrc +pkill sxhkd -USR1\n" >sxhkd-bspwm-reload + +set +x ls && [ $(printf "Yes.\nNo." | dmenu -p "Any risky files?") = "No." ] && printf "Making executable.\n" && chmod +x *