lots of sway-related changes

4 files changed, 97 insertions, 148 deletions

diff --git a/config/sway/config b/config/sway/config
index 6dec471..5e951d2 100644
--- a/config/sway/config
+++ b/config/sway/config
@@ -1,9 +1,3 @@
-# Default config for sway
-#
-# Copy this to ~/.config/sway/config and edit it to your liking.
-#
-# Read `man 5 sway` for a complete reference.
-
 ### Variables
 #
 # Logo key. Use Mod1 for Alt.
@@ -21,15 +15,15 @@ set $term kitty
 #set $menu dmenu_path | dmenu | xargs swaymsg exec --
 set $menu wofi --show=drun | xargs swaymsg exec --
 
-font SauceCodePro Nerd Font 10
-default_border pixel 2
+font JetBrainsMono Nerd Font Mono 9
+default_border pixel 1
 smart_borders on
 
 ### Output configuration
 #
 # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-output * background ~/Pictures/marfa.jpg fill
-#
+output * background /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1366x768.png fill
+
 # Example configuration:
 #
 #   output HDMI-A-1 resolution 1920x1080 position 1920,0
@@ -72,6 +66,17 @@ output * background ~/Pictures/marfa.jpg fill
         xkb_options ctrl:nocaps
     }
 
+### wob indicator
+
+set $WOBSOCK $XDG_RUNTIME_DIR/wob.sock
+exec rm -f $WOBSOCK && mkfifo $WOBSOCK && tail -f $WOBSOCK | \
+    wob --border-color "#676364ff" \
+        --background-color "#dee2e0ff" \
+        --bar-color "#676364ff" \
+        --offset 0 \
+        --border 1 \
+        --padding 5
+
 ### Key bindings
 #
 # Basics:
@@ -101,15 +106,15 @@ output * background ~/Pictures/marfa.jpg fill
     bindsym $mod+Shift+comma exec 1password --toggle
 
     # Media keys
-    bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
-    bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
+    bindsym XF86AudioRaiseVolume exec ~/.local/bin/setvol up > $WOBSOCK
+    bindsym XF86AudioLowerVolume exec ~/.local/bin/setvol down > $WOBSOCK
     bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
     bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
-    bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
-    bindsym XF86MonBrightnessUp exec brightnessctl set +5%
-    bindsym XF86AudioPlay exec playerctl play-pause
-    bindsym XF86AudioNext exec playerctl next
-    bindsym XF86AudioPrev exec playerctl previous
+    #bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
+    #bindsym XF86MonBrightnessUp exec brightnessctl set +5%
+    #bindsym XF86AudioPlay exec playerctl play-pause
+    #bindsym XF86AudioNext exec playerctl next
+    #bindsym XF86AudioPrev exec playerctl previous
 
 #
 # Moving around:
@@ -228,47 +233,17 @@ bindsym $mod+r mode "resize"
 # Theme Colors
 #
 
-#SOLARIZED HEX     16/8 TERMCOL
-#--------- ------- ---- -------
-#base03    #002b36  8/4 brblack
-#base02    #073642  0/4 black
-#base01    #586e75 10/7 brgreen
-#base00    #657b83 11/7 bryellow
-#base0     #839496 12/6 brblue
-#base1     #93a1a1 14/4 brcyan
-#base2     #eee8d5  7/7 white
-#base3     #fdf6e3 15/7 brwhite
-#yellow    #b58900  3/3 yellow
-#orange    #cb4b16  9/3 brred
-#red       #dc322f  1/1 red
-#magenta   #d33682  5/5 magenta
-#violet    #6c71c4 13/5 brmagenta
-#blue      #268bd2  4/4 blue
-#cyan      #2aa198  6/6 cyan
-#green     #859900  2/2 green
-
-#                       border  bg      text    ind     child
-client.focused          #2aa198 #073642 #93a1a1 #268bd2 #2aa198
-client.focused_inactive #93a1a1 #002b36 #586e75 #073642 #eee8d5
-client.unfocused        #93a1a1 #002b36 #586e75 #073642 #eee8d5
+#                       border  bg      text    ind     c_border
+client.focused          #106e86 #dee2e0 #4a4b4e #a32a3a #106e86
+client.focused_inactive #dee2e0 #dee2e0 #4a4b4e #a32a3a #dee2e0
+client.unfocused        #dee2e0 #dee2e0 #4a4b4e #a32a3a #dee2e0
 
 #
-# Status Bar:
+# Status Bar: waybar
 #
-# Read `man 5 sway-bar` for more information about this section.
+
 bar {
-    position top
     swaybar_command waybar
-
-    # When the status_command prints a new line to stdout, swaybar updates.
-    # The default just shows the current date and time.
-    status_command while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done
-
-    colors {
-        statusline #ffffff
-        background #323232
-        inactive_workspace #32323200 #32323200 #5c5c5c
-    }
 }
 
 #
diff --git a/config/waybar/config b/config/waybar/config
index 4c6c17c..4f04b34 100644
--- a/config/waybar/config
+++ b/config/waybar/config
@@ -4,16 +4,9 @@
         "layer": "bottom",
         "position": "top",
         "height": 0,
-        "modules-left": ["sway/workspaces", "sway/mode", "sway/window"],
+        "modules-left": ["sway/workspaces", "sway/mode"],
         "modules-center": [],
-        "modules-right": ["tray", "network#wifi", "pulseaudio", "battery#bat1", "temperature", "clock#local"],
-        "idle_inhibitor": {
-            "format": "{icon}",
-            "format-icons": {
-                "activated": "",
-                "deactivated": ""
-            }
-        },
+        "modules-right": ["tray", "network#wifi", "pulseaudio", "battery#bat1", "temperature", "idle_inhibitor", "clock#local"],
         "sway/workspaces": {
             "format": "{icon}",
             "format-icons": {
@@ -28,85 +21,41 @@
             "format": "{:%a %d %b %I:%M %p}",
             "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
         },
-        "clock#utc": {
-            "interval": 1,
-            "format": "({:%H:%M %Z})",
-            "timezone": "UTC"
-        },
-        "cpu": {
-            "format": " {usage}%",
-            "tooltip": false
-        },
-        "disk": {
-            "format": " {}%",
-            "tooltip-format": "{used} / {total} used"
-        },
-        "memory": {
-            "format": " {}%",
-            "tooltip-format": "{used:0.1f}G / {total:0.1f}G used"
-        },
         "temperature": {
             "critical-threshold": 80,
             "format": "{icon} {temperatureC}°C",
             "format-icons": ["", "", "", "", ""]
         },
-        "backlight": {
-            "device": "intel_backlight",
-            "interval": 1,
-            "on-scroll-down": "brightlight -pd 1",
-            "on-scroll-up": "brightlight -pi 1",
-            "format": "{icon} {percent}%",
-            "format-icons": ["", "", ""]
-        },
         "battery#bat1": {
             "bat": "BAT0",
             "adapter": "AC",
-            "interval": 10,
+            "interval": 60,
             "states": {
-                "full": 100,
-                "good": 99,
-                "empty": 5
+                "5": 100,
+                "4": 80,
+                "3": 60,
+                "2": 40,
+                "1": 20,
+                "0": 5
             },
-            "format": "{icon}  {capacity}%",
-            "format-charging": " {capacity}%",
-            "format-plugged": " {capacity}%",
-            "format-empty": "",
-            "format-full": "",
-            "format-icons": ["", "", "", "", ""]
-        },
-        "network#disconnected": {
-            "tooltip-format": "No connection!",
-            "format-ethernet": "",
-            "format-wifi": "",
-            "format-linked": "",
-            "format-disconnected": "",
-            "on-click": "nm-connection-editor"
-        },
-        "network#ethernet": {
-            "interface": "enp*",
-            "format-ethernet": "",
-            "format-wifi": "",
-            "format-linked": "",
-            "format-disconnected": "",
-            "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
-            "on-click": "nm-connection-editor"
+            "format": "{icon} {capacity}%",
+            "format-charging-5": " {capacity}%",
+            "format-charging-4": " {capacity}%",
+            "format-charging-3": " {capacity}%",
+            "format-charging-2": " {capacity}%",
+            "format-charging-1": " {capacity}%",
+            "format-charging-0": " {capacity}%",
+            "format-icons": ["", "", "", "", "", ""]
         },
         "network#wifi": {
             "interface": "wlp*",
             "format-ethernet": "",
-            "format-wifi": " {signalStrength}%",
+            "format-wifi": "  {signalStrength}%",
             "format-linked": "",
             "format-disconnected": "",
             "tooltip-format": "{essid}\n{ifname}: {ipaddr}/{cidr}",
             "on-click": "nm-connection-editor"
         },
-        "network#vpn": {
-            "interface": "tun0",
-            "format": "",
-            "format-disconnected": "",
-            "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
-            "on-click": "nm-connection-editor"
-        },
         "pulseaudio": {
             "scroll-step": 1,
             "format": "{icon} {volume}%",
@@ -121,6 +70,13 @@
                 "default": ["奄", "奔", "墳"]
             },
             "on-click": "pavucontrol"
+        },
+        "idle_inhibitor": {
+            "format": "{icon}",
+            "format-icons": {
+                "activated": "",
+                "deactivated": ""
+            }
         }
     }
 ]
diff --git a/config/waybar/style.css b/config/waybar/style.css
index c88b6e7..6858337 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -1,39 +1,58 @@
 * {
-    font-family: JetBrainsMono Nerd Font;
+    border-radius: 0;
+    border: 0;
+    font-family: Noto Sans, JetBrainsMono Nerd Font;
     font-size: 11pt;
+    text-shadow: none;
 }
 
 window#waybar {
     background: #eff0f2;
     color: #4a4b4e;
+    border-bottom: 1px solid #dee2e0;
 }
 
-.topbar {
-    border-bottom: 1px solid #e2e4e1;
+tooltip {
+    background: alpha(#eff0f2, 0.95);
+    border: 1px solid #dee2e0;
+    border-radius: 5px;
 }
 
+tooltip label {
+    color: #4a4b4e;
+}
 
-#mode,
-#window,
-#network,
-#pulseaudio,
-#battery,
-#clock,
-#temperature {
+label {
     padding: 2px 10px;
     margin: 0;
 }
 
-#workspaces button,
-#workspaces button:hover,
-#workspaces button.focused,
-#workspaces button.urgent {
-    box-shadow: none;
-    border-radius: 0;
-    padding: 0 5px;
+#workspaces label {
+    padding: 0;
+}
+
+#workspaces button {
+    padding: 0 6px;
     font-weight: normal;
 }
 
+#workspaces button:hover {
+    box-shadow: inherit;
+    text-shadow: inherit;
+    background: #eff0f2;
+}
+
 #workspaces button.focused {
-    background: #e2e4e1;
+    background: #dee2e0;
+}
+
+#idle_inhibitor {
+    margin: 0;
+    padding: 2px 12px 2px 6px;
+}
+
+#idle_inhibitor.activated {
+    color: #eff0f2;
+    background: #a32a3a;
+    text-shadow: 1px 1px 0 #ae4e2a;
 }
diff --git a/config/wofi/style.css b/config/wofi/style.css
index 59184f4..abf8ae8 100644
--- a/config/wofi/style.css
+++ b/config/wofi/style.css
@@ -1,8 +1,9 @@
 window {
-    background: #eee8d5;
-    color: #657b83;
-    font-family: SauceCodePro Nerd Font;
+    background: #eff0f2;
+    color: #4a4b4e;
+    font-family: Noto Sans, JetBrainsMono Nerd Font;
     font-size: 10pt;
+    border: 1px solid #dee2e0;
 }
 
 #input {
@@ -10,8 +11,6 @@ window {
     margin: 5px;
     border: 0;
     border-radius: 0;
-    color: #657b83;
-    background: #fdf6e3;
 }
 
 #input:active {
@@ -30,9 +29,9 @@ window {
 }
 
 #text {
+    color: #4a4b4e;
 }
 
-#entry:selected{
-    background: #93a1a1;
-    color: #eee8d5;
+#entry:selected {
+    background: #dee2e0;
 }