diff --git a/dot_config/nwg-launchers/nwgbar/bar.json b/dot_config/nwg-launchers/nwgbar/bar.json
index 56272a5..f69f28f 100644
--- a/dot_config/nwg-launchers/nwgbar/bar.json
+++ b/dot_config/nwg-launchers/nwgbar/bar.json
@@ -1,22 +1,22 @@
[
{
"name": "Lock screen",
- "exec": "swaylock -f -c 000000",
- "icon": "system-lock-screen"
+ "exec": "swaylock",
+ "icon": "/home/guoyi/.config/nwg-launchers/nwgbar/images/system-lock-screen.svg"
},
{
"name": "Logout",
- "exec": "loginctl terminate-user guoyi",
- "icon": "system-log-out"
+ "exec": "wayland-logout",
+ "icon": "/home/guoyi/.config/nwg-launchers/nwgbar/images/system-log-out.svg"
},
{
"name": "Reboot",
"exec": "systemctl reboot",
- "icon": "system-reboot"
+ "icon": "/home/guoyi/.config/nwg-launchers/nwgbar/images/system-reboot.svg"
},
{
"name": "Shutdown",
"exec": "systemctl -i poweroff",
- "icon": "system-shutdown"
+ "icon": "/home/guoyi/.config/nwg-launchers/nwgbar/images/system-shutdown.svg"
}
]
diff --git a/dot_config/nwg-launchers/nwgbar/images/system-lock-screen.svg b/dot_config/nwg-launchers/nwgbar/images/system-lock-screen.svg
new file mode 100644
index 0000000..7609141
--- /dev/null
+++ b/dot_config/nwg-launchers/nwgbar/images/system-lock-screen.svg
@@ -0,0 +1,60 @@
+
+
diff --git a/dot_config/nwg-launchers/nwgbar/images/system-log-out.svg b/dot_config/nwg-launchers/nwgbar/images/system-log-out.svg
new file mode 100644
index 0000000..e02d8ab
--- /dev/null
+++ b/dot_config/nwg-launchers/nwgbar/images/system-log-out.svg
@@ -0,0 +1,61 @@
+
+
diff --git a/dot_config/nwg-launchers/nwgbar/images/system-reboot.svg b/dot_config/nwg-launchers/nwgbar/images/system-reboot.svg
new file mode 100644
index 0000000..6701e8b
--- /dev/null
+++ b/dot_config/nwg-launchers/nwgbar/images/system-reboot.svg
@@ -0,0 +1,65 @@
+
+
diff --git a/dot_config/nwg-launchers/nwgbar/images/system-shutdown.svg b/dot_config/nwg-launchers/nwgbar/images/system-shutdown.svg
new file mode 100644
index 0000000..990d741
--- /dev/null
+++ b/dot_config/nwg-launchers/nwgbar/images/system-shutdown.svg
@@ -0,0 +1,64 @@
+
+
diff --git a/dot_config/nwg-launchers/nwgbar/style.css b/dot_config/nwg-launchers/nwgbar/style.css
index 871ec03..ed0dd73 100644
--- a/dot_config/nwg-launchers/nwgbar/style.css
+++ b/dot_config/nwg-launchers/nwgbar/style.css
@@ -2,6 +2,7 @@
margin: 30px /* affects top/bottom & left/right alignment */
}
+
button, image {
background: none;
border-style: none;
diff --git a/dot_config/nwg-launchers/nwgdmenu/style.css b/dot_config/nwg-launchers/nwgdmenu/style.css
index 699ef7c..7b98df7 100644
--- a/dot_config/nwg-launchers/nwgdmenu/style.css
+++ b/dot_config/nwg-launchers/nwgdmenu/style.css
@@ -4,7 +4,6 @@ box {
margin-top: 30px;
margin-bottom: 30px;
*/
- margin-top: 30px
}
#searchbox {
diff --git a/dot_config/swaylock/executable_00.png b/dot_config/swaylock/executable_00.png
new file mode 100644
index 0000000..5676a11
Binary files /dev/null and b/dot_config/swaylock/executable_00.png differ
diff --git a/dot_config/swaylock/executable_01.png b/dot_config/swaylock/executable_01.png
new file mode 100644
index 0000000..cfec7a3
Binary files /dev/null and b/dot_config/swaylock/executable_01.png differ
diff --git a/dot_config/swaylock/executable_02.png b/dot_config/swaylock/executable_02.png
new file mode 100644
index 0000000..bd824b3
Binary files /dev/null and b/dot_config/swaylock/executable_02.png differ
diff --git a/dot_config/waybar/config b/dot_config/waybar/config
index f87ae7a..44c6c7c 100644
--- a/dot_config/waybar/config
+++ b/dot_config/waybar/config
@@ -16,7 +16,7 @@
"wlr/taskbar": {
"format": "{icon}",
"icon-size": 23,
- "icon-theme": "Tela",
+ "icon-theme": ["hicolor", "Tela"],
"tooltip-format": "{title}",
"on-click": "minimize",
"on-click-middle": "close",
diff --git a/dot_config/wayfire.ini b/dot_config/wayfire.ini
index ea70207..f33df02 100644
--- a/dot_config/wayfire.ini
+++ b/dot_config/wayfire.ini
@@ -126,6 +126,9 @@ toggle = KEY_F
environment = dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY XAUTHORITY
autostart_wf_shell = false
+# greetd
+# gtkgreet = gtkgreet -l
+
# chromium screenshare
0_0 = systemctl --user import-environment
xdg = sleep 1 && (XDG_SESSION_TYPE=wayland XDG_CURRENT_DESKTOP=sway /usr/lib/xdg-desktop-portal --replace & /usr/lib/xdg-desktop-portal-wlr)
@@ -134,9 +137,9 @@ xdg = sleep 1 && (XDG_SESSION_TYPE=wayland XDG_CURRENT_DESKTOP=sway /usr/lib/xdg
# https://github.com/WayfireWM/wf-shell
#
# These are started by the autostart_wf_shell option above.
-#
-background = swaybg -i $HOME/.config/swaylock/bg.png
-panel = waybar
+background = wf-background
+# background = swaybg -i $HOME/.config/swaylock/bg.png
+panel = wf-panel
# dock = wf-dock
# Output configuration
diff --git a/dot_config/wf-shell.ini b/dot_config/wf-shell.ini
new file mode 100644
index 0000000..18234db
--- /dev/null
+++ b/dot_config/wf-shell.ini
@@ -0,0 +1,60 @@
+[background]
+cycle_timeout = 150
+image = $HOME/.config/swaylock/
+preserve_aspect = false
+randomize = false
+
+[dock]
+autohide_duration = 300
+css_path =
+position = bottom
+
+[panel]
+autohide = false
+autohide_duration = 300
+background_color = 18.800 18.800 18.800 0.125
+#background_color = gtk_headerbar
+battery_font = default
+battery_icon_invert = false
+battery_icon_size = 24
+battery_status = 1
+clock_font = default
+clock_format = %Y %m %e | %H:%M
+css_path =
+
+launcher_000menu = malacomenu.desktop
+launcher_00terminal = com.gexperts.Tilix.desktop
+launcher_01file = org.gnome.Nautilus.desktop
+launcher_02chromium = chromium.desktop
+launcher_03notekit = com.github.blackhole89.notekit.desktop
+launcher_04music = io.bassi.Amberol.desktop
+launcher_05newsflash = com.gitlab.newsflash.desktop
+launcher_06email = org.gnome.Geary.desktop
+launcher_07pdf = org.gnome.Evince.desktop
+launcher_08office = wps-office-wps.desktop
+launcher_09jabref = jabref.desktop
+launcher_10box = org.gnome.Boxes.desktop
+launcher_11blueberry = blueberry.desktop
+launcher_12pavucontrol = pavucontrol.desktop
+launcher_99power = malacopower.desktop
+
+launchers_size = 50
+launchers_spacing = 3
+layer = top
+menu_fuzzy_search = true
+menu_icon =
+menu_logout_command = nwgbar
+minimal_height = 24
+network_icon_invert_color = false
+network_icon_size = 24
+network_status = 1
+network_status_font = default
+network_status_use_color = false
+network_onclick_command = nmtui
+position = top
+volume_display_timeout = 2.500000
+widgets_left = window-list
+widgets_center = launchers
+widgets_right = battery network volume clock
+
+