From 0d261bd1bd2534d2d005cebeaed70238b981c040 Mon Sep 17 00:00:00 2001
From: Deven Blake <blakedevendesu@gmail.com>
Date: Mon, 10 May 2021 21:19:41 -0400
Subject: [PATCH] moving to bspwm, using ed, etc

---
 dotfiles-old/.Xresources                      | 41 +++++++++----------
 dotfiles-old/.aliases                         |  6 ++-
 dotfiles-old/.config/bspwm/bspwmrc            |  5 +++
 .../.config/sxhkd/{sxhkdrc => sxhkdrc-base}   | 35 +++-------------
 dotfiles-old/.config/sxhkd/sxhkdrc-bspwm      | 22 ++++++++++
 dotfiles-old/.config/sxhkd/sxhkdrc-i3wm       | 27 ++++++++++++
 dotfiles-old/.profile                         | 12 +++---
 dotfiles-old/clone.sh                         | 13 ++++--
 dotfiles-old/scripts/packages/all             |  2 +
 dotfiles-old/scripts/packages/artix_pacman    |  1 +
 .../packages/common-arch_pacman-artix_pacman  |  1 +
 .../packages/common-arch_yay-artix_yay        |  2 +
 .../common-arch_yay-artix_yay-debian_apt      |  1 -
 13 files changed, 105 insertions(+), 63 deletions(-)
 create mode 100755 dotfiles-old/.config/bspwm/bspwmrc
 rename dotfiles-old/.config/sxhkd/{sxhkdrc => sxhkdrc-base} (53%)
 create mode 100644 dotfiles-old/.config/sxhkd/sxhkdrc-bspwm
 create mode 100755 dotfiles-old/.config/sxhkd/sxhkdrc-i3wm

diff --git a/dotfiles-old/.Xresources b/dotfiles-old/.Xresources
index 395b406..a393dc5 100644
--- a/dotfiles-old/.Xresources
+++ b/dotfiles-old/.Xresources
@@ -1,19 +1,27 @@
+#define AMBER	#FFBD00
+#define BLACK	#000000
+#define PINK	#FFDBDB
+#define WHITE	#FFFFFF
+
+#define FOREGROUND BLACK
+#define BACKGROUND WHITE
+
 ! unscii font
 *faceName:	unscii:antialias=false
 *faceSize:	12
 
-*Background:	#000000
+*cursorColor:	FOREGROUND
+*Foreground:	FOREGROUND
+*Background:	BACKGROUND
 
-! amber
-!*Foreground:	#FFBF00
-!*cursorColor:	#FFBF00
-
-! pink
-*Foreground:	#FFDBDB
-*cursorColor:	#FFDBDB
-
-! black on white (first uncomment white's stuff)
-!*reverseVideo:	true
+! xterm specific stuff
+xterm*loginshell:	true
+xterm*locale:	        UTF-8
+xterm*titleModes:	16
+xterm*metaSendsEscape:	true
+xterm*utf8:	        1
+xterm*utf8Fonts:	1
+xterm*utf8Title:	true
 
 ! I used to use these but they make it really hard to see default Lynx.
 
@@ -71,14 +79,3 @@
 !*.color7:	#808080
 !*.color15:	#C0C0C0
 ! =====================================
-
-! xterm specific stuff
-
-xterm*font:	        -*-*-*-*-*-*-*-*-*-*-*-*-*-*
-xterm*loginshell:	true
-xterm*locale:	        UTF-8
-xterm*titleModes:	16
-xterm*metaSendsEscape:	true
-xterm*utf8:	        1
-xterm*utf8Fonts:	1
-xterm*utf8Title:	true
diff --git a/dotfiles-old/.aliases b/dotfiles-old/.aliases
index e6807b6..c4e41a5 100755
--- a/dotfiles-old/.aliases
+++ b/dotfiles-old/.aliases
@@ -4,11 +4,11 @@
 alias audio="sudo mount -L 'AUDIO' /mnt/audio"
 
 alias awk="nawk"
-alias cat="9 cat"
 alias cls="clear"
 alias cp="cp -iv"
 alias ipconfig="ifconfig"
 alias ls="9 ls"
+alias man="/home/trinity/src/utilities/bin/man"
 
 # other volumes
 mnt() {
@@ -21,6 +21,7 @@ alias p="ping 1.1.1.1"
 
 # media hard drive
 alias partone="sudo mount -L 'PARTONE' /mnt/partone"
+alias prat="$HOME/src/packrat/prat"
 
 pyenv() {
 	eq $# 0 \
@@ -36,9 +37,10 @@ alias tabon="xsetwacom set 'Wacom Intuos2 6x8 Pen stylus' MapToOutput VGA-1"
 
 alias tracert="tracepath"
 alias units="units --history /dev/null"
-alias vi="vim"
 alias weather="curl wttr.in/lewiston+maine?m"
 
 webm() {
 	ffmpeg -i $1 -c:v libvpx -b:v 1M -c:a libvorbis "$(printf "$1" | awk -F '.' '{print $1}')".webm
 }
+
+alias yay="paru"
diff --git a/dotfiles-old/.config/bspwm/bspwmrc b/dotfiles-old/.config/bspwm/bspwmrc
new file mode 100755
index 0000000..66df720
--- /dev/null
+++ b/dotfiles-old/.config/bspwm/bspwmrc
@@ -0,0 +1,5 @@
+#!/bin/sh
+bspc config window_gap 0
+bspc monitor -d 1 2 3 4 5 6 7 8 9 10
+pgrep -x sxhkd >/dev/null || sxhkd &
+polybar bar &
diff --git a/dotfiles-old/.config/sxhkd/sxhkdrc b/dotfiles-old/.config/sxhkd/sxhkdrc-base
similarity index 53%
rename from dotfiles-old/.config/sxhkd/sxhkdrc
rename to dotfiles-old/.config/sxhkd/sxhkdrc-base
index 1dff564..0c4affb 100755
--- a/dotfiles-old/.config/sxhkd/sxhkdrc
+++ b/dotfiles-old/.config/sxhkd/sxhkdrc-base
@@ -1,7 +1,5 @@
-#!/bin/sh
-
 control + shift + Escape
-	uxterm -e htop
+	$TERMINAL -e htop
 
 mod1 + d
 	dmenu_run
@@ -16,38 +14,15 @@ mod1 + minus
 mod1 + shift + minus
 	light -U 1
 
-mod1 + F4
-	i3-msg kill
-
-mod1 + {h,j,k,l}
-	i3-msg focus {left,down,up,right}
-
-mod1 + f
-	i3-msg fullscreen toggle
-mod1 + F11
-	i3-msg fullscreen toggle
-
-mod1 + {s,w}
-	i3-msg layout {stacking,tabbed}
-mod1 + e
-	i3-msg layout toggle split
-
-mod1 + space
-	i3-msg focus mode_toggle
-
-mod1 + shift + space
-	i3-msg floating toggle
-
-mod1 + shift + {h,j,k,l}
-	i3-msg move {left,down,up,right}
-
-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.") ] && i3-msg exit
 
 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
 
diff --git a/dotfiles-old/.config/sxhkd/sxhkdrc-bspwm b/dotfiles-old/.config/sxhkd/sxhkdrc-bspwm
new file mode 100644
index 0000000..237c6eb
--- /dev/null
+++ b/dotfiles-old/.config/sxhkd/sxhkdrc-bspwm
@@ -0,0 +1,22 @@
+# thanks weedsmokingjew
+
+mod1 + {_,shift + }F4
+	bspc node -{c,k}
+
+mod1 + {_,shift + }{1-9,0}
+	bspc {desktop -f,node -d} '^{1-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
+
+mod1 + f
+	bspc node -t '~fullscreen'
+	
+mod1 + {h,j,k,l}
+	bspc node -f {west,south,north,east}
+
+mod1 + shift + {h,j,k,l}
+	bspc node -s {west,south,north,east}
+
+mod1 + shift + r
+	bspc wm -r && pkill -USR1 -x sxhkd
diff --git a/dotfiles-old/.config/sxhkd/sxhkdrc-i3wm b/dotfiles-old/.config/sxhkd/sxhkdrc-i3wm
new file mode 100755
index 0000000..943fcaa
--- /dev/null
+++ b/dotfiles-old/.config/sxhkd/sxhkdrc-i3wm
@@ -0,0 +1,27 @@
+mod1 + F4
+	i3-msg kill
+
+mod1 + {h,j,k,l}
+	i3-msg focus {left,down,up,right}
+
+mod1 + f
+	i3-msg fullscreen toggle
+mod1 + F11
+	i3-msg fullscreen toggle
+
+mod1 + {s,w}
+	i3-msg layout {stacking,tabbed}
+mod1 + e
+	i3-msg layout toggle split
+
+mod1 + space
+	i3-msg focus mode_toggle
+
+mod1 + shift + space
+	i3-msg floating toggle
+
+mod1 + shift + {h,j,k,l}
+	i3-msg move {left,down,up,right}
+
+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.") ] && i3-msg exit
diff --git a/dotfiles-old/.profile b/dotfiles-old/.profile
index 44015bd..4a0c8dc 100644
--- a/dotfiles-old/.profile
+++ b/dotfiles-old/.profile
@@ -1,12 +1,14 @@
+BROWSER=firefox; export BROWSER
 DOOMWADDIR=/mnt/partone/misc/doomwads/; export DOOMWADDIR
-EDITOR=vim; export EDITOR
+EDITOR=ed; export EDITOR
 PAGER="less"; export PAGER
-
 PLAN9=/usr/local/plan9; export PLAN9
-
 PATH="$HOME/bin/:$HOME/bin/oneliners/:"$PATH":$PLAN9/bin"; export PATH
-
-if [ "$0" = "bash" ] || [ "$0" = "-bash" ]; then complete -c man which; fi
+TERMINAL="uxterm"; export TERMINAL
+UNITS_SYSTEM="si"; export UNITS_SYSTEM
 
 ENV=$HOME/.env; export ENV
 . $ENV
+
+if [ "$0" = "bash" ] || [ "$0" = "-bash" ]; then complete -c man which; fi
+
diff --git a/dotfiles-old/clone.sh b/dotfiles-old/clone.sh
index de052c6..7d89fd9 100755
--- a/dotfiles-old/clone.sh
+++ b/dotfiles-old/clone.sh
@@ -1,19 +1,26 @@
 #!/bin/sh
-[ "$(printf "Abort.\nContinue.\n" | dmenu -p "Current path is '$(pwd)'. Continue?")" = "Continue." ] || return || exit
+[ "$(printf "Abort.\nContinue.\n" | dmenu -p "Current path is '$(pwd)'. Continue?")" = "Continue." ] || exit
 set -x
 cp $HOME/.Xresources ./
 cp $HOME/.aliases ./
-#cp $HOME/.bashrc ./
 cp $HOME/.env ./
 cp $HOME/.profile ./
 cp $HOME/.vimrc ./
+
 mkdir -p ./.config/
 cp $HOME/.config/ytfeed-config.txt ./.config/
+
+mkdir -p ./.config/bspwm
+cp $HOME/.config/bspwm/bspwmrc ./.config/bspwm/bspwmrc
+
 mkdir -p ./.config/i3
 cp $HOME/.config/i3/config ./.config/i3/config
 mkdir -p ./.config/i3status
 cp $HOME/.config/i3status/config ./.config/i3status/config
+
 mkdir -p ./.config/sxhkd
-cp $HOME/.config/sxhkd/sxhkdrc ./.config/sxhkd/sxhkdrc
+cp $HOME/.config/sxhkd/* ./.config/sxhkd/
+rm ./.config/sxhkd/sxhkdrc
+
 mkdir -p ./src/dmenu
 cp $HOME/src/dmenu/config.h ./src/dmenu/config.h
diff --git a/dotfiles-old/scripts/packages/all b/dotfiles-old/scripts/packages/all
index a192c18..2f49f91 100644
--- a/dotfiles-old/scripts/packages/all
+++ b/dotfiles-old/scripts/packages/all
@@ -1,4 +1,5 @@
 adb
+alsa-utils
 anki
 audacious
 blender
@@ -58,6 +59,7 @@ vlc
 wget
 wireguard-tools
 xclip
+xf86-input-wacom
 xscreensaver
 xterm
 zathura
diff --git a/dotfiles-old/scripts/packages/artix_pacman b/dotfiles-old/scripts/packages/artix_pacman
index 8c0b389..6e228df 100644
--- a/dotfiles-old/scripts/packages/artix_pacman
+++ b/dotfiles-old/scripts/packages/artix_pacman
@@ -1,5 +1,6 @@
 acpid
 acpid-openrc
+fuse-openrc
 iwd-openrc
 libvirt-openrc
 openresolv
diff --git a/dotfiles-old/scripts/packages/common-arch_pacman-artix_pacman b/dotfiles-old/scripts/packages/common-arch_pacman-artix_pacman
index 5040b0f..28dc6f6 100644
--- a/dotfiles-old/scripts/packages/common-arch_pacman-artix_pacman
+++ b/dotfiles-old/scripts/packages/common-arch_pacman-artix_pacman
@@ -23,6 +23,7 @@ pulseaudio-bluetooth
 python-pip
 qemu-arch-extra
 qt5-imageformats
+stalonetray
 ttf-dejavu
 vi
 which
diff --git a/dotfiles-old/scripts/packages/common-arch_yay-artix_yay b/dotfiles-old/scripts/packages/common-arch_yay-artix_yay
index 0990b3c..1e994b2 100644
--- a/dotfiles-old/scripts/packages/common-arch_yay-artix_yay
+++ b/dotfiles-old/scripts/packages/common-arch_yay-artix_yay
@@ -12,6 +12,8 @@ i3-gaps
 i3-swallow
 instagram-scraper
 iwgtk
+lemonbar-git
+makebootfat
 minecraft-launcher
 mullvad-vpn-beta
 multimc5
diff --git a/dotfiles-old/scripts/packages/common-arch_yay-artix_yay-debian_apt b/dotfiles-old/scripts/packages/common-arch_yay-artix_yay-debian_apt
index ea1c287..af6e452 100644
--- a/dotfiles-old/scripts/packages/common-arch_yay-artix_yay-debian_apt
+++ b/dotfiles-old/scripts/packages/common-arch_yay-artix_yay-debian_apt
@@ -1,3 +1,2 @@
 moon-buggy
-ne
 syncterm