diff --git a/ansible/inventory/group_vars/desktop.yml b/ansible/inventory/group_vars/desktop.yml index 015938e..0210b48 100644 --- a/ansible/inventory/group_vars/desktop.yml +++ b/ansible/inventory/group_vars/desktop.yml @@ -178,29 +178,33 @@ desktop_i3_dotfiles: mode: "0644" desktop_sway_dotfiles: - - name: sway config - src: .config/sway/ - dest: .config/sway/ + - name: alacritty config + src: .config/alacritty/ + dest: .config/alacritty/ mode: preserve - name: dunst config src: .config/dunst/ dest: .config/dunst/ mode: preserve + - name: flameshot config + src: .config/flameshot/ + dest: .config/flameshot/ + mode: preserve - name: rofi config src: .config/rofi/ dest: .config/rofi/ mode: preserve + - name: sway config + src: .config/sway/ + dest: .config/sway/ + mode: preserve - name: waybar config src: .config/waybar/ dest: .config/waybar/ mode: preserve - - name: flameshot config - src: .config/flameshot/ - dest: .config/flameshot/ - mode: preserve - - name: alacritty config - src: .config/alacritty/ - dest: .config/alacritty/ + - name: wlogout config + src: .config/wlogout/ + dest: .config/wlogout/ mode: preserve desktop_flatpak_packages: diff --git a/ansible/inventory/group_vars/void.yml b/ansible/inventory/group_vars/void.yml index c04f6bb..91280b4 100644 --- a/ansible/inventory/group_vars/void.yml +++ b/ansible/inventory/group_vars/void.yml @@ -168,6 +168,7 @@ desktop_sway_packages: - SwayOSD - Waybar - wl-clipboard + - wlogout - xdg-desktop-portal-wlr - xorg-server-xwayland diff --git a/ansible/roles/profile_desktop_sway/tasks/main.yml b/ansible/roles/profile_desktop_sway/tasks/main.yml index bc374e9..6d76dca 100644 --- a/ansible/roles/profile_desktop_sway/tasks/main.yml +++ b/ansible/roles/profile_desktop_sway/tasks/main.yml @@ -10,11 +10,11 @@ loop: - "{{ user_home }}/.config/alacritty" - "{{ user_home }}/.config/dunst" + - "{{ user_home }}/.config/flameshot" - "{{ user_home }}/.config/rofi" - "{{ user_home }}/.config/sway" - - "{{ user_home }}/.config/sway/scripts" - - "{{ user_home }}/.config/sway/wallpapers" - "{{ user_home }}/.config/waybar" + - "{{ user_home }}/.config/wlogout" when: "'sway' in (desktop_sessions_enabled | default([]))" - name: Install allowed emptty Wayland sessions diff --git a/dotfiles/desktop/.config/sway/config b/dotfiles/desktop/.config/sway/config index 5e61128..8f6c70b 100644 --- a/dotfiles/desktop/.config/sway/config +++ b/dotfiles/desktop/.config/sway/config @@ -45,6 +45,9 @@ blur_radius 5 shadows enable default_dim_inactive 0.1 +# Layer effects (Waybar etc.) — sfrutta il blur globale già attivo +layer_effects "waybar" blur enable; blur_ignore_transparent enable; shadows disable + # Allow X11 applications xwayland enable diff --git a/dotfiles/desktop/.config/waybar/config.jsonc b/dotfiles/desktop/.config/waybar/config.jsonc index 00464a7..c54d2a7 100644 --- a/dotfiles/desktop/.config/waybar/config.jsonc +++ b/dotfiles/desktop/.config/waybar/config.jsonc @@ -6,7 +6,7 @@ "modules-left": ["sway/workspaces"], "modules-center": [], - "modules-right": ["cpu", "memory", "disk", "temperature", "backlight", "network", "pulseaudio", "battery", "tray", "clock"], + "modules-right": ["cpu", "memory", "disk", "temperature", "backlight", "network", "pulseaudio", "battery", "tray", "clock", "custom/power"], "sway/workspaces": { "disable-scroll": true, @@ -97,5 +97,11 @@ "tray": { "icon-size": 16, "spacing": 6 + }, + + "custom/power": { + "format": "⏻", + "tooltip": false, + "on-click": "wlogout -b 3 -c 0 -r 0" } } diff --git a/dotfiles/desktop/.config/waybar/style.css b/dotfiles/desktop/.config/waybar/style.css index cee9a46..81da253 100644 --- a/dotfiles/desktop/.config/waybar/style.css +++ b/dotfiles/desktop/.config/waybar/style.css @@ -5,7 +5,7 @@ } window#waybar { - background-color: #1f1f28; + background-color: rgba(31, 31, 40, 0.55); color: #d0d0d0; border: none; } @@ -43,7 +43,8 @@ window#waybar { #network, #pulseaudio, #battery, -#tray { +#tray, +#custom-power { padding: 0 8px; } @@ -65,3 +66,12 @@ window#waybar { #battery.full { color: #9ec07c; } #tray { padding: 0 6px; } + +#custom-power { + color: #c7162b; + padding: 0 10px; + font-size: 12pt; +} +#custom-power:hover { + background-color: rgba(199, 22, 43, 0.15); +} diff --git a/dotfiles/desktop/.config/wlogout/layout b/dotfiles/desktop/.config/wlogout/layout new file mode 100644 index 0000000..8964a55 --- /dev/null +++ b/dotfiles/desktop/.config/wlogout/layout @@ -0,0 +1,3 @@ +{"label": "logout", "action": "swaymsg exit", "text": "Logout", "keybind": "l"} +{"label": "reboot", "action": "loginctl reboot", "text": "Reboot", "keybind": "r"} +{"label": "shutdown", "action": "loginctl poweroff", "text": "Shutdown", "keybind": "s"} diff --git a/dotfiles/desktop/.config/wlogout/style.css b/dotfiles/desktop/.config/wlogout/style.css new file mode 100644 index 0000000..72ec19c --- /dev/null +++ b/dotfiles/desktop/.config/wlogout/style.css @@ -0,0 +1,42 @@ +* { + background-image: none; + box-shadow: none; + font-family: "LiterationMono Nerd Font", "Symbols Nerd Font Mono", monospace; + font-size: 14pt; +} + +window { + background-color: rgba(31, 31, 40, 0.85); +} + +button { + color: #d0d0d0; + background-color: #2b2b36; + border: 2px solid #3a3a46; + border-radius: 8px; + margin: 12px; + background-repeat: no-repeat; + background-position: center; + background-size: 25%; +} + +button:focus, +button:active, +button:hover { + color: #ffffff; + background-color: #4a90d9; + border-color: #4a90d9; + outline-style: none; +} + +#logout { + background-image: image(url("/usr/share/wlogout/icons/logout.png")); +} + +#reboot { + background-image: image(url("/usr/share/wlogout/icons/reboot.png")); +} + +#shutdown { + background-image: image(url("/usr/share/wlogout/icons/shutdown.png")); +}