diff --git a/README.md b/README.md index d86fb2c..2cfc084 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ Lo stato attuale del profilo desktop include, tra le altre cose: - `tmux` con plugin gestiti da TPM al bootstrap del profilo desktop - Flatpak con remoto Flathub - GNOME Keyring e bootstrap della posta via script dedicato -- shell Noctalia su Sway su `nymph`, con plugin ufficiali per clipboard (`clipper`), polkit (`polkit-agent`), screenshot (`screenshot`) e gestione USB (`usb-drive-manager`); config condivisa in `dotfiles/desktop/.config/noctalia/` e `settings.json` renderizzato da template Ansible con variabili host-specifiche +- shell Noctalia su Sway su `nymph`, con plugin ufficiali per clipboard (`clipper`, `clipboard`), polkit (`polkit-agent`) e gestione USB (`usb-drive-manager`); config condivisa in `dotfiles/desktop/.config/noctalia/` e `settings.json` renderizzato da template Ansible con variabili host-specifiche - `udiskie` come backend per automount/LUKS su Sway, senza tray; la UI dei dispositivi removibili รจ demandata a `usb-drive-manager` - `kanshi` su `nymph` per il profilo monitor Wayland, con workspace Sway deterministici: in dual monitor `1` resta su `eDP-1` e `2-10` vanno su `DP-1`, mentre in laptop-only tutti tornano su `eDP-1` - monitor Noctalia e `screenOverrides` dichiarati in inventory (`noctalia_bar_monitors`, `noctalia_screen_overrides`) per host `nymph` diff --git a/ansible/inventory/group_vars/desktop.yml b/ansible/inventory/group_vars/desktop.yml index 6141416..bdac0da 100644 --- a/ansible/inventory/group_vars/desktop.yml +++ b/ansible/inventory/group_vars/desktop.yml @@ -58,6 +58,7 @@ desktop_i3_packages: desktop_sway_packages: - adw-gtk-theme + - flameshot - grim - kanshi - qt5ct diff --git a/ansible/roles/profile_desktop_sway/tasks/noctalia.yml b/ansible/roles/profile_desktop_sway/tasks/noctalia.yml index 8ff776e..0c1555b 100644 --- a/ansible/roles/profile_desktop_sway/tasks/noctalia.yml +++ b/ansible/roles/profile_desktop_sway/tasks/noctalia.yml @@ -137,8 +137,8 @@ owner: "{{ username }}" group: "{{ user_group }}" loop: + - clipboard - polkit-agent - - screenshot - usb-drive-manager - name: Ensure Noctalia cache directory exists diff --git a/ansible/roles/profile_desktop_sway/templates/shell.conf.j2 b/ansible/roles/profile_desktop_sway/templates/shell.conf.j2 index 6ee5daa..596de08 100644 --- a/ansible/roles/profile_desktop_sway/templates/shell.conf.j2 +++ b/ansible/roles/profile_desktop_sway/templates/shell.conf.j2 @@ -2,9 +2,9 @@ set $menu qs -c noctalia-shell ipc call launcher toggle set $audio_panel qs -c noctalia-shell ipc call volume openPanel set $locker qs -c noctalia-shell ipc call lockScreen lock set $powermenu qs -c noctalia-shell ipc call sessionMenu toggle -set $screenshot_full qs -c noctalia-shell ipc call plugin:screenshot takeScreenshot output -set $screenshot_region qs -c noctalia-shell ipc call plugin:screenshot takeScreenshot region -set $screenshot_window qs -c noctalia-shell ipc call plugin:screenshot takeScreenshot window +set $screenshot_full sh -c 'QT_QPA_PLATFORM=wayland flameshot full --clipboard' +set $screenshot_region sh -c 'QT_QPA_PLATFORM=wayland flameshot gui' +set $screenshot_window sh -c 'QT_QPA_PLATFORM=wayland flameshot gui' set $audio_raise qs -c noctalia-shell ipc call volume increase set $audio_lower qs -c noctalia-shell ipc call volume decrease set $audio_mute qs -c noctalia-shell ipc call volume muteOutput @@ -22,8 +22,11 @@ exec pipewire exec pipewire-pulse exec wireplumber exec kanshi +exec flameshot exec udiskie --no-tray exec wl-paste --watch cliphist store exec qs -c noctalia-shell bindsym $mod+c exec qs -c noctalia-shell ipc call launcher clipboard +bindsym $mod+Ctrl+v exec qs -c noctalia-shell ipc call plugin:clipboard toggle +bindsym $mod+Ctrl+Shift+v exec qs -c noctalia-shell ipc call plugin:clipboard wipe diff --git a/dotfiles/desktop/.config/noctalia/plugins.json b/dotfiles/desktop/.config/noctalia/plugins.json index 435db85..e6a2c78 100644 --- a/dotfiles/desktop/.config/noctalia/plugins.json +++ b/dotfiles/desktop/.config/noctalia/plugins.json @@ -7,6 +7,10 @@ } ], "states": { + "clipboard": { + "enabled": true, + "sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins" + }, "clipper": { "enabled": true, "sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins" @@ -15,10 +19,6 @@ "enabled": true, "sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins" }, - "screenshot": { - "enabled": true, - "sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins" - }, "usb-drive-manager": { "enabled": true, "sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"