Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openSUSEway for openSUSE:Factory checked in at 2023-01-31 16:09:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSEway (Old) and /work/SRC/openSUSE:Factory/.openSUSEway.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSEway" Tue Jan 31 16:09:26 2023 rev:15 rq:1062136 version:0.15 Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSEway/openSUSEway.changes 2023-01-24 20:27:18.682788728 +0100 +++ /work/SRC/openSUSE:Factory/.openSUSEway.new.32243/openSUSEway.changes 2023-01-31 16:15:42.688016939 +0100 @@ -1,0 +2,19 @@ +Mon Jan 30 21:30:36 UTC 2023 - Denys Kondratenko <[email protected]> + +- New in 0.15 release + * Use new option for window opacity by @baierjan in #56 + * Add openSUSE wob theme by @FilippoBonazziSUSE in #68 + * Improve some defaults by @FilippoBonazziSUSE in #73 + * add calendar tooltip, new weekday format by @denisok in #71 + * fix some readme typos by @AlessandroMinoccheri in #78 + * add scratchpad indicator by @denisok in #70 + * Import user configuration variables by @FilippoBonazziSUSE in #77 + * Add SwayNotificationCenter config and theme by @FilippoBonazziSUSE in #76 + * Import all user configuration variables from environment.d by @FilippoBonazziSUSE in #82 + * System mode menu by @FilippoBonazziSUSE in #90 + * Add swaync configuration in waybar and hotkey by @FilippoBonazziSUSE in #83 + * Add wob.ini configuration file for wob>=0.14 by @FilippoBonazziSUSE in #84 + * Improve README, add screenshot by @FilippoBonazziSUSE in #94 + * changes for 0.15 by @denisok in #91 + +------------------------------------------------------------------- Old: ---- openSUSEway-0.14.tar.gz New: ---- openSUSEway-0.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSEway.spec ++++++ --- /var/tmp/diff_new_pack.5lPLq4/_old 2023-01-31 16:15:43.056019071 +0100 +++ /var/tmp/diff_new_pack.5lPLq4/_new 2023-01-31 16:15:43.056019071 +0100 @@ -20,7 +20,7 @@ %define waybar_version %(rpm -q --queryformat "%%{version}" waybar) Name: openSUSEway -Version: 0.14 +Version: 0.15 Release: 0 Summary: The openSUSEway desktop environment meta package License: MIT @@ -57,8 +57,12 @@ Requires: tar Suggests: vifm Suggests: vim +Requires: clipman +Requires: mpris-ctl +Requires: sway-marker Requires: waybar-branding-openSUSE Requires: wget +Requires: wl-clipboard Requires: xdg-desktop-portal Requires: xdg-desktop-portal-wlr Requires: xdg-utils @@ -85,6 +89,7 @@ Summary: openSUSE branding of sway Group: System/GUI/Other BuildRequires: sway +Requires: SwayNotificationCenter Requires: bc Requires: brightnessctl Requires: fontawesome-fonts @@ -164,6 +169,13 @@ install -D -p -m 644 .config/waybar/config %{buildroot}%{_sysconfdir}/xdg/waybar/config install -D -p -m 644 .config/waybar/style.css %{buildroot}%{_sysconfdir}/xdg/waybar/style.css +## wob +install -D -p -m 644 .config/wob/wob.ini %{buildroot}%{_sysconfdir}/sway/wob/wob.ini + +## swaync +install -D -p -m 644 .config/swaync/config.json %{buildroot}%{_sysconfdir}/sway/swaync/config.json +install -D -p -m 644 .config/swaync/style.css %{buildroot}%{_sysconfdir}/sway/swaync/style.css + %pre -n openSUSEway # bug #1176195, don't force enviroment, cleaning up old installations test -e %{_sysconfdir}/profile.d/openSUSEway.sh && rm %{_sysconfdir}/profile.d/openSUSEway.sh || true @@ -217,6 +229,13 @@ %config(noreplace) %{_sysconfdir}/wofi/config %config(noreplace) %{_sysconfdir}/wofi/style.css +%dir %{_sysconfdir}/sway/wob +%config %{_sysconfdir}/sway/wob/wob.ini + +%dir %{_sysconfdir}/sway/swaync +%config %{_sysconfdir}/sway/swaync/config.json +%config %{_sysconfdir}/sway/swaync/style.css + %files -n waybar-branding-openSUSE %dir %{_sysconfdir}/xdg/waybar %config(noreplace) %{_sysconfdir}/xdg/waybar/config ++++++ openSUSEway-0.14.tar.gz -> openSUSEway-0.15.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.14/.config/alacritty/alacritty.yml new/openSUSEway-0.15/.config/alacritty/alacritty.yml --- old/openSUSEway-0.14/.config/alacritty/alacritty.yml 2021-11-02 21:03:04.000000000 +0100 +++ new/openSUSEway-0.15/.config/alacritty/alacritty.yml 2023-01-30 22:16:38.000000000 +0100 @@ -1 +1,2 @@ -background_opacity: 0.4 +window: + opacity: 0.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.14/.config/sway/config.d/50-openSUSE.conf new/openSUSEway-0.15/.config/sway/config.d/50-openSUSE.conf --- old/openSUSEway-0.14/.config/sway/config.d/50-openSUSE.conf 2021-11-02 21:03:04.000000000 +0100 +++ new/openSUSEway-0.15/.config/sway/config.d/50-openSUSE.conf 2023-01-30 22:16:38.000000000 +0100 @@ -9,12 +9,25 @@ # openSUSE wallpaper output * bg /usr/share/wallpapers/default-1920x1080.jpg fill +# Enable common options for generic touchpads +input "type:touchpad" { + tap enabled + natural_scroll enabled + middle_emulation enabled +} + +# Cycle through workspaces +bindsym $mod+tab workspace next_on_output +bindsym $mod+Shift+tab workspace prev_on_output + +# Lockscreen configuration +set $screenlock 'swaylock -f -c 000000' # Idle configuration exec swayidle -w \ - timeout 300 'swaylock -f -c 000000' \ + timeout 300 $screenlock \ timeout 600 'swaymsg "output * dpms off"' \ resume 'swaymsg "output * dpms on"' \ - before-sleep 'swaylock -f -c 000000' + before-sleep $screenlock bindsym --to-code { $mod+b splith @@ -43,6 +56,26 @@ swaybar_command waybar } +# System mode menu +set $mode_system "What to do? (l) lock, (e) logout, (r) reboot, (s) suspend, (Shift+s) shutdown" +mode $mode_system { + bindsym l exec $screenlock; mode "default" + bindsym e exec swaymsg exit; mode "default" + bindsym r exec systemctl reboot; mode "default" + bindsym s exec systemctl suspend; mode "default" + bindsym Shift+s exec systemctl poweroff; mode "default" + + # back to normal: Enter or Escape + bindsym Return mode "default" + bindsym Escape mode "default" +} +unbindsym $mod+Shift+e +bindsym $mod+Shift+e mode $mode_system + +# Toggle notification bar +set $toggle_notification "swaync-client -t -sw" +bindsym $mod+Shift+n exec $toggle_notification + # openSUSE theme default_border pixel 2 gaps inner 10 @@ -50,13 +83,16 @@ client.unfocused #00a489 #173f4f #35b9ab client.focused_inactive #6da741 #00a489 #173f4f +set $wob wob --config /etc/sway/wob/wob.ini + exec_always { systemctl --user import-environment gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita-dark' gsettings set org.gnome.desktop.interface icon-theme 'Adwaita' gsettings set org.gnome.desktop.interface cursor-theme 'Adwaita' test -e $SWAYSOCK.wob || mkfifo $SWAYSOCK.wob - tail -f $SWAYSOCK.wob | wob + tail -f $SWAYSOCK.wob | $wob + swaync --style /etc/sway/swaync/style.css --config /etc/sway/swaync/config.json } exec /usr/libexec/polkit-gnome-authentication-agent-1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.14/.config/swaync/config.json new/openSUSEway-0.15/.config/swaync/config.json --- old/openSUSEway-0.14/.config/swaync/config.json 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSEway-0.15/.config/swaync/config.json 2023-01-30 22:16:38.000000000 +0100 @@ -0,0 +1,38 @@ +{ + "$schema": "/etc/xdg/swaync/configSchema.json", + "positionX": "right", + "positionY": "top", + "control-center-margin-top": 0, + "control-center-margin-bottom": 0, + "control-center-margin-right": 0, + "control-center-margin-left": 0, + "notification-icon-size": 64, + "notification-body-image-height": 100, + "notification-body-image-width": 200, + "timeout": 10, + "timeout-low": 5, + "timeout-critical": 0, + "fit-to-screen": true, + "control-center-width": 500, + "control-center-height": 600, + "notification-window-width": 500, + "keyboard-shortcuts": true, + "image-visibility": "when-available", + "transition-time": 200, + "hide-on-clear": false, + "hide-on-action": true, + "script-fail-notify": true, + "scripts": { + "example-script": { + "exec": "echo 'Do something...'", + "urgency": "Normal" + } + }, + "notification-visibility": { + "example-name": { + "state": "muted", + "urgency": "Low", + "app-name": "Spotify" + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.14/.config/swaync/style.css new/openSUSEway-0.15/.config/swaync/style.css --- old/openSUSEway-0.14/.config/swaync/style.css 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSEway-0.15/.config/swaync/style.css 2023-01-30 22:16:38.000000000 +0100 @@ -0,0 +1,217 @@ +@define-color cc-bg rgba(23, 63, 79, 0.4); + +@define-color noti-text-color rgba(53, 185, 171, 1); +@define-color noti-border-color rgba(53, 185, 171, 0.4); +@define-color noti-bg rgba(23, 63, 79, 0.4); +@define-color noti-bg-hover rgba(23, 63, 79, 1); +@define-color noti-bg-focus rgba(23, 63, 79, 0.6); +@define-color noti-close-bg rgba(255, 255, 255, 0.1); +@define-color noti-close-bg-hover rgba(255, 255, 255, 0.15); + +@define-color bg-selected rgba(33, 164, 223, 1); + +* { + font-family: "Source Sans Pro"; + font-size: 15px; +} + +.notification-row { + outline: none; +} + +.notification-row:focus, +.notification-row:hover { + background: @noti-bg-focus; +} + +.notification { + border-radius: 12px; + margin: 6px 12px; + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3), 0 1px 3px 1px rgba(0, 0, 0, 0.7), + 0 2px 6px 2px rgba(0, 0, 0, 0.3); + padding: 0; +} + +.critical { + background: @bg-selected; + padding: 6px; + border-radius: 12px; +} + +/* Uncomment to enable specific urgency colors +.low { + background: yellow; + padding: 6px; + border-radius: 12px; +} + +.normal { + background: green; + padding: 6px; + border-radius: 12px; +} + +.critical { + background: red; + padding: 6px; + border-radius: 12px; +} +*/ + +.notification-content { + background: transparent; + padding: 6px; + border-radius: 12px; +} + +.close-button { + background: @noti-close-bg; + color: @noti-text-color; + text-shadow: none; + padding: 0; + border-radius: 100%; + margin-top: 10px; + margin-right: 16px; + box-shadow: none; + border: none; + min-width: 24px; + min-height: 24px; +} + +.close-button:hover { + box-shadow: none; + background: @noti-close-bg-hover; + transition: all 0.15s ease-in-out; + border: none; +} + +.notification-default-action, +.notification-action { + padding: 4px; + margin: 0; + box-shadow: none; + background: @noti-bg; + border: 1px solid @noti-border-color; + color: white; +} + +.notification-default-action:hover, +.notification-action:hover { + -gtk-icon-effect: none; + background: @noti-bg-hover; +} + +.notification-default-action { + border-radius: 12px; +} + +/* When alternative actions are visible */ +.notification-default-action:not(:only-child) { + border-bottom-left-radius: 0px; + border-bottom-right-radius: 0px; +} + +.notification-action { + border-radius: 0px; + border-top: none; + border-right: none; +} + +/* add bottom border radius to eliminate clipping */ +.notification-action:first-child { + border-bottom-left-radius: 10px; +} + +.notification-action:last-child { + border-bottom-right-radius: 10px; + border-right: 1px solid @noti-border-color; +} + +.image { +} + +.body-image { + margin-top: 6px; + background-color: white; + border-radius: 12px; +} + +.summary { + color: @noti-text-color; + text-shadow: none; +} + +.time { + color: @noti-text-color; + text-shadow: none; + margin-right: 18px; +} + +.body { + background: transparent; + color: @noti-text-color; + text-shadow: none; +} + +/* The "Notifications" and "Do Not Disturb" text widget */ +.top-action-title { + color: @noti-text-color; + text-shadow: none; +} + +.control-center-clear-all { + color: @noti-text-color; + text-shadow: none; + background: @cc-bg; + border: 1px solid @noti-border-color; + box-shadow: none; + border-radius: 12px; +} + +.control-center-clear-all:hover { + background: @noti-bg-hover; +} + +.control-center-dnd { + border-radius: 12px; + background: @noti-bg; + border: 1px solid @noti-border-color; + box-shadow: none; +} + +.control-center-dnd:checked { + background: @bg-selected; +} + +.control-center-dnd slider:hover { + background: @noti-close-bg-hover; +} + +.control-center-dnd slider { + background: @noti-bg-hover; + border-radius: 12px; +} + +/* The .control-center Window. + * Can't apply padding and margin so may be easier to use "> box" instead + */ +.control-center { + background: @cc-bg; +} + +/* The first control-center child. May be easier to style this than .control-center */ +.control-center > box { +} + +.control-center-list { + background: transparent; +} + +.floating-notifications { + background: transparent; +} + +/* Window behind control center and on all other monitors */ +.blank-window { + background: alpha(black, 0.25); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.14/.config/waybar/config new/openSUSEway-0.15/.config/waybar/config --- old/openSUSEway-0.14/.config/waybar/config 2021-11-02 21:03:04.000000000 +0100 +++ new/openSUSEway-0.15/.config/waybar/config 2023-01-30 22:16:38.000000000 +0100 @@ -5,9 +5,9 @@ // "width": 1280, // Waybar width // "gtk-layer-shell": "false", // Choose the order of the modules - "modules-left": ["sway/workspaces", "sway/mode", "tray"], + "modules-left": ["sway/workspaces", "custom/scratchpad", "sway/mode", "tray"], "modules-center": ["sway/window"], - "modules-right": ["custom/zypper", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "pulseaudio", "custom/layout", "clock#date", "clock"], + "modules-right": ["custom/zypper", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "pulseaudio", "custom/layout", "clock"], "sway/mode": { "format": "ïï {}" }, @@ -65,12 +65,16 @@ "spacing": 10 }, "clock": { - "format": "{:%H:%M}", - "tooltip": false - }, - "clock#date": { - "format": "{:%a %d %b w:%V}", - "tooltip": false + // "timezone": "America/New_York", + "format": "ï {:%b %d %Y %R}", + "tooltip-format": "<span color='#35b9ab'><big>{:%Y %B}</big></span>\n<span color='#35b9ab'><tt><small>{calendar}</small></tt></span>", + "format-alt": "{:%a %d %b w:%V %H:%M}", + "today-format": "<span color='#21a4df'><b><u>{}</u></b></span>", + "calendar-weeks-pos": "left", + "format-calendar": "<span background='#173f4f' bgalpha='60%'><b>{}</b></span>", + "format-calendar-weeks": "<span color='#73ba25'><b>{}</b></span>", + "format-calendar-weekdays": "<span color='#21a4df'><b>{}</b></span>", + "interval": 10 }, "cpu": { "format": "{usage}% ï", @@ -133,5 +137,30 @@ "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle", "on-click-right": "pavucontrol", "tooltip": false - } + }, + "custom/scratchpad": { + "format-text": "{}", + "return-type": "json", + "interval": 3, + "exec": "scratchpad-indicator.sh 2> /dev/null", + "exec-if": "exit 0", + "on-click": "swaymsg 'scratchpad show'", + "on-click-right": "swaymsg 'move scratchpad'" + }, + "custom/notification": { + "tooltip": true, + "format": "{icon}", + "format-icons": { + "notification": "ï¢<span foreground='red'><small><sup>⬤</sup></small></span>", + "none": "ï¢ ", + "dnd-notification": "ï·<span foreground='red'><small><sup>⬤</sup></small></span>", + "dnd-none": "ï· " + }, + "return-type": "json", + "exec-if": "which swaync-client", + "exec": "swaync-client -swb", + "on-click": "swaync-client -t -sw", + "on-click-right": "swaync-client -d -sw", + "escape": true + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.14/.config/waybar/scratchpad-indicator.sh new/openSUSEway-0.15/.config/waybar/scratchpad-indicator.sh --- old/openSUSEway-0.14/.config/waybar/scratchpad-indicator.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSEway-0.15/.config/waybar/scratchpad-indicator.sh 2023-01-30 22:16:38.000000000 +0100 @@ -0,0 +1,18 @@ +#!/bin/bash + +output="$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]?)|recurse(.floating_nodes[]?)|select(.name == "__i3_scratch").floating_nodes[]|"`<b>"+.name+"`</b> - "+.app_id+" "+(.id|tostring)')" +number="$(swaymsg -r -t get_tree | jq -r 'recurse(.nodes[]) | first(select(.name=="__i3_scratch")) | .floating_nodes | length')" + +if [ "$number" -gt 0 ]; then + text="ï $number" +else + text="" +fi + +output="$(echo "$output" | sed -r 's/[&]+/and/g')" # Replace unprintable & character with the word 'and' +tooltip="ï Scratchpad\n\n" +tooltip+="$(echo "$output" | sed -z 's/\n/\\n/g')" +tooltip=${tooltip::-2} + +echo "{\"text\":\"$text\", \"tooltip\":\"$tooltip\"}" +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.14/.config/waybar/style.css new/openSUSEway-0.15/.config/waybar/style.css --- old/openSUSEway-0.14/.config/waybar/style.css 2021-11-02 21:03:04.000000000 +0100 +++ new/openSUSEway-0.15/.config/waybar/style.css 2023-01-30 22:16:38.000000000 +0100 @@ -22,6 +22,11 @@ margin: 0 5px; } +#custom-scratchpad { + margin: 0px 5px; + padding: 0px 5px; +} + #workspaces button { padding: 0 5px; color: rgba(53, 185, 171, 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.14/.config/wob/wob.ini new/openSUSEway-0.15/.config/wob/wob.ini --- old/openSUSEway-0.14/.config/wob/wob.ini 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSEway-0.15/.config/wob/wob.ini 2023-01-30 22:16:38.000000000 +0100 @@ -0,0 +1,11 @@ +timeout = 1000 +height = 32 +border_offset = 0 +border_size = 2 +bar_padding = 2 +border_color = 35B9AB66 +background_color = 173F4F66 +bar_color = 35B9ABFF +overflow_border_color = EE2E2466 +overflow_background_color = 173F4F66 +overflow_bar_color = EE2E24FF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.14/README.md new/openSUSEway-0.15/README.md --- old/openSUSEway-0.14/README.md 2021-11-02 21:03:04.000000000 +0100 +++ new/openSUSEway-0.15/README.md 2023-01-30 22:16:38.000000000 +0100 @@ -1,19 +1,24 @@ -# openSUSE way +# openSUSEway dotfiles for Sway on openSUSE -Please check [Manage-dotfiles-with-Git](https://news.opensuse.org/2020/03/27/Manage-dotfiles-with-Git/) on how to use dotfiles. +## Screenshots + -For this config please install these packages: +## How to use +To use this configuration on openSUSE Tumbleweed please install these packages: ``` sudo zypper in openSUSEway ``` +## More resources +Please check [Manage-dotfiles-with-Git](https://news.opensuse.org/2020/03/27/Manage-dotfiles-with-Git/) on how to use dotfiles. + openSUSEway imports some recomended (optional) variables from `/etc/sway/env`, that is done by `sway/sway-run.sh` for text mode and by `sway/sway.service` for systemd graphic environments. -[openSUSEway desktop enviroment](https://en.opensuse.org/Portal:OpenSUSEway) for more details on complete desktop enviroment for openSUSE. +[openSUSEway desktop environment](https://en.opensuse.org/Portal:OpenSUSEway) for more details on complete desktop environment for openSUSE. [Sway openSUSE wiki page](https://en.opensuse.org/Sway) for more details about Sway on openSUSE. -Another dotfiles examples: +## Other dotfiles examples: * https://github.com/jjquin/swayarch * https://github.com/jjquin/dotfiles diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.14/greetd/sway-config new/openSUSEway-0.15/greetd/sway-config --- old/openSUSEway-0.14/greetd/sway-config 2021-11-02 21:03:04.000000000 +0100 +++ new/openSUSEway-0.15/greetd/sway-config 2023-01-30 22:16:38.000000000 +0100 @@ -1,3 +1,7 @@ +input "type:touchpad" { + tap enabled +} + exec "gtkgreet -l -s /etc/greetd/style.css; swaymsg exit" bindsym Mod4+shift+e exec swaynag \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.14/openSUSEway.spec new/openSUSEway-0.15/openSUSEway.spec --- old/openSUSEway-0.14/openSUSEway.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSEway-0.15/openSUSEway.spec 2023-01-30 22:16:38.000000000 +0100 @@ -0,0 +1,244 @@ +# +# spec file for package openSUSEway +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define sway_version %(rpm -q --queryformat "%%{version}" sway) +%define waybar_version %(rpm -q --queryformat "%%{version}" waybar) + +Name: openSUSEway +Version: 0.15 +Release: 0 +Summary: The openSUSEway desktop environment meta package +License: MIT +Group: Metapackages +URL: https://github.com/openSUSE/openSUSEway +Source0: https://github.com/openSUSE/openSUSEway/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-OPENSUSE add-configuration-for-play-pause-next-prev-multimedi.patch gh#openSUSE/openSUSEway#41 [email protected] +# Add multimedia keys configuration +BuildArch: noarch +BuildRequires: aaa_base +BuildRequires: pkgconfig(systemd) +Requires: NetworkManager +Requires: aaa_base +Recommends: adwaita-qt5 +Requires: bzip2 +Requires: command-not-found +Requires: curl +Recommends: firefox +Requires: gfxboot-branding-openSUSE +Requires: git +Requires: greetd +Requires: grep +Requires: gzip +Requires: (gtkgreet or wlgreet) +Suggests: imv +Requires: jq +Requires: less +Recommends: libqt5-qtwayland +Suggests: mpv +Requires: pipewire +Recommends: qt5ct +Requires: sudo +Requires: sway-branding-openSUSE +Requires: tar +Suggests: vifm +Suggests: vim +Requires: clipman +Requires: wl-clipboard +Requires: mpris-ctl +Requires: sway-marker +Requires: waybar-branding-openSUSE +Requires: wget +Requires: xdg-desktop-portal +Requires: xdg-desktop-portal-wlr +Requires: xdg-utils + +%description +This meta package aggregates openSUSEway desktop enviroment packages. + +%package -n patterns-openSUSEway +%pattern_graphicalenvironments +Summary: The openSUSEway desktop environment pattern +Group: Metapackages +Provides: pattern() = openSUSEway +Provides: pattern-icon() = pattern-sway +Provides: pattern-order() = 1460 +Provides: pattern-visible() +URL: https://github.com/openSUSE/openSUSEway +BuildRequires: patterns-rpm-macros +Requires: openSUSEway + +%description -n patterns-openSUSEway +This pattern installs the openSUSE look and feel for sway. + +%package -n sway-branding-openSUSE +Summary: openSUSE branding of sway +Group: System/GUI/Other +BuildRequires: sway +Requires: SwayNotificationCenter +Requires: bc +Requires: brightnessctl +Requires: fontawesome-fonts +Requires: jq +Requires: pamixer +Requires: patterns-sway-sway +Requires: pavucontrol +Requires: playerctl +Requires: polkit-gnome +Requires: sway +Requires: wallpaper-branding-openSUSE +Requires: wob +Provides: sway-branding = %{version} +Conflicts: otherproviders(sway-branding) +Supplements: packageand(sway:branding-openSUSE) + +#BRAND: /etc/sway/config and /etc/sway/config.d/ +#BRAND: contain openSUSE config and branding + +%description -n sway-branding-openSUSE +This package provides the openSUSE look and feel for sway. + +%package -n waybar-branding-openSUSE +Summary: openSUSE branding of waybar +Group: System/GUI/Other +BuildRequires: waybar +Provides: waybar-branding = %{version} +Conflicts: otherproviders(waybar-branding) +Supplements: packageand(waybar:branding-openSUSE) + +#BRAND: /etc/xdg/waybar/config and /etc/xdg/waybar/style.css +#BRAND: contain openSUSE config and branding + +%description -n waybar-branding-openSUSE +This package provides the openSUSE look and feel for waybar. + +%prep +%autosetup -p1 -n openSUSEway-%{version} + +%build + +%install + +## openSUSEway package +### qt5ct config to configure dark theme +install -D -p -m 644 qt5ct.conf %{buildroot}%{_sysconfdir}/xdg/qt5ct/qt5ct.conf +### greetd as a login manager +install -D -p -m 644 greetd/sway-config %{buildroot}%{_sysconfdir}/greetd/sway-config +install -D -p -m 644 greetd/config.toml %{buildroot}%{_sysconfdir}/greetd/config.toml.way +install -D -p -m 644 greetd/environments %{buildroot}%{_sysconfdir}/greetd/environments + +## openSUSEway pattern package +mkdir -p %{buildroot}/%{_defaultdocdir}/patterns/ +echo 'This file marks the pattern openSUSEway to be installed.' >%{buildroot}%{_defaultdocdir}/patterns/openSUSEway.txt + +## Sway +install -D -p -m 644 .config/sway/config %{buildroot}%{_sysconfdir}/sway/config +install -D -p -m 644 .config/sway/env %{buildroot}%{_sysconfdir}/sway/env +install -D -p -m 644 .config/sway/config.d/50-openSUSE.conf %{buildroot}%{_sysconfdir}/sway/config.d/50-openSUSE.conf + +install -D -p -m 644 sway/sway-session.target %{buildroot}%{_unitdir}/sway-session.target +install -D -p -m 644 sway/sway.service %{buildroot}%{_unitdir}/sway.service +install -D -p -m 644 sway/sway.desktop %{buildroot}%{_datadir}/wayland-sessions/sway.desktop.brand +install -D -p -m 755 sway/sway-run.sh %{buildroot}%{_bindir}/sway-run.sh + +### alacritty +# so far doesn't have special branding package and it doesn't support system wide config +install -D -p -m 644 .config/alacritty/alacritty.yml %{buildroot}%{_sysconfdir}/alacritty/alacritty.yml + +## wofi +install -D -p -m 644 .config/wofi/config %{buildroot}%{_sysconfdir}/wofi/config +install -D -p -m 644 .config/wofi/style.css %{buildroot}%{_sysconfdir}/wofi/style.css +#set wofi config and style to the system dir +sed -i -e "s|wofi --show.*|wofi --conf=%{_sysconfdir}/wofi/config --style=%{_sysconfdir}/wofi/style.css|g" %{buildroot}%{_sysconfdir}/sway/config.d/50-openSUSE.conf + +## waybar +install -D -p -m 644 .config/waybar/config %{buildroot}%{_sysconfdir}/xdg/waybar/config +install -D -p -m 644 .config/waybar/style.css %{buildroot}%{_sysconfdir}/xdg/waybar/style.css + +## wob +install -D -p -m 644 .config/wob/wob.ini %{buildroot}%{_sysconfdir}/sway/wob/wob.ini + +## swaync +install -D -p -m 644 .config/swaync/config.json %{buildroot}%{_sysconfdir}/sway/swaync/config.json +install -D -p -m 644 .config/swaync/style.css %{buildroot}%{_sysconfdir}/sway/swaync/style.css + +%pre -n openSUSEway +# bug #1176195, don't force enviroment, cleaning up old installations +test -e %{_sysconfdir}/profile.d/openSUSEway.sh && rm %{_sysconfdir}/profile.d/openSUSEway.sh || true +test -e %{_prefix}/lib/environment.d/50-openSUSEway.conf && rm %{_prefix}/lib/environment.d/50-openSUSEway.conf || true + +%post -n openSUSEway +test -e %{_sysconfdir}/greetd/config.toml && \ + mv -n %{_sysconfdir}/greetd/config.toml %{_sysconfdir}/greetd/config.toml.orig || true +cp %{_sysconfdir}/greetd/config.toml.way %{_sysconfdir}/greetd/config.toml + +%postun -n openSUSEway +test -e %{_sysconfdir}/greetd/config.toml.orig && \ + mv %{_sysconfdir}/greetd/config.toml.orig %{_sysconfdir}/greetd/config.toml || true + +%post -n sway-branding-openSUSE +test -e %{_datadir}/wayland-sessions/sway.desktop && \ + mv -n %{_datadir}/wayland-sessions/sway.desktop %{_datadir}/wayland-sessions/sway.desktop.orig || true +cp %{_datadir}/wayland-sessions/sway.desktop.brand %{_datadir}/wayland-sessions/sway.desktop + +%postun -n sway-branding-openSUSE +test -e %{_datadir}/wayland-sessions/sway.desktop.orig && \ + mv %{_datadir}/wayland-sessions/sway.desktop.orig %{_datadir}/wayland-sessions/sway.desktop || true + +%files +%dir %{_sysconfdir}/xdg/qt5ct/ +%config(noreplace) %{_sysconfdir}/xdg/qt5ct/qt5ct.conf +%dir %{_sysconfdir}/greetd/ +%attr(644,greeter,greeter) %config %{_sysconfdir}/greetd/config.toml.way +%attr(644,greeter,greeter) %config %{_sysconfdir}/greetd/sway-config +%attr(644,greeter,greeter) %config %{_sysconfdir}/greetd/environments + +%files -n patterns-openSUSEway +%dir %{_defaultdocdir}/patterns +%{_defaultdocdir}/patterns/openSUSEway.txt + +%files -n sway-branding-openSUSE +%dir %{_sysconfdir}/sway +%config %{_sysconfdir}/sway/config +%config %{_sysconfdir}/sway/env +%dir %{_sysconfdir}/sway/config.d +%config %{_sysconfdir}/sway/config.d/50-openSUSE.conf +%{_unitdir}/sway-session.target +%{_unitdir}/sway.service +%{_datadir}/wayland-sessions/sway.desktop.brand +%{_bindir}/sway-run.sh + +%dir %{_sysconfdir}/alacritty +%config(noreplace) %{_sysconfdir}/alacritty/alacritty.yml + +%dir %{_sysconfdir}/wofi +%config(noreplace) %{_sysconfdir}/wofi/config +%config(noreplace) %{_sysconfdir}/wofi/style.css + +%dir %{_sysconfdir}/sway/wob +%config %{_sysconfdir}/sway/wob/wob.ini + +%dir %{_sysconfdir}/sway/swaync +%config %{_sysconfdir}/sway/swaync/config.json +%config %{_sysconfdir}/sway/swaync/style.css + +%files -n waybar-branding-openSUSE +%dir %{_sysconfdir}/xdg/waybar +%config(noreplace) %{_sysconfdir}/xdg/waybar/config +%config(noreplace) %{_sysconfdir}/xdg/waybar/style.css + +%changelog Binary files old/openSUSEway-0.14/screenshot.png and new/openSUSEway-0.15/screenshot.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.14/sway/sway-run.sh new/openSUSEway-0.15/sway/sway-run.sh --- old/openSUSEway-0.14/sway/sway-run.sh 2021-11-02 21:03:04.000000000 +0100 +++ new/openSUSEway-0.15/sway/sway-run.sh 2023-01-30 22:16:38.000000000 +0100 @@ -5,10 +5,11 @@ export XDG_SESSION_DESKTOP=sway export XDG_CURRENT_DESKTOP=sway -# this file imports openSUSEway desktop enviroments set -a +# Import openSUSEway environment variables . /etc/sway/env +# Import environment.d variables by calling the systemd generator +eval "$(/usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator)" set +a systemd-cat --identifier=sway sway $@ -
