diff --git a/overlays/sway/etc/skel/.config/sway/config b/overlays/sway/etc/skel/.config/sway/config
index fa21686b35e38962f70bba683a31b5ce00843f4a..68933b0cb368884f60a9a54e43d34ada9e1c40b2 100644
--- a/overlays/sway/etc/skel/.config/sway/config
+++ b/overlays/sway/etc/skel/.config/sway/config
@@ -7,14 +7,8 @@
# global variables
include /etc/sway/definitions
-# add your customizations here
-# e.g.:
-# * change modifier key from Alt to Win/Pine-Key: set $mod Mod4
-# * change the background image: set $background /usr/share/wallpapers/manjaro-arm/generic/manjaro-arm.png
-# * change the theme: set $theme /etc/sway/themes/matcha-blue
-#
-# please note that the theme has a custom background spec as well, so you will have to keep the right
-# order if you want to change both (first theme, then background)
+# user config
+include ~/.config/sway/config.d/*
include /etc/sway/inputs/*
include /etc/sway/outputs/*
diff --git a/overlays/sway/etc/skel/.config/sway/config.d/00-user.conf b/overlays/sway/etc/skel/.config/sway/config.d/00-user.conf
new file mode 100644
index 0000000000000000000000000000000000000000..e7903d793d08ac553e6c143a7ce5a44f59f9a33f
--- /dev/null
+++ b/overlays/sway/etc/skel/.config/sway/config.d/00-user.conf
@@ -0,0 +1,6 @@
+# add your customizations here
+# e.g.:
+# * change modifier key from Win/Pine-Key to Alt: set $mod Mod1
+# * change the background image: set $background /usr/share/wallpapers/manjaro-nudes.png
+# * change the theme: set $theme /etc/sway/themes/matcha-blue
+#
\ No newline at end of file
diff --git a/overlays/sway/etc/skel/.config/waybar/config b/overlays/sway/etc/skel/.config/waybar/config
index fd93e62118ebae0729dff9c22a6858efc0283767..3a746299fc04347374a78fd98e38ece2d4fba82e 100644
--- a/overlays/sway/etc/skel/.config/waybar/config
+++ b/overlays/sway/etc/skel/.config/waybar/config
@@ -33,6 +33,8 @@
"backlight",
"idle_inhibitor",
"pulseaudio",
+ "bluetooth",
+ "custom/pacman",
"tray",
"clock"
],
@@ -74,7 +76,8 @@
"states": {
"warning": 70,
"critical": 90
- }
+ },
+ "on-click": "swaymsg exec \\$term_float htop"
},
"memory": {
@@ -83,16 +86,17 @@
"states": {
"warning": 70,
"critical": 90
- }
+ },
+ "on-click": "swaymsg exec \\$term_float htop"
},
"network": {
"interval": 5,
"format-wifi": " {essid} ({signalStrength}%)", // Icon: wifi
- "format-ethernet": "ïž– {ifname}: {ipaddr}/{cidr}", // Icon: ethernet
+ "format-ethernet": "ïž– {ifname}", // Icon: ethernet
"format-disconnected": "âš Disconnected",
"tooltip-format": "{ifname}: {ipaddr}",
- "on-click": "nm-connection-editor"
+ "on-click": "swaymsg exec \\$term_float nmtui"
},
"sway/mode": {
@@ -160,5 +164,24 @@
"tray": {
"icon-size": 21,
"spacing": 5
+ },
+
+ "custom/pacman": {
+ "format": " {}",
+ "interval": 3600,
+ "exec-if": "[ $(checkupdates | wc -l) -gt 0 ]",
+ "exec": "checkupdates | wc -l",
+ "on-click": "pamac-manager && pamac checkupdates -a -q | wc -l",
+ },
+
+ "bluetooth": {
+ "format": "{icon}",
+ "interval": 30,
+ "format-icons": {
+ "enabled": "",
+ "disabled": ""
+ },
+ "on-click": "blueman-manager",
+ "tooltip-format": "{status}"
}
}
diff --git a/overlays/sway/etc/skel/.config/waybar/style.css b/overlays/sway/etc/skel/.config/waybar/style.css
index a74da788726bbf8ac2051bac62e3641dc240a80e..a4ede7dfea921880d85869eda557ef90d464b5f5 100644
--- a/overlays/sway/etc/skel/.config/waybar/style.css
+++ b/overlays/sway/etc/skel/.config/waybar/style.css
@@ -68,6 +68,9 @@
#pulseaudio,
#temperature,
#idle_inhibitor,
+#bluetooth,
+#backlight,
+#custom-pacman,
#tray {
padding-left: 10px;
padding-right: 10px;
@@ -143,6 +146,7 @@
}
#network.disconnected {
+ margin-top: 6px;
color: @warning_color;
}
@@ -193,3 +197,11 @@
border-color: @error_color;
color: @error_color;
}
+
+#custom-pacman {
+ color: @warning_color;
+}
+
+#bluetooth.disabled {
+ color: @warning_color;
+}
diff --git a/overlays/sway/etc/sway/config.d/98-application-defaults b/overlays/sway/etc/sway/config.d/98-application-defaults
index b69407454fb2969cdcb654b55e7c3487ae52260b..74948db251351c6b3921c55acaa143861e493c17 100644
--- a/overlays/sway/etc/sway/config.d/98-application-defaults
+++ b/overlays/sway/etc/sway/config.d/98-application-defaults
@@ -7,4 +7,4 @@ for_window [app_id="nm-connection-editor"] floating enable
for_window [title="File Operation Progress"] floating enable
for_window [app_id="firefox" title="Library"] floating enable
for_window [app_id="thunderbird" title=".*Reminder"] floating enable
-
+for_window [app_id="floating_shell"] floating enable, border pixel 1, sticky enable
diff --git a/overlays/sway/etc/sway/config.d/99-autostart-applications b/overlays/sway/etc/sway/config.d/99-autostart-applications
index 5f9404aa76b2c06c4515ca34c62aaad27635711b..8e4343cbb796a25156a1eeae1ef58bac2ffcee79 100644
--- a/overlays/sway/etc/sway/config.d/99-autostart-applications
+++ b/overlays/sway/etc/sway/config.d/99-autostart-applications
@@ -4,8 +4,8 @@ exec $idle
# autostart background applications
exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
exec --no-startup-id mako
-exec --no-startup-id pamac-tray-appindicator
-exec --no-startup-id nm-applet --indicator
-exec --no-startup-id blueman-applet
+# exec --no-startup-id pamac-tray-appindicator
+# exec --no-startup-id nm-applet --indicator
+# exec --no-startup-id blueman-applet
exec --no-startup-id mntray
exec --no-startup-id $help --autostart
diff --git a/overlays/sway/etc/sway/definitions b/overlays/sway/etc/sway/definitions
index 008f5ad7408052abeb0fe187aa8bde71ef1f2667..eec98ac81c74712e4ccf6c5210472b7a9f4f7b1e 100644
--- a/overlays/sway/etc/sway/definitions
+++ b/overlays/sway/etc/sway/definitions
@@ -1,6 +1,6 @@
### Variables
#
-# Logo key. Use Mod1 for Alt.
+# Logo key. Use Mod1 for Alt and Mod4 for Super.
set $mod Mod1
# Home row direction keys, like vim
@@ -14,6 +14,7 @@ set $theme /etc/sway/themes/matcha-green
# Your preferred terminal emulator
set $term termite --config=$theme/termite
+set $term_float $term --name=floating_shell --exec
# Your preferred application launcher
# Note: pass the final command to swaymsg so that the resulting window can be opened
@@ -23,16 +24,25 @@ set $menu wofi --show run --exec-search --prompt "Run Command" --term $term | xa
set $selwin sws.sh --dmenu-cmd "wofi --show dmenu" --format "%W | %A - %T"
set $help swhelp.sh --conf $HOME/.config/wofi/swhelp --location 7 --xoffset 15 --yoffset -30
+### Lockscreen configuration
+#
+set $locking exec swaylock -c "$base01" -F \
+ --inside-color "$base01" \
+ --ring-color "$base02" \
+ --ring-ver-color "$base0D" \
+ --ring-clear-color "$base0B" \
+ --inside-clear-color "$base07"
+
### Idle configuration
# This will lock your screen after 300 seconds of inactivity, then turn off
# your displays after another 300 seconds, and turn your screens back on when
# resumed. It will also lock your screen before your computer goes to sleep.
#
set $idle swayidle -w \
- timeout 300 'swaylock -f -c 000000' \
+ timeout 300 'exec $locking' \
timeout 600 'swaymsg "output * dpms off"' \
resume 'swaymsg "output * dpms on"' \
- before-sleep 'swaylock -f -c 000000'
+ before-sleep 'exec $locking'
# statusbar command
set $statusbar waybar