4 files changed, 46 insertions(+), 15 deletions(-)

M .config/sway/config
M .config/waybar/config
M .config/waybar/style.css
M .gitignore

@@ 5,8 5,8 @@ set $up k
 set $right l
 
 set $term urxvt
-set $menu dmenu_path | dmenu -b | xargs swaymsg exec --
-set $sink `patctl list short sinks | cut -f1`
+set $menu j4-dmenu-desktop --dmenu='bemenu -i -b --nb "#000000" --nf "#000000" --fn "pango:Hack-Regular 12"' --term='urxvt'
+set $sink 'patctl list short sinks | cut -f1'
 
 set $w1 一
 set $w2 二


@@ 14,6 14,11 @@ set $w3 三
 set $w4 四
 set $w5 五
 
+set $laptop LVDS-1
+
+bindswitch --reload --locked lid:on output $laptop disable
+bindswitch --reload --locked lid:off output $laptop enable
+
 output * bg ~/wallpaper.jpg fill
 input * xkb_numlock enable
 


@@ 24,9 29,9 @@ bindsym --release Shift+Print exec grim -g "$(slurp)"
 bindsym --release $mod+Print exec grim -g "$(slurp)"
 bindsym --release $mod+Shift+Print exec grim
 
-bindsym $mod+z exec --no-startup-id pactl set-sink-volume $sink +10%
-bindsym $mod+x exec --no-startup-id pactl set-sink-volume $sink -10%
-bindsym $mod+c exec --no-startup-id pactl set-sink-mute $sink toggle
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume $sink +10%
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume $sink -10%
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute $sink toggle
 
 bindsym $mod+Shift+a exec --no-startup-id pactl set-sink-volume $sink +5%
 bindsym $mod+Shift+s exec --no-startup-id pactl set-sink-volume $sink -5%


@@ 136,4 141,4 @@ client.background       #FFFFFF
 
 for_window [class="^.*"] border pixel 2
 
-include /etc/sway/config.d/*
+seat seat0 hide_cursor 5000

@@ 30,7 30,6 @@
 	"cpu": {
 		"interval": 10,
 		"format": " {usage}%",
-		"format-alt": "CPU Load : {load}% / Usage : {usage}%",
 		"max-length": 50
 	},
 	"network": {


@@ 38,7 37,7 @@
 	    "format": "{ifname}",
 	    "format-wifi": "{essid} ",
 	    "format-ethernet": "{ifname} ",
-	    "format-disconnected": "", //An empty format will hide the module.
+	    "format-disconnected": "⚠",
 	    "tooltip-format": "{ifname}",
 	    "tooltip-format-wifi": "{essid} ({signalStrength}%) ",
 	    "tooltip-format-ethernet": "{ifname} ",

@@ 62,9 62,9 @@ window#waybar.solo {
 #mode,
 #battery,
 #temperature,
-#idle_inhibitor {
-	padding:0 5px;
-	margin:0 5px;
+#idle_inhibitor,
+#custom-date {
+	margin:0 8px;
 }
 
 label:focus {


@@ 93,22 93,41 @@ label:focus {
 
 #pulseaudio {
     background-color: transparent;
+    color: #ecc3c2;
 }
 
 #pulseaudio.muted {
     background-color: transparent;
+    color: #832426;
 }
 
 #battery {
     color: #89BEB7;
 }
 
-#temperature {
-    color: #832426;
+#battery.charging {
+    color: #6f873e;
 }
 
-#pulseaudio {
-	color: #D8D8B3;
+@keyframes blink {
+    to {
+	background-color: #ffffff;
+	color: black;
+    }
+}
+
+#battery.warning:not(.charging) {
+    background: #f53c3c;
+    color: white;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+#temperature {
+    color: #832426;
 }
 
 #custom-start {

@@ 1,1 1,9 @@
+aerc
+configstore
+glib-2.0
+libreoffice
+pulse
+ibus
+
+pavucontrol.ini
 *.swp