.config/sway/.gitignore

@@ -1,2 +0,0 @@
-config.d/idle.conf
-scripts/lock.sh

.config/sway/config

@@ -10,7 +10,6 @@
 # Please see https://i3wm.org/docs/userguide.html for a complete reference!
 
 include /etc/sway/config.d/*
-include ~/.config/sway/config.d/*
 
 set $mod Mod4
 
@@ -185,7 +184,7 @@ mode "resize" {
 
 ### Custom
 #bindsym Ctrl+Mod1+l exec --no-startup-id loginctl lock-session
-bindsym Ctrl+Mod1+l exec --no-startup-id ~/.config/sway/scripts/lock.sh
+bindsym Ctrl+Mod1+l exec --no-startup-id swaylock
 #bindsym Ctrl+Mod1+l exec --no-startup-id betterlockscreen -l -t "${USER}@${HOSTNAME}" --off 10
 
 # Background
@@ -199,8 +198,8 @@ bindsym $mod+Ctrl+Right move workspace to output right
 bindsym $mod+Ctrl+q --release exec --no-startup-id xkill -display $DISPLAY
 
 # Screen brightness controls
-bindsym XF86MonBrightnessUp exec light -A 10 # increase screen brightness
+bindsym XF86MonBrightnessUp exec xbacklight -inc 20 # increase screen brightness
-bindsym XF86MonBrightnessDown exec light -U 10 # decrease screen brightness
+bindsym XF86MonBrightnessDown exec xbacklight -dec 20 # decrease screen brightness
 
 # Touchpad controls
 #bindsym XF86TouchpadToggle exec /some/path/toggletouchpad.sh # toggle touchpad

.config/waybar/config

@@ -6,7 +6,7 @@
     "modules-left": ["sway/workspaces", "sway/mode"],
     "modules-center": ["sway/window"],
     //"modules-right": ["tray", "custom/spotify", "custom/weather", "custom/mail", "custom/storage", "backlight", "pulseaudio", "network", "idle_inhibitor", "battery", "clock"],
-    "modules-right": ["pulseaudio", "backlight", "idle_inhibitor", "battery", "clock", "tray"],
+    "modules-right": ["backlight", "pulseaudio", "idle_inhibitor", "battery", "clock", "tray"],
     "sway/mode": {
         "format": " {}"
     },
@@ -24,10 +24,10 @@
         "tooltip": false
     },
     "battery": {
-        "format": "{icon} {capacity}%",
+        "format": "{capacity}% {icon}",
         "format-alt": "{time} {icon}",
         "format-icons": ["", "", "", "", ""],
-        "format-charging": "  {capacity}%",
+        "format-charging": "{capacity}% ",
         "interval": 30,
         "states": {
             "warning": 25,
@@ -48,16 +48,16 @@
     "tooltip": false
     },
     "pulseaudio": {
-        "format": "{icon}  {volume}%",
+        "format": "{volume} {icon}",
         "format-alt": "{icon}",
         "format-alt-click": "click-right",
-        "format-muted": "ﱝ",
+        "format-muted": "",
         "format-icons": {
             "phone": [" ", " ", " ", " "],
-            "default": ["奄", "奔", "墳"]
+            "default": ["", "", "", ""]
         },
         "scroll-step": 10,
-        "on-click": "pavucontrol-qt",
+        "on-click": "pavucontrol",
         "tooltip": false
     },
     "custom/spotify": {
@@ -79,9 +79,9 @@
         "format": "{icon}",
         "format-alt": "{percent}% {icon}",
         "format-alt-click": "click-right",
-        "format-icons": ["", ""],
+        "format-icons": ["", ""],
-        "on-scroll-down": "light -U 1",
+        "on-scroll-down": "light -A 1",
-        "on-scroll-up": "light -A 1"
+        "on-scroll-up": "light -U 1"
     },
     "custom/weather": {
         "format": "{}",