From 8058ac36a359423cbb877937eb327a1e7411c707 Mon Sep 17 00:00:00 2001
From: Josh Fabean <me@joshfabean.com>
Date: Mon, 4 May 2020 12:15:13 -0500
Subject: [PATCH] updated things

---
 .config/polybar/config    | 16 ++++++++--------
 .config/polybar/launch.sh |  2 +-
 .config/sway/golem-sway   | 30 ++++++++++++++++++++++++------
 .config/waybar/config     |  9 +++++++--
 .config/waybar/style.css  |  2 ++
 5 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/.config/polybar/config b/.config/polybar/config
index 8bd4d42..40dd5ba 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -9,18 +9,18 @@
 
 [colors]
 ;background = ${xrdb:color0:#222}
-background = #0c1014
-background-alt = #195466
+background = #1d2021
+background-alt = #17917a
 ;foreground = ${xrdb:color7:#222}
 foreground = #dfdfdf
 foreground-alt = #555
-primary = #33859e
+primary = #17917a
 secondary = #e60053
 alert = #bd2c40
 
 
-[bar/hdmi0]
-monitor = ${env:MONITOR:HDMI-0}
+[bar/DP-1]
+monitor = ${env:MONITOR:DP-1}
 width = 100%
 height = 27
 ;offset-x = 1%
@@ -49,7 +49,7 @@ font-2 = DejaVue Sans Mono:pixelsize=10;1
 
 modules-left = i3
 modules-center =
-modules-right =
+modules-right = xbacklight wlan cpu memory temperature battery volume date
 
 tray-position = right
 tray-padding = 0
@@ -65,8 +65,8 @@ cursor-click = pointer
 cursor-scroll = ns-resize
 
 
-[bar/dvid0]
-monitor = ${env:MONITOR:DVI-D-0}
+[bar/DP-2]
+monitor = ${env:MONITOR:DP-2}
 width = 100%
 height = 27
 ;offset-x = 1%
diff --git a/.config/polybar/launch.sh b/.config/polybar/launch.sh
index 05c18fb..d57c6fd 100755
--- a/.config/polybar/launch.sh
+++ b/.config/polybar/launch.sh
@@ -7,7 +7,7 @@ killall -q polybar
 while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
 
 # Launch bar1 and bar2
-polybar hdmi0 & polybar dvid0 &
+polybar DP-1 & polybar DP-2 &
 
 
 echo "Bars launched..."
diff --git a/.config/sway/golem-sway b/.config/sway/golem-sway
index a11064f..687e7a3 100644
--- a/.config/sway/golem-sway
+++ b/.config/sway/golem-sway
@@ -219,10 +219,27 @@ bindsym $mod+Control+Left resize shrink width 5 px or 5 ppt
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
-bar {
-   swaybar_command waybar
-}
-
+#bar {
+#   swaybar_command waybar
+#}
+#
+
+#bar {
+#  position top
+#  status_command i3blocks
+#  font pango:Liberation 10, FontAwesome 12
+#  strip_workspace_numbers yes
+#
+#  colors {
+#    separator #586e75
+#    background #0c1014
+#    statusline #aea79f
+#    focused_workspace #091f2e #091f2e #ffffff
+#    active_workspace #073642 #073642 #ffffff
+#    inactive_workspace #0c1014 #0c1014 #aea79f
+#    urgent_workspace #77216f #77216f #ffffff
+#  }
+#}
 # class                 border  backgr. text    indicator child_border
 client.focused          #FFFFFF #BF360C #fdf6e3 #FF0000 #FFFFFF
 client.focused_inactive #073642 #FF9800 #93a1a1 #002b36 #073642
@@ -233,9 +250,10 @@ client.urgent           #dc322f #b71c1c #fdf6e3 #dc322f #dc322f
 ## Displays
 ############################
 #HOME
-output HDMI-A-2 pos 0 0 res 1920x1080
+#output HDMI-A-2 pos 0 0 res 1920x1080
 #output DP-1 pos 1920 0 res 1920x1200
-output DP-1 pos 1920 0 res 3440x1440
+output DP-1 pos 0 1080 res 3440x1440
+output DP-2 pos 440 0 res 2560x1080
 #FFICE
 #output DVI-D-1 pos 0 0 res 1920x1080
 #output HDMI-A-1 pos 0 0 res 1920x1080
diff --git a/.config/waybar/config b/.config/waybar/config
index f6149b4..1890ba7 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -191,8 +191,9 @@
             "default": "🎜"
         },
         "escape": true,
-        "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
-        // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
+        //"exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
+        "exec": "$HOME/.config/waybar/mediaplayer.py --player tuijam 2> /dev/null",
+        "on-click": "playerctl -p tuijam play-pause"
     },
     "custom/watson": {
         "format": "{} ",
@@ -205,5 +206,9 @@
         "format": "",
         "interval": 1000,
         "on-click": "qalculate-gtk"
+    },
+    "custom/playerctl": {
+        "format": "{}",
+        "exec": ""
     }
 }
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index ea270a3..1c83b15 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -134,6 +134,8 @@ label:focus {
 
 #custom-media {
     min-width: 100px;
+    padding-top: 5px;
+    padding-left: 15px;
 }
 
 #custom-media.custom-spotify {