From b90e03fc035a45769adcd364e1204728a93181ce Mon Sep 17 00:00:00 2001
From: Marco Thomas <mail@marco-thomas.net>
Date: Mon, 22 Mar 2021 11:45:17 +0100
Subject: [PATCH] Updoots

---
 files/.config/polybar/config                  | 30 ++++++++-----------
 files/.zshrc                                  |  2 +-
 files/scripts/dmenu-power.sh                  | 22 --------------
 files/scripts/{fix-mouse.sh => fix_mouse.sh}  |  0
 .../{key-bindings.zsh => key_bindings.zsh}    |  0
 files/scripts/polybar.sh                      |  1 -
 6 files changed, 13 insertions(+), 42 deletions(-)
 delete mode 100755 files/scripts/dmenu-power.sh
 rename files/scripts/{fix-mouse.sh => fix_mouse.sh} (100%)
 rename files/scripts/{key-bindings.zsh => key_bindings.zsh} (100%)

diff --git a/files/.config/polybar/config b/files/.config/polybar/config
index 80b4c7f..8d2d820 100644
--- a/files/.config/polybar/config
+++ b/files/.config/polybar/config
@@ -51,33 +51,22 @@ fixed-center = true
 
 line-size = 0
 
+tray-position = right
+
 font-0 = "Product Sans:pixelsize=10:weight=regular;2"
-#font-1 = "Noto Sans CJK JP:antialiase=false:pixelsize=11;3"
-font-1 = "Stick:pixelsize=13;3"
+font-1 = "Stick:pixelsize=13;2"
 font-2 = "Material Design Icons:size=10;3"
 
 wm-restack = i3
 
 modules-left = i3 spotify
 modules-center = date
-modules-right = volume
-
-[bar/bottom]
-inherit = bar/main
-
-bottom = true
-override-redirect = true
-
-modules-left = memory cpu
-modules-center =
-modules-right =
-
-tray-position = right
+modules-right = memory cpu volume sep
 
 [bar/laptop]
 inherit = bar/main
 
-modules-right = volume battery
+modules-right = memory cpu volume battery sep
 
 # ======================================== MODULES
 [module/i3]
@@ -175,7 +164,8 @@ animation-charging-framerate = 1000
 
 [module/volume]
 type = internal/pulseaudio
-format-volume = <bar-volume>
+format-volume = <label-volume>
+#<bar-volume>
 
 interval = 2
 
@@ -248,4 +238,8 @@ format-connected = <label-connected>
 format-connected-prefix = "󰤨  "
 label-connected = %essid%
 
-format-disconnected = "󰤮 No Connection"
\ No newline at end of file
+format-disconnected = "󰤮 No Connection"
+
+[module/sep]
+type = custom/text
+content = |
\ No newline at end of file
diff --git a/files/.zshrc b/files/.zshrc
index 262c9be..d8c0bc4 100644
--- a/files/.zshrc
+++ b/files/.zshrc
@@ -146,7 +146,7 @@ export FZF_DEFAULT_OPTS='--preview="head {}" --layout=reverse --bind=tab:down --
 ## fzf Bindings in zsh (C-r and C-t)
 if [[ -x $(which fzf 2> /dev/null) ]]
 then
-    source ~/scripts/key-bindings.zsh
+    source ~/scripts/key_bindings.zsh
 else
     bindkey '^R' history-incremental-search-backward
 fi
diff --git a/files/scripts/dmenu-power.sh b/files/scripts/dmenu-power.sh
deleted file mode 100755
index 1914ede..0000000
--- a/files/scripts/dmenu-power.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-FONT="Product Sans:pixelsize=15:antialias=true:rgba=rgb"
-BGCOL="#000000"
-FGCOL="#ffffff"
-SELBGCOL="#98c379"
-SELFGCOL="#000000"
-
-COMMANDS="
-poweroff\n
-reboot\n
-lock\n
-"
-
-command=$(echo -e $COMMANDS | \
-    dmenu -fn "$FONT" -nb $BGCOL -nf $FGCOL -sb $SELBGCOL -sf $SELFGCOL)
-[ "$command" = "" ] && exit 1
-if [ "$command" = "lock" ]; then
-    lock.sh && exit 0
-else
-    systemctl $command && exit 0
-fi
diff --git a/files/scripts/fix-mouse.sh b/files/scripts/fix_mouse.sh
similarity index 100%
rename from files/scripts/fix-mouse.sh
rename to files/scripts/fix_mouse.sh
diff --git a/files/scripts/key-bindings.zsh b/files/scripts/key_bindings.zsh
similarity index 100%
rename from files/scripts/key-bindings.zsh
rename to files/scripts/key_bindings.zsh
diff --git a/files/scripts/polybar.sh b/files/scripts/polybar.sh
index 64e62a9..89d198e 100755
--- a/files/scripts/polybar.sh
+++ b/files/scripts/polybar.sh
@@ -3,7 +3,6 @@ while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
 
 if type "xrandr"; then
   for mon in $(xrandr --query | grep " connected" | cut -d" " -f1); do
-      MONITOR=$mon polybar --reload bottom &
     if [ $mon = "eDP"  ]; then
       MONITOR=$mon polybar --reload laptop &
     else