From b653c8586891e203eef300cce6a470363f023614 Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Sun, 15 Sep 2019 18:45:09 +0200 Subject: [PATCH] [cinnamon] 18.1.0 --- community/cinnamon/Packages-Desktop | 7 ++- community/cinnamon/Packages-Live | 3 +- community/cinnamon/Packages-Root | 94 ++++++++++++++++++++++++++++- community/cinnamon/profile.conf | 59 +----------------- 4 files changed, 101 insertions(+), 62 deletions(-) mode change 120000 => 100644 community/cinnamon/Packages-Root diff --git a/community/cinnamon/Packages-Desktop b/community/cinnamon/Packages-Desktop index eaa19ae..59fdbd2 100644 --- a/community/cinnamon/Packages-Desktop +++ b/community/cinnamon/Packages-Desktop @@ -6,9 +6,11 @@ autoconf automake avahi >extra baobab +>extra bauh binutils bison >extra blueman +cinnamon-panel-chooser cinnamon-sounds cinnamon-translations >extra cinnamon-wallpapers @@ -20,8 +22,6 @@ fakeroot >extra firefox flatpak flex -fpakman -#>extra freeoffice >extra galculator >extra gcc >extra >multilib gcc-libs-multilib @@ -46,6 +46,7 @@ grub-theme-manjaro-dev >extra gst-plugins-ugly >extra gstreamer gtkhash-nemo +>extra gufw gvfs-afc gvfs-gphoto2 gvfs-mtp @@ -79,6 +80,7 @@ manjaro-settings-manager-notifier >extra mobile-broadband-provider-info >extra modemmanager >extra mousetweaks +>extra ms-office-online >extra mugshot >multilib lib32-mesa-demos # >extra nemo-bulk-rename @@ -119,6 +121,7 @@ python-ptyprocess qt5-styleplugins screenfetch >extra snapd +>basic squashfs-tools >extra subversion >extra system-config-printer >extra terminus-font diff --git a/community/cinnamon/Packages-Live b/community/cinnamon/Packages-Live index c7fa6cc..97afbbc 100644 --- a/community/cinnamon/Packages-Live +++ b/community/cinnamon/Packages-Live @@ -1,4 +1,4 @@ -calamares-git +calamares cinnamon-live clonezilla grub-theme-live-manjaro @@ -8,4 +8,3 @@ manjaro-live-skel manjaro-live-systemd mkinitcpio-nfs-utils nbd -squashfs-tools diff --git a/community/cinnamon/Packages-Root b/community/cinnamon/Packages-Root deleted file mode 120000 index 72bf8f4..0000000 --- a/community/cinnamon/Packages-Root +++ /dev/null @@ -1 +0,0 @@ -../../shared/Packages-Root-dbus-x11 \ No newline at end of file diff --git a/community/cinnamon/Packages-Root b/community/cinnamon/Packages-Root new file mode 100644 index 0000000..3b47a4f --- /dev/null +++ b/community/cinnamon/Packages-Root @@ -0,0 +1,93 @@ +>i686 archlinux32-keyring +>manjaro manjaro-release +>multilib gcc-libs-multilib +acpi +acpid +amd-ucode +b43-fwcutter +bash-completion +btrfs-progs +bzip2 +coreutils +cpupower +crda +cronie +cryptsetup +dbus-x11 +device-mapper +dhclient +dhcpcd +diffutils +dmraid +dnsmasq +dosfstools +e2fsprogs +ecryptfs-utils +efibootmgr +exfat-utils +f2fs-tools +file +filesystem +findutils +gawk +gcc-libs +gettext +glibc +grep +grub +gzip +haveged +inetutils +intel-ucode +iproute2 +iptables +iputils +ipw2100-fw +ipw2200-fw +jfsutils +KERNEL +less +licenses +linux-firmware +logrotate +lsb-release +lvm2 +man-db +man-pages +manjaro-firmware +manjaro-system +mdadm +memtest86+ +mhwd +mhwd-db +mkinitcpio-openswap +nano +nfs-utils +ntfs-3g +os-prober +pacman +pciutils +perl +procps-ng +psmisc +reiserfsprogs +rsync +s-nail +sed +shadow +spectre-meltdown-checker +sudo +sysfsutils +systemd-fsck-silent +systemd-sysvcompat +tar +texinfo +tlp +usbutils +util-linux +vi +wget +which +wpa_supplicant +xfsprogs +zsh diff --git a/community/cinnamon/profile.conf b/community/cinnamon/profile.conf index 39eafc9..b730d5f 100644 --- a/community/cinnamon/profile.conf +++ b/community/cinnamon/profile.conf @@ -1,66 +1,11 @@ -########################################## -###### use this file in the profile ###### -########################################## +#! /bin/bash -# use multilib packages; x86_64 only -# multilib="true" - -################ install ################ - -# default displaymanager: none -# supported; lightdm, sddm, gdm, lxdm, mdm displaymanager="lightdm" -# Set to false to disable autologin in the livecd -# autologin="true" - -# nonfree xorg drivers nonfree_mhwd="true" -# possible values: grub;systemd-boot -# efi_boot_loader="grub" +enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd') -# configure calamares for netinstall -# netinstall="false" - -# configure calamares to use chrootcfg instead of unpackfs -# chrootcfg="false" - -# use geoip -# geoip="true" - -# unset defaults to given values -# names must match systemd service names -enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd') disable_systemd=('pacman-init') -# add strict snaps: strict_snaps="core core18 gnome-3-28-1804 gtk-common-themes snap-store" - -#strict_snaps="snapd core18 snap-store core gnome-3-28-1804 gtk-common-themes" - -# add classic snaps: classic_snaps="code" -# classic_snaps="" -# choose the snap channel. Possible options are: stable, candidate, beta, edge -# snap_channel="stable" - -# unset defaults to given values -# addgroups="lp,network,power,wheel" - -# the same workgroup name if samba is used -# smb_workgroup="Manjaro" - -################# live-session ################# - -# unset defaults to given value hostname="manjaro-cinnamon" - -# unset defaults to given value -# username="manjaro" - -# unset defaults to given value -# password="manjaro" - -# unset defaults to given values -# names must match systemd service names -# services in enable_systemd array don't need to be listed here -# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')