From 11392879d0a0cd635b8e95ab58a4607e952b81be Mon Sep 17 00:00:00 2001 From: Frank Kusters Date: Sun, 23 Jun 2019 10:10:23 +0200 Subject: [PATCH 1/6] [awesome] Reorder packages to match Xfce order Matching the order of the Xfce edition will make it easier to see if anything needs to be added or removed. Same for profile.conf. --- community/awesome/Packages-Desktop | 196 +++++++++++++++-------------- community/awesome/profile.conf | 32 ++--- 2 files changed, 120 insertions(+), 108 deletions(-) diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop index 40f5f1a..8e3dd5f 100644 --- a/community/awesome/Packages-Desktop +++ b/community/awesome/Packages-Desktop @@ -1,21 +1,16 @@ -################################### ## Network -################################### avahi -network-manager-applet networkmanager networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc -nss-mdns +nss-mdns # NSS support for mDNS (optdepend for avahi) modemmanager -usb_modeswitch openresolv +usb_modeswitch -################################### ## Libraries for Sound/Audio/Video -################################### alsa-firmware alsa-utils ffmpeg @@ -26,12 +21,11 @@ gst-plugins-good gst-plugins-ugly libdvdcss manjaro-pulse +>extra pulseaudio-bluetooth pulseaudio-ctl pulseaudio-zeroconf -################################### ## Connect Packages -################################### android-udev gvfs gvfs-afc @@ -43,108 +37,126 @@ mtpfs udiskie udisks2 -################################### -## Xorg -################################### +## AUR Support/Development +# Missing base-devel packages +>extra base-devel +# Extra packages for AUR support +>extra git +>extra yay + +## Fonts + +## Games + +## Package management +pamac +appimagelauncher + +## Java + +## Printing +>extra manjaro-printer + +## Optional dependencies for hplip + +## Display manager +lightdm +lightdm-slick-greeter +accountsservice # Enhanced user accounts handling + +## GTK3 +gtk3-classic + +## XFCE Group +thunar-gtk3 +thunar-volman-gtk3 +tumbler +xfce4-power-manager-gtk3 +xfce4-settings-gtk3 +lxterminal + +## XFCE Extras +>extra blueman +ffmpegthumbnailer # tumbler - for video thumbnails +gksu-polkit +gnome-keyring # fix wlan segfault +libgsf # tumbler - for ODF thumbnails +libopenraw # tumbler - for RAW thumbnails +light-locker +network-manager-applet +thunar-archive-plugin-gtk3 +>extra thunar-shares-plugin-gtk3 +file-roller +i3-scrot # instead of xfce4-screenshooter? +pavucontrol + +## Themes +>extra manjaro-wallpapers-18.0 +grub-theme-manjaro +kvantum-manjaro + +## Applications +catfish +galculator +firefox +>extra gimp +>extra gufw +>extra mpv # instead of audacious +htop +zathura-pdf-poppler +zathura-djvu +inxi +>extra libreoffice-fresh +manjaro-settings-manager +>extra manjaro-settings-manager-notifier +mousepad +>extra thunderbird +ristretto # instead of viewnior + +# Optional dependencies engrampa +p7zip # 7Z and ARJ archive support +unace # ACE archive support +unrar # RAR archive support + +## Documentation + +## Settings packages +manjaro-browser-settings +>extra manjaro-settings-samba +manjaro-awesome-settings-18.0 + +## Xorg Input Drivers xf86-input-elographics xf86-input-evdev xf86-input-keyboard xf86-input-libinput xf86-input-mouse xf86-input-void + +## Xorg Server and Graphics +xdg-user-dirs xorg-server xorg-xinit xorg-xprop -################################### -## Misc -################################### ->basic ufw -gtk3-classic -lightdm -lightdm-slick-greeter -libappindicator-gtk3 -accountsservice # Enhanced user accounts -python-dbus -gnome-keyring -grub-theme-manjaro -light-locker -mate-polkit -gksu-polkit +## Desktop Utils perl-file-mimeinfo -pavucontrol +xdg-utils +xdg-su + +## Misc +>basic ufw +libappindicator-gtk3 +python-dbus +mate-polkit pa-applet rofi xcape -xdg-su -xdg-user-dirs -xdg-utils -xfce4-settings-gtk3 -xfce4-power-manager-gtk3 manjaro-zsh-config -manjaro-browser-settings manjaro-hotfixes -manjaro-settings-manager -manjaro-awesome-settings-18.0 qt5ct -kvantum-manjaro - -################################### -## Apps and Optional dependencies -################################### -appimagelauncher downgrade -inxi -i3-scrot -htop -lxterminal -firefox -galculator -mousepad -pamac -ristretto -thunar-gtk3 -thunar-volman-gtk3 -thunar-archive-plugin-gtk3 -catfish -file-roller -p7zip -unrar -unace -tumbler -ffmpegthumbnailer -libgsf -libopenraw -zathura-pdf-poppler -zathura-djvu - -################################### -############## EXTRA ############## - -################################### -## AUR Support -## Missing base-devel packages -################################### ->extra base-devel ->extra git ->extra yay - -################################### -## Extra Misc and Apps -################################### >extra bmenu >extra compton >extra compton-conf ->extra gimp ->extra gufw ->extra libreoffice-fresh ->extra mpv ->extra thunderbird >extra transmission-gtk ->extra manjaro-settings-samba ->extra thunar-shares-plugin-gtk3 ->extra blueman ->extra pulseaudio-bluetooth ->extra manjaro-printer ->extra manjaro-settings-manager-notifier ->extra manjaro-wallpapers-18.0 \ No newline at end of file diff --git a/community/awesome/profile.conf b/community/awesome/profile.conf index a6f8516..2cb3392 100644 --- a/community/awesome/profile.conf +++ b/community/awesome/profile.conf @@ -5,11 +5,6 @@ # use multilib packages; x86_64 only # multilib="true" -# use extra packages as defined in pkglist to activate a full profile -extra="false" - -################ install ################ - # default displaymanager: none # supported; lightdm, sddm, gdm, lxdm, mdm displaymanager="lightdm" @@ -17,20 +12,25 @@ displaymanager="lightdm" # Set to false to disable autologin in the livecd # autologin="true" -# nonfree xorg drivers +# nonfree mhwd drivers # nonfree_mhwd="true" -# possible values: grub;systemd-boot +# use extra packages as defined in pkglist to activate a full profile +extra="false" + +################ install ################ + +# unset defaults to given value # efi_boot_loader="grub" # configure calamares for netinstall # netinstall="false" -# configure calamares to use chrootcfg instead of unpackfs; default: unpackfs +# configure calamares to use chrootcfg instead of unpackfs # chrootcfg="false" -# use geoip -# geoip="true" +# use geoip for localization +# geoip='true' # default system shell is bash # use /etc/defaults/useradd by supplying a space " " @@ -42,13 +42,10 @@ user_shell=/bin/zsh # enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep') disable_systemd=('pacman-init') -# unset defaults to given values -# addgroups="lp,network,power,wheel" - # the same workgroup name if samba is used -# smb_workgroup="Manjaro" +# smb_workgroup="" -################# live-session ################# +################# livecd ################# # unset defaults to given value hostname="manjaro-awesome" @@ -59,10 +56,13 @@ hostname="manjaro-awesome" # unset defaults to given value # password="manjaro" -# the login shell for live image +# the login shell # defaults to bash login_shell=/bin/zsh +# unset defaults to given values +# addgroups="lp,network,power,wheel" + # unset defaults to given values # names must match systemd service names # services in enable_systemd array don't need to be listed here From 6132aa543e64517a312d13b731e3af313b100c14 Mon Sep 17 00:00:00 2001 From: Frank Kusters Date: Sun, 23 Jun 2019 16:43:39 +0200 Subject: [PATCH 2/6] [awesome] Explicitly add dependency packages Even though not strictly necessary, this brings the Packages-Desktop even more in line with the Xfce edition. --- community/awesome/Packages-Desktop | 46 ++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop index 8e3dd5f..14afa6f 100644 --- a/community/awesome/Packages-Desktop +++ b/community/awesome/Packages-Desktop @@ -6,8 +6,11 @@ networkmanager-openvpn networkmanager-pptp networkmanager-vpnc nss-mdns # NSS support for mDNS (optdepend for avahi) +mobile-broadband-provider-info modemmanager openresolv +openssh +samba usb_modeswitch ## Libraries for Sound/Audio/Video @@ -21,7 +24,7 @@ gst-plugins-good gst-plugins-ugly libdvdcss manjaro-pulse ->extra pulseaudio-bluetooth +pulseaudio-bluetooth pulseaudio-ctl pulseaudio-zeroconf @@ -40,11 +43,26 @@ udisks2 ## AUR Support/Development # Missing base-devel packages >extra base-devel +autoconf +automake +binutils +bison +fakeroot +flex +gcc +libtool +m4 +make +patch +pkg-config # Extra packages for AUR support >extra git >extra yay ## Fonts +cantarell-fonts +noto-fonts # default font +# >extra noto-fonts-emoji ## Games @@ -56,8 +74,18 @@ appimagelauncher ## Printing >extra manjaro-printer +>extra cups +>extra cups-pdf +>extra cups-pk-helper +>extra ghostscript +>extra gsfonts +>extra hplip +>extra splix +>extra system-config-printer ## Optional dependencies for hplip +>extra pyqt5-common # For hplip +>extra python-pyqt5 # For hplip gui ## Display manager lightdm @@ -68,22 +96,27 @@ accountsservice # Enhanced user accounts handling gtk3-classic ## XFCE Group +exo-gtk3 +garcon-gtk3 thunar-gtk3 thunar-volman-gtk3 tumbler xfce4-power-manager-gtk3 xfce4-settings-gtk3 lxterminal +xfconf-gtk3 ## XFCE Extras ->extra blueman +blueman ffmpegthumbnailer # tumbler - for video thumbnails +freetype2 # tumbler - for font thumbnails gksu-polkit gnome-keyring # fix wlan segfault libgsf # tumbler - for ODF thumbnails libopenraw # tumbler - for RAW thumbnails light-locker network-manager-applet +poppler-glib # tumbler - for PDF thumbnails thunar-archive-plugin-gtk3 >extra thunar-shares-plugin-gtk3 file-roller @@ -92,15 +125,18 @@ pavucontrol ## Themes >extra manjaro-wallpapers-18.0 +gnome-icon-theme grub-theme-manjaro kvantum-manjaro ## Applications catfish -galculator +dmidecode # optional dependency inxi firefox +# >extra flashplugin +galculator >extra gimp ->extra gufw +gufw >extra mpv # instead of audacious htop zathura-pdf-poppler @@ -108,7 +144,7 @@ zathura-djvu inxi >extra libreoffice-fresh manjaro-settings-manager ->extra manjaro-settings-manager-notifier +manjaro-settings-manager-notifier mousepad >extra thunderbird ristretto # instead of viewnior From ab2bf26aea14cf64f8ef87bfeeb28b8cc2410778 Mon Sep 17 00:00:00 2001 From: Frank Kusters Date: Tue, 25 Jun 2019 22:15:50 +0200 Subject: [PATCH 3/6] [awesome] Expand with packages from Xfce release The added packages are those that should not affect the rest of the distro. All packages that do not make sense in an Awesome context have not been added (such as all Xfce panel plugins). --- community/awesome/Packages-Desktop | 77 ++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 4 deletions(-) diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop index 14afa6f..4fe195e 100644 --- a/community/awesome/Packages-Desktop +++ b/community/awesome/Packages-Desktop @@ -6,6 +6,7 @@ networkmanager-openvpn networkmanager-pptp networkmanager-vpnc nss-mdns # NSS support for mDNS (optdepend for avahi) +ntp mobile-broadband-provider-info modemmanager openresolv @@ -23,12 +24,14 @@ gst-plugins-base gst-plugins-good gst-plugins-ugly libdvdcss +>multilib manjaro-alsa manjaro-pulse pulseaudio-bluetooth pulseaudio-ctl pulseaudio-zeroconf ## Connect Packages +android-tools android-udev gvfs gvfs-afc @@ -50,27 +53,46 @@ bison fakeroot flex gcc +>multilib gcc-libs-multilib +>multilib gcc-multilib libtool m4 make patch pkg-config +>multilib lib32-flex # Extra packages for AUR support >extra git +>extra patchutils +>extra subversion >extra yay ## Fonts cantarell-fonts noto-fonts # default font +noto-fonts-cjk # asian fonts - needed big package, ~76 mb compressed # >extra noto-fonts-emoji +terminus-font +ttf-bitstream-vera # xfce4-terminal default Monospace +# ttf-dejavu # Installed as gnome-themes-standard dependency +>extra ttf-inconsolata +>extra ttf-indic-otf +>extra ttf-liberation +>extra ttf-droid ## Games +>extra steam-manjaro ## Package management pamac +flatpak +snapd appimagelauncher ## Java +>extra jdk8-openjdk +>extra jre8-openjdk-headless +>extra jre8-openjdk ## Printing >extra manjaro-printer @@ -79,13 +101,17 @@ appimagelauncher >extra cups-pk-helper >extra ghostscript >extra gsfonts +>extra gtk3-print-backends >extra hplip >extra splix >extra system-config-printer ## Optional dependencies for hplip >extra pyqt5-common # For hplip +>extra python-pillow # For hplip +>extra python-pip # For hplip >extra python-pyqt5 # For hplip gui +>extra python-reportlab # For hplip ## Display manager lightdm @@ -94,6 +120,7 @@ accountsservice # Enhanced user accounts handling ## GTK3 gtk3-classic +>multilib lib32-gtk3-classic ## XFCE Group exo-gtk3 @@ -116,38 +143,67 @@ libgsf # tumbler - for ODF thumbnails libopenraw # tumbler - for RAW thumbnails light-locker network-manager-applet +menulibre +orage poppler-glib # tumbler - for PDF thumbnails thunar-archive-plugin-gtk3 >extra thunar-shares-plugin-gtk3 file-roller +thunar-media-tags-plugin i3-scrot # instead of xfce4-screenshooter? +xfce4-taskmanager pavucontrol ## Themes >extra manjaro-wallpapers-18.0 +>extra wallpapers-2018 gnome-icon-theme +gnome-themes-standard grub-theme-manjaro +matcha-gtk-theme +xcursor-simpleandsoft +xcursor-vanilla-dmz-aa kvantum-manjaro ## Applications catfish dmidecode # optional dependency inxi +engrampa firefox # >extra flashplugin galculator +gcolor2 >extra gimp +gparted gufw ->extra mpv # instead of audacious +>extra audacious +>extra mpv +>extra hexchat htop zathura-pdf-poppler zathura-djvu inxi >extra libreoffice-fresh +ms-office-online +manjaro-hello +manjaro-application-utility manjaro-settings-manager manjaro-settings-manager-notifier +>basic midori +>extra mlocate mousepad +mugshot +>basic parole # media player +>extra pidgin +powertop +screenfetch +>extra poppler-data # CKJ support for pdf +>basic sylpheed # mail client >extra thunderbird -ristretto # instead of viewnior +>extra vlc +ristretto +>extra xfburn +>extra yelp # Optional dependencies engrampa p7zip # 7Z and ARJ archive support @@ -155,11 +211,12 @@ unace # ACE archive support unrar # RAR archive support ## Documentation +manjaro-documentation-en ## Settings packages +manjaro-awesome-settings-18.0 manjaro-browser-settings >extra manjaro-settings-samba -manjaro-awesome-settings-18.0 ## Xorg Input Drivers xf86-input-elographics @@ -170,10 +227,21 @@ xf86-input-mouse xf86-input-void ## Xorg Server and Graphics +>multilib lib32-libva-intel-driver +>multilib lib32-libva-mesa-driver +>multilib lib32-libva-vdpau-driver +libva-intel-driver +libva-mesa-driver +libva-vdpau-driver +mesa-demos +>multilib lib32-mesa-demos +numlockx xdg-user-dirs xorg-server +xorg-twm xorg-xinit xorg-xprop +xorg-xkill ## Desktop Utils perl-file-mimeinfo @@ -181,6 +249,8 @@ xdg-utils xdg-su ## Misc +gtkhash-thunar +manjaro-hotfixes >basic ufw libappindicator-gtk3 python-dbus @@ -189,7 +259,6 @@ pa-applet rofi xcape manjaro-zsh-config -manjaro-hotfixes qt5ct downgrade >extra bmenu From cc0ee7384b9bd1874d3959b494f81d9cc54340d7 Mon Sep 17 00:00:00 2001 From: Frank Kusters Date: Tue, 25 Jun 2019 23:08:42 +0200 Subject: [PATCH 4/6] [awesome] Packages and services 'equal' to Xfce Modify profile.conf and Packages-Desktop so that they are as equal as possible to the Xfce release. Most important are ufw and snapd. --- community/awesome/Packages-Desktop | 20 ++++++++++---------- community/awesome/profile.conf | 11 +++++++++-- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop index 4fe195e..eef9ce2 100644 --- a/community/awesome/Packages-Desktop +++ b/community/awesome/Packages-Desktop @@ -126,7 +126,7 @@ gtk3-classic exo-gtk3 garcon-gtk3 thunar-gtk3 -thunar-volman-gtk3 +thunar-volman tumbler xfce4-power-manager-gtk3 xfce4-settings-gtk3 @@ -137,7 +137,7 @@ xfconf-gtk3 blueman ffmpegthumbnailer # tumbler - for video thumbnails freetype2 # tumbler - for font thumbnails -gksu-polkit +gksu gnome-keyring # fix wlan segfault libgsf # tumbler - for ODF thumbnails libopenraw # tumbler - for RAW thumbnails @@ -146,11 +146,12 @@ network-manager-applet menulibre orage poppler-glib # tumbler - for PDF thumbnails -thunar-archive-plugin-gtk3 ->extra thunar-shares-plugin-gtk3 +thunar-archive-plugin +>extra thunar-shares-plugin file-roller thunar-media-tags-plugin -i3-scrot # instead of xfce4-screenshooter? +i3-scrot +xfce4-screenshooter xfce4-taskmanager pavucontrol @@ -169,9 +170,9 @@ kvantum-manjaro catfish dmidecode # optional dependency inxi engrampa -firefox +>extra firefox # >extra flashplugin -galculator +>extra galculator-gtk2 gcolor2 >extra gimp gparted @@ -183,7 +184,7 @@ htop zathura-pdf-poppler zathura-djvu inxi ->extra libreoffice-fresh +>extra libreoffice-still ms-office-online manjaro-hello manjaro-application-utility @@ -217,6 +218,7 @@ manjaro-documentation-en manjaro-awesome-settings-18.0 manjaro-browser-settings >extra manjaro-settings-samba +manjaro-zsh-config ## Xorg Input Drivers xf86-input-elographics @@ -253,12 +255,10 @@ gtkhash-thunar manjaro-hotfixes >basic ufw libappindicator-gtk3 -python-dbus mate-polkit pa-applet rofi xcape -manjaro-zsh-config qt5ct downgrade >extra bmenu diff --git a/community/awesome/profile.conf b/community/awesome/profile.conf index 2cb3392..9c9c233 100644 --- a/community/awesome/profile.conf +++ b/community/awesome/profile.conf @@ -16,7 +16,7 @@ displaymanager="lightdm" # nonfree_mhwd="true" # use extra packages as defined in pkglist to activate a full profile -extra="false" +#extra="true" ################ install ################ @@ -39,9 +39,16 @@ user_shell=/bin/zsh # unset defaults to given values # names must match systemd service names -# enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep') +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" + # the same workgroup name if samba is used # smb_workgroup="" From 9e1ddb06089fd2ff64329c9a44480fd7215ea42f Mon Sep 17 00:00:00 2001 From: Frank Kusters Date: Fri, 5 Jul 2019 20:42:00 +0200 Subject: [PATCH 5/6] [awesome] bring in line with Xfce changes --- community/awesome/Packages-Desktop | 3 ++- community/awesome/profile.conf | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop index eef9ce2..9b1b039 100644 --- a/community/awesome/Packages-Desktop +++ b/community/awesome/Packages-Desktop @@ -84,9 +84,10 @@ ttf-bitstream-vera # xfce4-terminal default Monospace >extra steam-manjaro ## Package management +gnome-software-snap pamac flatpak -snapd +apparmor appimagelauncher ## Java diff --git a/community/awesome/profile.conf b/community/awesome/profile.conf index 9c9c233..9b6490c 100644 --- a/community/awesome/profile.conf +++ b/community/awesome/profile.conf @@ -39,15 +39,15 @@ user_shell=/bin/zsh # 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') +enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' '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 strict snaps: strict_snaps="snapd core core18 gnome-3-28-1804 gtk-common-themes snap-store" +# strict_snaps="" # add classic snaps: classic_snaps="code" # classic_snaps="" # choose the snap channel. Possible options are: stable, candidate, beta, edge -# snap_channel="stable" +# snap_channel="candidate" # the same workgroup name if samba is used # smb_workgroup="" From 89966d31cea165b48ffb0e7cf4aaf1ae470b1b7c Mon Sep 17 00:00:00 2001 From: Frank Kusters Date: Fri, 5 Jul 2019 20:43:13 +0200 Subject: [PATCH 6/6] [awesome] Streamline package selection Yay is replaced by pamac, vlc by mpv. --- community/awesome/Packages-Desktop | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop index 9b1b039..df12c29 100644 --- a/community/awesome/Packages-Desktop +++ b/community/awesome/Packages-Desktop @@ -65,7 +65,6 @@ pkg-config >extra git >extra patchutils >extra subversion ->extra yay ## Fonts cantarell-fonts @@ -179,7 +178,6 @@ gcolor2 gparted gufw >extra audacious ->extra mpv >extra hexchat htop zathura-pdf-poppler @@ -202,7 +200,7 @@ screenfetch >extra poppler-data # CKJ support for pdf >basic sylpheed # mail client >extra thunderbird ->extra vlc +>extra mpv ristretto >extra xfburn >extra yelp @@ -213,7 +211,7 @@ unace # ACE archive support unrar # RAR archive support ## Documentation -manjaro-documentation-en +# manjaro-documentation-en # no use for Awesome edition ## Settings packages manjaro-awesome-settings-18.0