Merge branch 'master' of git.cheetah.remote:dot

14 files changed, 30 insertions, 25 deletions

diff --git a/.local/share/kaomoji b/.local/share/kaomoji
index 6c8d1d3..b03258a 100644
--- a/.local/share/kaomoji
+++ b/.local/share/kaomoji
@@ -451,3 +451,4 @@ o(>< )o⌒*			Mad (3)
 (；^＿^)ッ☆(　゜o゜) 		Slapping
 ＼（～Ｏ～）／ 			Good Morning
 \＿(´▽｀)♪＿/ 			Bathtub
+( • )( • )ԅ(≖‿≖ԅ)       BOOB
diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc
index a9f1bb8..ccd9cc1 100755
--- a/config/bspwm/bspwmrc
+++ b/config/bspwm/bspwmrc
@@ -10,6 +10,7 @@ xsetroot -cursor_name left_ptr &
 xrdb ~/.Xdefaults
 
 pgrep -x sxhkd > /dev/null || sxhkd &
+pgrep -x picom > /dev/null || picom &
 pgrep -x xss-lock > /dev/null || xss-lock slock &
 pgrep -x bg.sh > /dev/null || $HOME/.scripts/bg.sh > /dev/null &
 
diff --git a/config/cava/config b/config/cava/config
index 9f8e2b8..2ddd926 100644
--- a/config/cava/config
+++ b/config/cava/config
@@ -58,8 +58,8 @@
 # For shmem 'source' will be /squeezelite-AA:BB:CC:DD:EE:FF where 'AA:BB:CC:DD:EE:FF' will be squeezelite's MAC address
 ; source = auto
 
-; method = alsa
-; source = hw:Loopback,1
+method = alsa
+ source = hw:Loopback,1
 
 ; method = fifo
 ; source = /tmp/mpd.fifo
diff --git a/config/gtk-3.0/bookmarks b/config/gtk-3.0/bookmarks
index d741357..3bdccb3 100644
--- a/config/gtk-3.0/bookmarks
+++ b/config/gtk-3.0/bookmarks
@@ -1,3 +1,4 @@
+file:///home/x/pics/screenshot
 file:///home/david/hd1/important
 file:///home/david/docs docs
 file:///home/david/pics pics
diff --git a/config/mpd/mpd.conf b/config/mpd/mpd.conf
index 679ebd1..b086d5e 100644
--- a/config/mpd/mpd.conf
+++ b/config/mpd/mpd.conf
@@ -14,14 +14,6 @@ audio_output {
 }
 
 audio_output {
-	type		"httpd"
-	name		"HQ HTTP Stream"
-	encoder		"wave"		    # optional, vorbis or lame
-	port		"6681"
-	max_clients	"0"
-}
-
-audio_output {
 	type		"pulse"
 	name		"mpd"
 }
diff --git a/config/picom/picom.conf b/config/picom/picom.conf
index 4407cc1..68d0f83 100644
--- a/config/picom/picom.conf
+++ b/config/picom/picom.conf
@@ -289,8 +289,8 @@ blur-background-exclude = [
 # `xrender` is the default one.
 #
 experimental-backends = true;
-#backend = "glx";
-backend = "xrender";
+backend = "glx";
+#backend = "xrender";
 #backend = "xr_glx_hybrid";
 
 
@@ -405,14 +405,14 @@ detect-client-leader = true
 # has actually changed. Potentially degrades the performance, but might fix some artifacts.
 # The opposing option is use-damage
 #
-no-use-damage = true
-use-damage = false
+# no-use-damage = false
+use-damage = true
 
 # Use X Sync fence to sync clients' draw calls, to make sure all draw 
 # calls are finished before picom starts drawing. Needed on nvidia-drivers 
 # with GLX backend for some users.
 #
-#xrender-sync-fence = true
+xrender-sync-fence = true
 
 # GLX backend: Use specified GLSL fragment shader for rendering window contents. 
 # See `compton-default-fshader-win.glsl` and `compton-fake-transparency-fshader-win.glsl` 
diff --git a/config/polybar/config b/config/polybar/config
index ec82e1e..6267651 100644
--- a/config/polybar/config
+++ b/config/polybar/config
@@ -43,7 +43,7 @@ inherit                   = bar/base
 width                     = 100%
 offset-x                  = 0 
 modules-left              = workspaces xwindow
-modules-right		      = mpd temperature memory wlan battery pulseaudio microphone time
+modules-right		      = mpd temperature memory network battery pulseaudio microphone time
 tray-position		      = right
 background		          = ${color.bga}
 border-size		          = 0
diff --git a/config/rofi/colors-rofi-dark.rasi b/config/rofi/colors-rofi-dark.rasi
index 0be691d..180889d 100644
--- a/config/rofi/colors-rofi-dark.rasi
+++ b/config/rofi/colors-rofi-dark.rasi
@@ -21,6 +21,7 @@
     selected-urgent-foreground: @background2;
 
     text-color:			@foreground;
+    border-color:       @foreground;
 
     background-color: #00000000;
     background: #191919;
diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc
index 17067d0..751e118 100644
--- a/config/sxhkd/sxhkdrc
+++ b/config/sxhkd/sxhkdrc
@@ -17,6 +17,14 @@ super + ctrl + alt + f
 {XF86AudioMute}
 	amixer -D pulse set Master 1+ toggle
 
+{_, super} + XF86MonBrightnessDown
+    xbacklight - {10,1}
+{_, super} + XF86MonBrightnessUp
+    xbacklight + {10,1}
+    
+
+
+
 super + r
 	rofi -show drun -show-icons  
 
diff --git a/mkshrc b/mkshrc
index c7ddf96..641c376 100644
--- a/mkshrc
+++ b/mkshrc
@@ -50,8 +50,6 @@ function parse_git_dirty {
         [ ! "${bits}" == "" ] && echo " ${bits}" || echo ""
 }
 
-#set -o vi
-
 bind '^L=clear-screen'
 
 export PS1=$(echo -e "\e[0;97m\${PWD/#\$HOME/\~}\e[0;37m\`parse_git_branch\` > \e[0;0m")
diff --git a/profile b/profile
index f1a814d..2fa45f7 100644
--- a/profile
+++ b/profile
@@ -5,10 +5,11 @@
 [ -d "$HOME/.local/bin" ] && PATH="$HOME/.local/bin:$PATH"
 [ -d "$HOME/.scripts" ] && PATH="$HOME/.scripts:$PATH"
 
+export XDG_RUNTIME_DIR=/tmp/$USER-$(uuidgen)
 alias  editor=vim
 
 export TERMINAL="urxvt"
-export BROWSER="/usr/bin/firefox"
+export BROWSER="/usr/bin/chromium-browser"
 export FILE_MANAGER="/usr/bin/thunar"
 export EMAIL_CLIENT="/usr/bin/thunderbird"
 export EDITOR="/usr/bin/vim"
diff --git a/scripts/battery_level b/scripts/battery_level
new file mode 100755
index 0000000..7bc27d1
--- /dev/null
+++ b/scripts/battery_level
@@ -0,0 +1,4 @@
+#!/bin/sh
+full=$(cat /sys/class/power_supply/BAT0/charge_now) 
+now=$(cat /sys/class/power_supply/BAT0/charge_full)
+echo $full / $now  \* 100 | bc -l
diff --git a/scripts/fzf_menu.sh b/scripts/fzf_menu.sh
index 8f6238f..3aecaf7 100755
--- a/scripts/fzf_menu.sh
+++ b/scripts/fzf_menu.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-file=$(fzf $@)
+file="$(fzf $@)"
 xdg-open $file &
diff --git a/scripts/tablet b/scripts/tablet
index 8190919..f283635 100755
--- a/scripts/tablet
+++ b/scripts/tablet
@@ -20,21 +20,19 @@ tablet_ratio = (lambda s: float(s[0]) / float(s[1]))(sys.argv[4].split(":")) if
 
 screens = [
 	(0, 0, 1920, 1080),
-	(0, 1080, 1920, 1080),
-	(1920, 1080, 2560, 1440),
 ]
 
 #TODO find this with xrandr
 
-target = screens[2]
+target = screens[0]
 
 #Physical offset of the selected screen
 offsetx = target[0]
 offsety = target[1]
 
 #Size of the full screen areas
-sh = 1080+ 1440
-sw = 1920 + 2560
+sh = 1080
+sw = 1920
 #TODO calculate using list of screens
 
 #Aspect ratio of the tablet, to avoid weird scaling problems