Merge remote-tracking branch 'upstream/manjaro-architect' into manjaro-architect

# Conflicts:
#	community/openbox/Packages-Desktop
This commit is contained in:
Frede Hundewadt 2019-11-19 16:36:39 +01:00
commit 55a41db560
No known key found for this signature in database
GPG key ID: 7605992471F3F073
6 changed files with 84 additions and 65 deletions

View file

@ -1,4 +1,4 @@
##################################333
##################################
## extra packages
##------------> Java
@ -31,11 +31,9 @@
#>extra ttf-droid
##------------> Extra Applications
>extra gufw
>extra guvcview
>extra transmission-gtk
>extra gimp
>extra libreoffice-fresh
>extra vlc
>extra thunderbird
>extra xfburn
@ -93,7 +91,7 @@
##------------> file utilites
>extra ffmpegthumbnailer # tumbler - for video thumbnails
>extra gconf # fix qt-theme
#>extra gconf # fix qt-theme
>extra libgsf # tumbler - for ODF thumbnails
>extra libopenraw # tumbler - for RAW thumbnails
>extra poppler-data #CKJ support for pdf
@ -109,13 +107,19 @@
##------------> xfce utils
>extra manjaro-lxde-xfce4-notifyd
>extra manjaro-lxde-xfce4-volumed-pulse
>extra xfce4-notifyd
>extra xfce4-power-manager
#>extra xfce4-notifyd
>extra xfce4-notifyd-gtk3
#>extra xfce4-power-manager
>extra xfce4-power-manager-gtk3
>extra xfce4-volumed-pulse
############################################
## minimal / base packages
##------------> Power manager
tlp-rdw
tlpui
##------------> Extra Themes/Artwork
lxde-wallpapers
@ -182,11 +186,12 @@ firefox
##------------> base cli apps
inxi
dmidecode
scrot
numlockx
powertop
htop
mlocate
numlockx
pastebinit
powertop
scrot
##------------> settings manager
manjaro-settings-manager
@ -201,24 +206,35 @@ ttf-dejavu
ttf-roboto
##------------> network
firewalld
network-manager-applet
networkmanager
networkmanager-openvpn
openresolv
##------------> filemanager
pcmanfm
#pcmanfm
pcmanfm-gtk3
##------------> core
lxappearance-obconf
#lxappearance
lxappearance-gtk3
#lxappearance-obconf
lxappearance-obconf-gtk3
lxde-common
lxhotkey
lxinput
lxlauncher
lxpanel
lxrandr
lxsession
lxtask
#lxinput
lxinput-gtk3
#lxlauncher
lxlauncher-gtk3
#lxpanel
lxpanel-gtk3
#lxrandr
lxrandr-gtk3
#lxsession
lxsession-gtk3
#lxtask
lxtask-gtk3
lxterminal
perl-file-mimeinfo
@ -251,6 +267,7 @@ freetype2
##------------> System
#polkit is provided by lxsession
accountsservice
dconf
gksu-polkit
gnome-keyring
gtk3-classic

View file

@ -1,10 +1,10 @@
[greeter]
background = /usr/share/backgrounds/lxde-breath.png
font-name = Cantarell 12
font-name = Roboto 11
xft-antialias = true
icon-theme-name = Arc-Maia
icon-theme-name = Papirus-Dark
screensaver-timeout = 60
theme-name = Adapta-Eta-Maia
theme-name = Matcha-dark-sea
cursor-theme-name = xcursor-breeze
show-clock = false
default-user-image = #avatar-default

View file

@ -6,7 +6,7 @@
multilib=false
# use extra packages as defined in pkglist to activate a full profile
extra="false"
#extra="true"
################ install ################
@ -37,8 +37,8 @@ geoip="true"
# unset defaults to given values
# names must match systemd service names
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'systemd-timesyncd' 'tlp' 'tlp-sleep' 'ufw')
disable_systemd=('pacman-init')
enable_systemd=('avahi-daemon' 'bluetooth' 'NetworkManager' 'NetworkManager-dispatcher' 'org.cups.cupsd' 'systemd-timesyncd' 'tlp' 'tlp-sleep' 'filewalld')
disable_systemd=('pacman-init' 'systemd-rfkill.service' 'systemd-rfkill.socket')
# the same workgroup name if samba is used
# smb_workgroup=""
@ -49,9 +49,6 @@ disable_systemd=('pacman-init')
# empty value will not be used
user_shell="/bin/zsh"
# the same workgroup name if samba is used
#smb_workgroup="Manjaro"
################# live-session #################
# unset defaults to given value

View file

@ -12,10 +12,10 @@ displaymanager="lightdm"
autologin="true"
# nonfree mhwd drivers
nonfree_mhwd="true"
#nonfree_mhwd="true"
# use extra packages as defined in pkglist to activate a full profile
extra="false"
#extra="true"
################ install ################

View file

@ -18,21 +18,11 @@
>extra pulseaudio-alsa
>extra volumeicon
##---------> graphic applications
>extra gcolor2
>extra gimp
>extra pix
##---------> connect packages
>extra blueman
>extra bluez
>extra gvfs
>extra gvfs-mtp
>extra gvfs-nfs
>extra gvfs-smb
>extra udiskie
##---------> extra fonts
>extra noto-fonts
@ -54,7 +44,7 @@
>extra system-config-printer
##---------> file utilities
>extra catfish
#>extra catfish
>extra engrampa
>extra ffmpegthumbnailer
>extra mlocate
@ -74,21 +64,20 @@
##---------> disk utilities
>extra gnome-disk-utility
>extra mintstick
>extra xfburn
#>extra xfburn
##---------> GUI internet apps
chromium
>extra firefox
>extra thunderbird
##---------> flatpak snap
#>extra apparmor
##---------> flatpak support
#>extra flatpak
#>extra fpakman
#>extra snapd
##---------> firewall
>extra firewalld
##---------> snap support
#>extra apparmor
#>extra snapd
#>extra snapd-glib
##---------> powermanager
>extra xfce4-power-manager-gtk3
@ -104,6 +93,7 @@ chromium
##---------> GUI package manager
>extra pamac-gtk
>extra bauh
#-------------------------------------------------
##### EDITION BASE PACKAGES
@ -122,10 +112,10 @@ wallpapers-juhraya
##---------> edition theming and settings
kvantum-theme-matcha
manjaro-grub-theme-glassfield
manjaro-grub-theme-sunset
manjaro-openbox-matcha
manjaro-openbox-scripts
manjaro-slick-greeter-theme-glassfield
manjaro-slick-greeter-theme-sunset
manjaro-zsh-config
matcha-gtk-theme
papirus-maia-icon-theme
@ -155,6 +145,17 @@ alsa-plugins
lynx
w3m
##---------> connect packages
gvfs
gvfs-afc
gvfs-gphoto2
gvfs-mtp
gvfs-nfs
gvfs-smb
mtpfs
udiskie
udisks2
##---------> GUI file manager
pcmanfm-gtk3
thunar-gtk3
@ -184,7 +185,6 @@ pastebinit
ps_mem
tree
upower
xterm
##---------> network utilities
arp-scan
@ -194,6 +194,16 @@ openssh
traceroute
whois
##---------> network
blueman
bluez
firewalld
network-manager-applet
networkmanager
networkmanager-dmenu
networkmanager-openvpn
openresolv
##---------> display manager and greeter
lightdm
lightdm-settings
@ -223,17 +233,10 @@ ttf-material-icons
ttf-polybar-icons
ttf-roboto
##---------> network
# network-manager-applet
networkmanager
networkmanager-dmenu
networkmanager-openvpn
openresolv
##---------> core
arandr
picom
conky
compton
conky-lua-nv
dunst
exo-gtk3
fakeroot
@ -246,7 +249,7 @@ libmpdclient
lxmenu-data
nitrogen
numlockx
ob-autostart
# ob-autostart
obconf
obkey-gtk3
obmenu-generator
@ -300,7 +303,7 @@ freetype2
accountsservice
gksu-polkit
gnome-keyring
gtk3-classic
gtk3
manjaro-hotfixes
polkit
polkit-gnome
@ -325,3 +328,4 @@ xorg-xkill
xorg-xprop
xorg-xwininfo
xf86-input-libinput
xterm

View file

@ -11,11 +11,11 @@ displaymanager="lightdm"
# Set to false to disable autologin in the livecd
autologin="true"
# nonfree mhwd drivers
nonfree_mhwd="false"
## nonfree mhwd drivers
nonfree_mhwd="true"
# use extra packages as defined in pkglist to activate a full profile
extra="false"
#extra="true"
################ install ################
@ -36,6 +36,7 @@ addgroups="lp,network,power,sys,wheel"
# 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' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
enable_systemd=('avahi-daemon' 'bluetooth' 'firewalld' 'NetworkManager' 'org.cups.cupsd' 'haveged')
# add strict snaps: strict_snaps="snapd core core18 gnome-3-28-1804 gtk-common-themes snap-store"