Merge #359 Add cinnamon variant

This commit is contained in:
Timothée Ravier 2023-03-16 12:39:00 +00:00
commit 7d16128888
5 changed files with 99 additions and 2 deletions

View file

@ -0,0 +1,46 @@
# DO NOT EDIT! This content is generated from comps-sync.py
include: fedora-common-ostree.yaml
packages:
- NetworkManager-adsl
- NetworkManager-bluetooth
- NetworkManager-openconnect-gnome
- NetworkManager-openvpn-gnome
- NetworkManager-ppp
- NetworkManager-pptp-gnome
- NetworkManager-vpnc-gnome
- NetworkManager-wifi
- NetworkManager-wwan
- blueman
- cinnamon
- cinnamon-control-center
- cinnamon-screensaver
- firefox
- firewall-config
- gnome-disk-utility
- gnome-screenshot
- gnome-system-monitor
- gnome-terminal
- gstreamer1-plugins-ugly-free
- gvfs-archive
- gvfs-gphoto2
- gvfs-mtp
- gvfs-smb
- imsettings-gsettings
- initial-setup-gui
- metacity
- nemo-fileroller
- nemo-image-converter
- nemo-preview
- nm-connection-editor
- pipewire-alsa
- pipewire-pulseaudio
- powerline
- qgnomeplatform-qt5
- redshift-gtk
- setroubleshoot
- slick-greeter
- slick-greeter-cinnamon
- system-config-printer
- wireplumber
- xawtv
- xdg-user-dirs-gtk

View file

@ -232,7 +232,6 @@ desktop_exclude_list:
- xfburn - xfburn
- yelp - yelp
# Non critical NetworkManager plugins # Non critical NetworkManager plugins
- NetworkManager-bluetooth
- NetworkManager-iodine-gnome - NetworkManager-iodine-gnome
- NetworkManager-l2tp-gnome - NetworkManager-l2tp-gnome
- NetworkManager-libreswan-gnome - NetworkManager-libreswan-gnome
@ -240,9 +239,41 @@ desktop_exclude_list:
- NetworkManager-sstp-gnome - NetworkManager-sstp-gnome
- NetworkManager-strongswan-gnome - NetworkManager-strongswan-gnome
- NetworkManager-team - NetworkManager-team
- NetworkManager-wifi
# Already in the common set # Already in the common set
- wireplumber - wireplumber
swaywm-extended: swaywm-extended:
# Non-critical apps -> Flatpak # Non-critical apps -> Flatpak
- mpv - mpv
cinnamon-desktop:
# Incompatible with ostree for various reasons
- abrt-desktop
- abrt-java-connector
- dnfdragora-updater
# Non-critical apps -> Flatpak & toolbox
- eom
- gnome-calculator
- gucharmap
- hexchat
- mpv
- pidgin
- sane-backends-drivers-scanners
- shotwell
- simple-scan
- thunderbird
- tmux
- tmux-powerline
- transmission
- vim-powerline
- xed
- xfburn
- xreader
# Not default to cinnamon
- paper-icon-theme
# Non critical NetworkManager plugins
- NetworkManager-iodine-gnome
- NetworkManager-l2tp-gnome
- NetworkManager-libreswan-gnome
- NetworkManager-ovs
- NetworkManager-sstp-gnome
- NetworkManager-strongswan-gnome
- NetworkManager-team

View file

@ -170,6 +170,7 @@ desktops_comps_groups = {
"deepin": ["deepin-desktop"], "deepin": ["deepin-desktop"],
"mate": ["mate-desktop"], "mate": ["mate-desktop"],
"sway": ["swaywm", "swaywm-extended"], "sway": ["swaywm", "swaywm-extended"],
"cinnamon": ["cinnamon-desktop"],
} }
# Generate treefiles for all desktops # Generate treefiles for all desktops

17
fedora-cinnamon.yaml Normal file
View file

@ -0,0 +1,17 @@
include: cinnamon-desktop-pkgs.yaml
ref: fedora/rawhide/${basearch}/cinnamon
rojig:
name: fedora-cinnamon
summary: "Fedora Cinnamon base image"
license: MIT
packages:
# Portals for Flatpak
- xdg-desktop-portal-gtk
# Include GUI to manage updates & Flatpaks
- gnome-software
repos:
- fedora-rawhide
# - fedora-39
# - fedora-39-updates

View file

@ -2,12 +2,14 @@
include: fedora-common-ostree.yaml include: fedora-common-ostree.yaml
packages: packages:
- NetworkManager-adsl - NetworkManager-adsl
- NetworkManager-bluetooth
- NetworkManager-openconnect-gnome - NetworkManager-openconnect-gnome
- NetworkManager-openvpn-gnome - NetworkManager-openvpn-gnome
- NetworkManager-ppp - NetworkManager-ppp
- NetworkManager-pptp-gnome - NetworkManager-pptp-gnome
- NetworkManager-ssh-gnome - NetworkManager-ssh-gnome
- NetworkManager-vpnc-gnome - NetworkManager-vpnc-gnome
- NetworkManager-wifi
- NetworkManager-wwan - NetworkManager-wwan
- atril - atril
- atril-caja - atril-caja