6 files changed, 27 insertions, 16 deletions

diff --git a/bash/.bashrc b/bash/.bashrc
index 0684e75..364d243 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -153,7 +153,7 @@ if [ -x /opt/homebrew/bin/pyenv ]; then
     eval "$(pyenv init --path)"
     eval "$(pyenv init -)"
 fi
-if [ -x /usr/local/bin/pyenv ]; then
+if [[ -x /usr/local/bin/pyenv || -x $HOME/bin/pyenv ]]; then
     # FreeBSD, probably linux
     eval "$(pyenv init -)"
 fi
@@ -181,7 +181,7 @@ fi
 [[ $PS1 && -f /usr/local/share/bash-completion/bash_completion.sh ]] && \
         source /usr/local/share/bash-completion/bash_completion.sh
 
-if [[ $OS_NAME == "FreeBSD" ]]; then
+if [[ $OS_NAME == "FreeBSD" || $OS_NAME == "OpenBSD" ]]; then
     export XDG_RUNTIME_DIR=/var/run/user/`id -u`
 fi
 #######
@@ -234,7 +234,7 @@ export HISTCONTROL="ignoredups"
 export HISTIGNORE="ls:cd"
 
 # Aliases
-alias ls='ls --color'
+#alias ls='ls --color'
 #alias fixfileperm='find /music -type f -exec chmod 0644 {} \;'
 #alias cleanremotebranches='git branch --merged | grep -v "\*" | xargs -n 1 git branch -d; git branch -r --merged master | grep -iv "master" | sed "s/origin\///" | xargs -n 1 git push --delete origin'
 alias ducks='du -cks * |sort -rn |head -11'
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 59c1f9f..19a60cd 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -161,9 +161,15 @@ bindsym $mod+r mode "resize"
 # system76: apt install brightnessctl
 # bindsym XF86MonBrightnessDown
 # bindsym XF86MonBrightnessUp
-bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -2%
-bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +2%
-bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle #&& pactl list sinks | grep '^[[:space:]]Volume:' | head -n $(( $( pactl list short sinks | sed -e 's,^\([0-9][0-9]*\)[^0-9].*,\1,' | head -n 1 ) + 1 )) | tail -n 1 | sed -e 's,.* \([0-9][0-9]*\)%.*,\1,' > $SWAYSOCK.wob
+
+# For OpenBSD
+bindsym XF86AudioLowerVolume exec sndioctl output.level=-0.5
+bindsym XF86AudioRaiseVolume exec sndioctl output.level=+0.5
+bindsym XF86AudioMute exec sndioctl output.mute=!
+# For Linux/PulseAudio:
+#bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -2%
+#bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +2%
+#bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle #&& pactl list sinks | grep '^[[:space:]]Volume:' | head -n $(( $( pactl list short sinks | sed -e 's,^\([0-9][0-9]*\)[^0-9].*,\1,' | head -n 1 ) + 1 )) | tail -n 1 | sed -e 's,.* \([0-9][0-9]*\)%.*,\1,' > $SWAYSOCK.wob
 bindsym $alt+Shift+4 exec "flameshot gui"
 bindsym $alt+$ctrl+v exec "diodon"
 
diff --git a/i3/.i3status.conf b/i3/.i3status.conf
index 9af020b..5a91729 100644
--- a/i3/.i3status.conf
+++ b/i3/.i3status.conf
@@ -1,15 +1,19 @@
 general {
 #        output_format = "xmobar"
+        output_format = "i3bar"
+        color_good = "#468f3d"
+        color_degraded = "#E5871F"
+        color_bad = "#C83839"
         colors = true
         interval = 5
 }
 
-order += "ipv6"
-order += "disk /"
-order += "run_watch DHCP"
+# order += "ipv6"
+# order += "disk /"
+# order += "run_watch DHCP"
 order += "run_watch VPN"
 order += "wireless _first_"
-order += "ethernet _first_"
+# order += "ethernet _first_"
 order += "battery 0"
 order += "load"
 order += "volume master"
@@ -30,10 +34,10 @@ ethernet _first_ {
 battery 0 {
         format = "%status %percentage %remaining"
         format_down = "No battery"
-        status_chr = "⚡ CHR"
+        status_chr = "🔌 CHR"
         status_bat = "🔋 BAT"
         status_unk = "? UNK"
-        status_full = "☻ FULL"
+        status_full = "🔌 FULL"
         path = "/sys/class/power_supply/BAT%d/uevent"
         low_threshold = 10
 }
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
index f8bf685..33fec64 100644
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -35,7 +35,7 @@ bold_italic_font Iosevka Comfy Bold Italic
 #:     italic_font      Operator Mono Book Italic
 #:     bold_italic_font Operator Mono Medium Italic
 
-font_size 12.0
+font_size 9.0
 
 #: Font size (in pts)
 
diff --git a/xorg/.Xmodmap b/xorg/.Xmodmap
index ee2ded6..68820aa 100644
--- a/xorg/.Xmodmap
+++ b/xorg/.Xmodmap
@@ -3,5 +3,6 @@ keycode 66 = Control_L
 add Control = Control_L
 
 ! Disable mouse back (6) and mouse forward (7)
-! for fm
-pointer = 1 2 3 4 5 0 0 8 9 10 11 12
+! for fm (Commented out because 11 and 12 do not
+! work in OpenBSD, but neither does FM
+! pointer = 1 2 3 4 5 0 0 8 9 10 11 12
diff --git a/xorg/.Xresources b/xorg/.Xresources
index f35da8d..35b84f3 100644
--- a/xorg/.Xresources
+++ b/xorg/.Xresources
@@ -1,4 +1,4 @@
-Xft.dpi:       96
+Xft.dpi:       128
 ! Xft.dpi:   192
 Xcursor.size: 16
 Xft.lcdfilter: lcddefault