From 7ee862d191659a1edd8f94e4a7ccaea15d3e1b11 Mon Sep 17 00:00:00 2001
From: Logan Gartner <logan@qtechofficial.com>
Date: Fri, 23 Jul 2021 14:19:27 -0600
Subject: [PATCH] Adjusted some Sway stuff

---
 .config/sway/config      | 21 ++++++++++++++-------
 .config/waybar/config    | 13 ++++++++-----
 .config/waybar/style.css |  2 +-
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/.config/sway/config b/.config/sway/config
index 2f53b8d..56f2c96 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -9,6 +9,8 @@
 #
 # Please see https://i3wm.org/docs/userguide.html for a complete reference!
 
+include /etc/sway/config.d/*
+
 set $mod Mod4
 
 # Font for window titles. Will also be used by the bar unless a different font
@@ -33,8 +35,8 @@ exec --no-startup-id nm-applet
 
 # Use pactl to adjust volume in PulseAudio.
 set $refresh_i3status killall -SIGUSR1 i3status
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5% && $refresh_i3status
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5% && $refresh_i3status
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
 bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
 
@@ -51,7 +53,7 @@ bindsym $mod+Shift+q kill
 #bindsym $mod+d exec dmenu_run
 #bindsym $mod+d exec jgmenu_run
 #bindsym $mod+d exec source ~/.bashrc && j4-dmenu-desktop --dmenu="dmenu -i -nb '#2c2e33' -nf '#cccccc' -sf '#ffffff' -sb '#4285f4'" --term="i3-sensible-terminal"
-bindsym $mod+d exec source ~/.bashrc && wofi --show drun --allow-images -G
+bindsym $mod+d exec source ~/.bashrc && wofi --show drun --allow-images -G -i
 
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
@@ -209,9 +211,11 @@ bindsym XF86AudioNext exec --no-startup-id playerctl next
 bindsym XF86AudioPrev exec --no-startup-id playerctl previous
 
 #Screenshot
-bindsym Print exec --no-startup-id flameshot gui -p ~/Pictures/Screenshots
-bindsym Shift+Print exec --no-startup-id flameshot full -p ~/Pictures/Screenshots
-bindsym Ctrl+Shift+Print exec --no-startup-id flameshot full -c
+#bindsym Print exec --no-startup-id flameshot gui -p ~/Pictures/Screenshots
+#bindsym Shift+Print exec --no-startup-id flameshot full -p ~/Pictures/Screenshots
+#bindsym Ctrl+Shift+Print exec --no-startup-id flameshot full -c
+
+bindsym Print exec --no-startup-id grim -g "$(slurp)" - | swappy -f - 
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
@@ -231,7 +235,7 @@ exec --no-startup-id kanshi &
 exec --no-startup-id lxqt-policykit-agent 2>&1 &
 exec --no-startup-id syncthing -no-browser -home="$HOME/.config/syncthing" 2>&1 &
 exec --no-startup-id kdeconnect-indicator 2>&1 &
-exec --no-startup-id xfce4-power-manager 2>&1 &
+#exec --no-startup-id xfce4-power-manager 2>&1 &
 exec --no-startup-id xss-lock -- betterlockscreen -l -t "${USER}@${HOSTNAME}" --off 10 2>&1 &
 exec --no-startup-id ~/.config/i3/customonce.sh 2>&1
 
@@ -246,6 +250,9 @@ gaps inner 5
 gaps top 0
 gaps bottom 0
 
+#before-sleep 'playerctl pause -a'
+#before-sleep 'swaylock'
+
 # Colors
 
 # class                 border  bground text    indicator child_border
diff --git a/.config/waybar/config b/.config/waybar/config
index 4a6bafa..bc96e3f 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -19,7 +19,8 @@
         "tooltip": false
     },
     "clock": {
-        "format": "{:%a %d %b %H:%M}",
+        "format": "{:%a %d %b %H:%M:%S}",
+        "interval": 1,
         "tooltip": false
     },
     "battery": {
@@ -47,8 +48,8 @@
     "tooltip": false
     },
     "pulseaudio": {
-        "format": "{icon}",
-        "format-alt": "{volume} {icon}",
+        "format": "{volume} {icon}",
+        "format-alt": "{icon}",
         "format-alt-click": "click-right",
         "format-muted": "",
         "format-icons": {
@@ -94,8 +95,10 @@
     "idle_inhibitor": {
         "format": "{icon}",
         "format-icons": {
-            "activated": "",
-            "deactivated": ""
+            //"activated": "鬒",
+            "activated": "",
+            //"deactivated": ""
+            "deactivated": "﯈"
         },
         "tooltip": false
     },
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 70e4ba5..4a22d69 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -11,7 +11,7 @@
 
 window {
     color:      rgba(217, 216, 216, 1);
-    background: rgba(35, 31, 32, 0.00);
+    background: rgba(35, 31, 32, 0.85);
 }
 
 window#waybar.solo {