changes of sorts

15 files changed, 88 insertions, 36 deletions

diff --git a/config/bg b/config/bg
index 2417a7a..26e454c 100644
--- a/config/bg
+++ b/config/bg
diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc
index 7fa53fa..febf406 100755
--- a/config/bspwm/bspwmrc
+++ b/config/bspwm/bspwmrc
@@ -1,13 +1,34 @@
 #!/bin/sh
 
+setup=1
+
 COLOR_BACKGROUND="#151515"
 COLOR_PRIMARY="#f58f44"
 COLOR_SECONDARY="#5977b3"
 
 xsetroot -cursor_name left_ptr &
 xrdb ~/.Xdefaults
-
-bspc monitor  -d a1 a2 a3 a4 a5 a6 a7 a8 a9
+bash $HOME/.config/xrandr.xi.sh
+
+if [ "$setup" = "0" ]; then
+    bspc monitor DP-0 -n A
+    bspc monitor A -d a1 a2 a3 a4 a5 a6 a7 a8 a9
+    bspc monitor DP-3 -n B
+    bspc monitor B -d b1 b2 b3 b4 b5 b6 b7 b8 b9
+    bspc monitor DP-4 -n C
+    bspc monitor C -d c1 c2 c3 c4 c5 c6 c7 c8 c9
+    bspc monitor HDMI-0 -n D
+    bspc monitor D -d d1 d2
+else
+    bspc monitor DP-3 -n A
+    bspc monitor A -d a1 a2 a3 a4 a5 a6 a7 a8 a9
+    bspc monitor DP-1 -n B
+    bspc monitor B -d b1 b2 b3 b4 b5 b6 b7 b8 b9
+    bspc monitor DP-2 -n C
+    bspc monitor C -d c1 c2 c3 c4 c5 c6 c7 c8 c9
+    bspc monitor HDMI-1 -n D
+    bspc monitor D -d d1 d2
+fi
 
 pgrep -x sxhkd > /dev/null || sxhkd &
 pgrep -x picom > /dev/null || picom &
@@ -28,4 +49,4 @@ wmname bspwm
 
 urxvt &
 
-$HOME/.scripts/start-mpd
+sleep 1; $HOME/.scripts/start-mpd
diff --git a/config/mpd/mpd.conf b/config/mpd/mpd.conf
index 13afec6..b086d5e 100644
--- a/config/mpd/mpd.conf
+++ b/config/mpd/mpd.conf
@@ -3,15 +3,15 @@ input {
         plugin "curl"
 }
 
-#audio_output {
-#	type		"httpd"
-#	name		"My HTTP Stream"
-#	encoder		"lame"		    # optional, vorbis or lame
-#	port		"6680"      
-#	bitrate		"420"	
-#	format		"44100:16:1"
-#	max_clients	"0"	
-#}
+audio_output {
+	type		"httpd"
+	name		"My HTTP Stream"
+	encoder		"lame"		    # optional, vorbis or lame
+	port		"6680"
+	bitrate		"420"
+	format		"44100:16:1"
+	max_clients	"0"
+}
 
 audio_output {
 	type		"pulse"
@@ -20,10 +20,10 @@ audio_output {
 
 audio_output {
        type            "fifo"
-       name            "Visualizer feed"          
-       path            "/tmp/mpd.fifo"           
-       format          "44100:16:2"               
-}                 
+       name            "Visualizer feed"
+       path            "/tmp/mpd.fifo"
+       format          "44100:16:2"
+}
 
 db_file            "~/.config/mpd/database"
 log_file           "syslog"
diff --git a/config/polybar/config b/config/polybar/config
index 2a090db..e519a18 100644
--- a/config/polybar/config
+++ b/config/polybar/config
@@ -169,8 +169,8 @@ time-format = %H:%M
 format-charging = <animation-charging> <label-charging>
 format-discharging = <ramp-capacity> <label-discharging>
 
-label-charging = %percentage%%
-label-discharging = %percentage%%
+label-charging = -%percentage%%
+label-discharging = -%percentage%%
 label-full = %percentage%%
 
 ramp-capacity-0 = 
diff --git a/config/polybar/launch.sh b/config/polybar/launch.sh
index ca8d77e..01e4b17 100755
--- a/config/polybar/launch.sh
+++ b/config/polybar/launch.sh
@@ -6,4 +6,19 @@ killall -q polybar
 # Wait until the processes have been shut down
 while pgrep -u $UID -x polybar >/dev/null; do sleep 0.1; done
 
+# Launch Polybar, using default config location ~/.config/polybar/config
+#polybar music &
+
+#MONITOR=DP-0 polybar --reload  wsonly &
+
+export MONITOR=DP-1
+polybar wsonly &
+
+export MONITOR=DP-2
+polybar wsonly &
+
+export MONITOR=HDMI-1
+polybar wsonly &
+
+export MONITOR=DP-3
 polybar ws &
diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc
index 80feba1..7f87bbd 100644
--- a/config/sxhkd/sxhkdrc
+++ b/config/sxhkd/sxhkdrc
@@ -17,7 +17,6 @@ super + ctrl + alt + f
 {XF86AudioMute}
 	amixer -D pulse set Master 1+ toggle
 
-# runner
 super + r
 	rofi -show drun -show-icons  
 
@@ -220,15 +219,18 @@ super + {_,shift +}w
 
 # float the window
 super + f
- if [ -z "$(bspc query -N -n focused.floating)" ]; then \
-        bspc node focused -t floating; \
-    else \
-        bspc node focused -t tiled; \
-    fi
+    [ -z "$(bspc query -N -n focused.floating)" ] && \
+        bspc node focused -t floating || \
+        bspc node focused -t tiled;
 
 super + ctrl + f
 	bspc node -t \~fullscreen
 
+# pseudotile
+super + p
+    bspc node focused -t pseudo_tiled
+
+
 #
 # focus/swap
 #
diff --git a/mkshrc b/mkshrc
index 8a9023f..641c376 100644
--- a/mkshrc
+++ b/mkshrc
@@ -19,7 +19,6 @@ if [ -x /usr/bin/dircolors ]; then
 fi
 
 [ -f ~/.sh_aliases ] && . ~/.sh_aliases
-[ -f ~/.profile ] && . ~/.profile
 
 # parse the current branch and status of git to be added to the prompt
 function parse_git_branch() {
diff --git a/profile b/profile
index 07ee1a8..f1a814d 100644
--- a/profile
+++ b/profile
@@ -8,7 +8,7 @@
 alias  editor=vim
 
 export TERMINAL="urxvt"
-export BROWSER="/usr/bin/chromium-browser"
+export BROWSER="/usr/bin/firefox"
 export FILE_MANAGER="/usr/bin/thunar"
 export EMAIL_CLIENT="/usr/bin/thunderbird"
 export EDITOR="/usr/bin/vim"
diff --git a/scripts/bg.sh b/scripts/bg.sh
index decf4f1..e6f6999 100755
--- a/scripts/bg.sh
+++ b/scripts/bg.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-feh --force-aliasing --bg-tile ~/.config/dither.png
-#feh --force-aliasing --bg-fill ~/.config/bg
+#feh --force-aliasing --bg-tile ~/.config/dither.png
+feh --force-aliasing --bg-fill ~/.config/bg
diff --git a/scripts/cinema.sh b/scripts/cinema.sh
index 46c7082..f7a0f23 100755
--- a/scripts/cinema.sh
+++ b/scripts/cinema.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-MAIN_DP=DP-0;  
+MAIN_DP=DP-3;  
 v=$(xrandr --current --verbose | grep "Brightness" | cut -f2 -d " " | tr '\n' '*' | rev | cut -c 2- | rev | sed -e "s/$/==1/" | bc -l | grep -q 0 && echo 1 || echo 0); xrandr | grep " connected" | cut -f1 -d " " | while read -r line; do echo $line | grep -q $MAIN_DP && : || xrandr --output $line --brightness $v; done
diff --git a/scripts/ddc-switch-inputs b/scripts/ddc-switch-inputs
index d85fed2..d298fac 100755
--- a/scripts/ddc-switch-inputs
+++ b/scripts/ddc-switch-inputs
@@ -15,5 +15,5 @@ case $1 in
       ;;
 esac
 
-ddcutil --bus=5 setvcp 60 ${OUT[0]} &
+ddcutil --bus=23 setvcp 60 ${OUT[0]} &
 wait
diff --git a/scripts/powermenu b/scripts/powermenu
index a1ac5f4..2ce5901 100755
--- a/scripts/powermenu
+++ b/scripts/powermenu
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-printf "suspend\nreboot\npoweroff\nhibernate" | rofi -dmenu -p "systemctl" | xargs -r systemctl
+printf "pm-suspend reboot poweroff" | rofi -dmenu -p "power" | xargs -r 
diff --git a/scripts/tablet b/scripts/tablet
index ec3eefa..0965395 100755
--- a/scripts/tablet
+++ b/scripts/tablet
@@ -1,6 +1,9 @@
 #!/usr/bin/python
 import sys
 
+if len(sys.argv) < 3:
+    print("Usage: tablet [dev number] [property number] [scale factor] [aspect ratio]")
+
 #Arguments
 dev = sys.argv[1]
 prop = sys.argv[2]
@@ -8,11 +11,18 @@ scale = float(sys.argv[3])
 tablet_ratio = (lambda s: float(s[0]) / float(s[1]))(sys.argv[4].split(":")) if len(sys.argv) > 4 else 16/9
 
 #Layout of screens: (x, y, w, h)
+#screens = [
+#	(0, 0, 1280, 1024),
+#	(1280, 0, 2560, 1440),
+#	(3840, 0, 1080, 1920),
+#	(4920, 0, 1080, 1920),
+#]
+
 screens = [
 	(0, 0, 1280, 1024),
 	(1280, 0, 2560, 1440),
-	(3840, 0, 1080, 1920),
-	(4920, 0, 1080, 1920),
+	(3840, 0, 1920, 1080),
+	(5760, 0, 1920, 1080),
 ]
 
 #TODO find this with xrandr
diff --git a/sh_aliases b/sh_aliases
index 24e7106..f8a70ed 100644
--- a/sh_aliases
+++ b/sh_aliases
@@ -1,3 +1,5 @@
+alias sudo="doas"
+
 alias l="ls -lah"
 
 alias cls="clear"
@@ -47,11 +49,11 @@ bitrate () {
 }
 
 alias syncdir="sudo rsync -rv --no-perms --no-owner --no-group --delete"
-alias chromium-tor="chromium --incognito --proxy-server=socks5://localhost:9050 --user-data-dir=/tmp/tor"
-alias chromium-i2p="chromium --incognito --proxy-server=socks5://localhost:4447 --user-data-dir=/tmp/i2p"
+alias chromium-tor="chromium-browser --incognito --proxy-server=socks5://localhost:9050 --user-data-dir=/tmp/tor"
+alias chromium-i2p="chromium-browser --incognito --proxy-server=socks5://localhost:4447 --user-data-dir=/tmp/i2p"
 
 alarmclock () {
-    sudo rtcwake -m no -t "$(date -d 'tomorrow 07:00:00' '+%s')" && echo 'set alarm for tomorrow at 7am'
+    sudo rtcwake -m no -t "$(date -d '07:00:00' '+%s')" && echo 'set alarm for tomorrow at 7am'
 }
 
 # does tail -f on a dir... bit of a hack
@@ -72,3 +74,4 @@ passthrough_enable () {
     sudo mv /etc/modprobe.d/vfio.conf /etc/modprobe.d/vfio.conf.disabled
 }
 alias links="xlinks -g -html-g-text-color 0xf58f44 -html-g-background-color 0x191919 -font /home/david/.fonts/ttf-mononoki/mononoki-Regular.ttf"
+alias weechat="weechat -d ~/.weechat"
diff --git a/xinitrc b/xinitrc
index acf3072..0d5e974 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1,3 +1,5 @@
 xrdb ~/.Xdefaults
+eval $(gnome-keyring-daemon --start)
+export SSH_AUTH_SOCK
 exec bspwm