forked from mirrored-repos/iso-profiles
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
f09982a0b2
6 changed files with 44 additions and 22 deletions
|
@ -1,6 +1,7 @@
|
||||||
adapta-maia-theme
|
adapta-maia-theme
|
||||||
alsa-firmware
|
alsa-firmware
|
||||||
alsa-utils
|
alsa-utils
|
||||||
|
apparmor
|
||||||
autoconf
|
autoconf
|
||||||
automake
|
automake
|
||||||
avahi
|
avahi
|
||||||
|
@ -17,7 +18,10 @@ dmidecode
|
||||||
fakeroot
|
fakeroot
|
||||||
>extra ffmpegthumbnailer
|
>extra ffmpegthumbnailer
|
||||||
>extra firefox
|
>extra firefox
|
||||||
|
flatpak
|
||||||
flex
|
flex
|
||||||
|
fpakman
|
||||||
|
>extra freeoffice
|
||||||
>extra galculator
|
>extra galculator
|
||||||
>extra gcc
|
>extra gcc
|
||||||
>extra >multilib gcc-libs-multilib
|
>extra >multilib gcc-libs-multilib
|
||||||
|
@ -56,7 +60,6 @@ inxi
|
||||||
libtool
|
libtool
|
||||||
>extra libdvdcss
|
>extra libdvdcss
|
||||||
>extra libgsf
|
>extra libgsf
|
||||||
>extra libreoffice-fresh
|
|
||||||
lightdm-settings
|
lightdm-settings
|
||||||
lightdm-slick-greeter
|
lightdm-slick-greeter
|
||||||
m4
|
m4
|
||||||
|
@ -115,6 +118,7 @@ python2-ptyprocess
|
||||||
python-ptyprocess
|
python-ptyprocess
|
||||||
qt5-styleplugins
|
qt5-styleplugins
|
||||||
screenfetch
|
screenfetch
|
||||||
|
snapd
|
||||||
>extra subversion
|
>extra subversion
|
||||||
>extra system-config-printer
|
>extra system-config-printer
|
||||||
>extra terminus-font
|
>extra terminus-font
|
||||||
|
@ -129,7 +133,6 @@ ttf-bitstream-vera
|
||||||
>extra ttf-liberation
|
>extra ttf-liberation
|
||||||
>extra udiskie
|
>extra udiskie
|
||||||
vi
|
vi
|
||||||
>extra vlc
|
|
||||||
>extra xcursor-chameleon-pearl-deepin
|
>extra xcursor-chameleon-pearl-deepin
|
||||||
xdg-su
|
xdg-su
|
||||||
xdg-user-dirs-gtk
|
xdg-user-dirs-gtk
|
||||||
|
@ -143,6 +146,7 @@ xf86-input-mouse
|
||||||
xf86-input-void
|
xf86-input-void
|
||||||
xorg-twm
|
xorg-twm
|
||||||
xorg-xinit
|
xorg-xinit
|
||||||
|
>extra xplayer
|
||||||
>extra xreader
|
>extra xreader
|
||||||
>extra xviewer-plugins
|
>extra xviewer-plugins
|
||||||
xdg-user-dirs
|
xdg-user-dirs
|
||||||
|
@ -150,4 +154,5 @@ xorg-server
|
||||||
xorg-xhost
|
xorg-xhost
|
||||||
xorg-xkill
|
xorg-xkill
|
||||||
>extra yay
|
>extra yay
|
||||||
|
yelp
|
||||||
zensu
|
zensu
|
||||||
|
|
|
@ -31,9 +31,16 @@ nonfree_mhwd="true"
|
||||||
|
|
||||||
# unset defaults to given values
|
# unset defaults to given values
|
||||||
# names must match systemd service names
|
# names must match systemd service names
|
||||||
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw')
|
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
|
||||||
disable_systemd=('pacman-init')
|
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
|
# unset defaults to given values
|
||||||
# addgroups="lp,network,power,wheel"
|
# addgroups="lp,network,power,wheel"
|
||||||
|
|
||||||
|
|
|
@ -101,9 +101,11 @@ networkmanager-vpnc
|
||||||
nss-mdns
|
nss-mdns
|
||||||
numlockx
|
numlockx
|
||||||
openresolv
|
openresolv
|
||||||
gnome-software-snap
|
#gnome-software-snap
|
||||||
pamac
|
|
||||||
flatpak
|
flatpak
|
||||||
|
fpakman
|
||||||
|
pamac
|
||||||
|
snapd
|
||||||
polkit-gnome
|
polkit-gnome
|
||||||
powertop
|
powertop
|
||||||
pulseaudio-bluetooth
|
pulseaudio-bluetooth
|
||||||
|
@ -147,7 +149,7 @@ xorg-xinit
|
||||||
>extra xf86-input-wacom #support for tablet and pen display ( wacom ecc. )
|
>extra xf86-input-wacom #support for tablet and pen display ( wacom ecc. )
|
||||||
yelp
|
yelp
|
||||||
|
|
||||||
#ms-office-online
|
ms-office-online
|
||||||
freeoffice
|
freeoffice
|
||||||
|
|
||||||
#extra depends for file-roller
|
#extra depends for file-roller
|
||||||
|
|
|
@ -91,16 +91,18 @@ terminus-font
|
||||||
>extra steam-manjaro
|
>extra steam-manjaro
|
||||||
|
|
||||||
## Package management
|
## Package management
|
||||||
appimagelauncher
|
#appimagelauncher
|
||||||
pamac-cli
|
pamac
|
||||||
packagekit-qt5
|
#pamac-cli
|
||||||
apparmor
|
apparmor
|
||||||
snapd
|
snapd
|
||||||
discover-snap
|
#discover-snap
|
||||||
#discover
|
#discover
|
||||||
#flatpak
|
#packagekit-qt5
|
||||||
|
flatpak
|
||||||
|
fpakman
|
||||||
fwupd
|
fwupd
|
||||||
octopi
|
#octopi
|
||||||
#octopi-cachecleaner
|
#octopi-cachecleaner
|
||||||
#octopi-repoeditor
|
#octopi-repoeditor
|
||||||
#octopi-notifier-frameworks
|
#octopi-notifier-frameworks
|
||||||
|
|
|
@ -82,10 +82,12 @@ ttf-bitstream-vera # xfce4-terminal default Monospace
|
||||||
>extra steam-manjaro
|
>extra steam-manjaro
|
||||||
|
|
||||||
## Package management
|
## Package management
|
||||||
gnome-software-snap
|
|
||||||
pamac
|
|
||||||
flatpak
|
|
||||||
apparmor
|
apparmor
|
||||||
|
#gnome-software-snap
|
||||||
|
flatpak
|
||||||
|
fpakman
|
||||||
|
pamac
|
||||||
|
snapd
|
||||||
|
|
||||||
## Java
|
## Java
|
||||||
>extra jdk8-openjdk
|
>extra jdk8-openjdk
|
||||||
|
@ -210,8 +212,8 @@ htop
|
||||||
qpdfview
|
qpdfview
|
||||||
inxi
|
inxi
|
||||||
#>extra libreoffice-still
|
#>extra libreoffice-still
|
||||||
#ms-office-online
|
microsoft-office-online-jak
|
||||||
freeoffice
|
>extra freeoffice
|
||||||
manjaro-hello
|
manjaro-hello
|
||||||
manjaro-application-utility
|
manjaro-application-utility
|
||||||
manjaro-settings-manager
|
manjaro-settings-manager
|
||||||
|
@ -278,5 +280,9 @@ xdg-su
|
||||||
gtkhash-thunar
|
gtkhash-thunar
|
||||||
manjaro-hotfixes
|
manjaro-hotfixes
|
||||||
|
|
||||||
## Workarounds
|
## Handshake tools
|
||||||
boost-libs # needed to fix systemd-journal on live-boot
|
#faucet-tool
|
||||||
|
#hnsd-git
|
||||||
|
#hsd-git
|
||||||
|
#veracrypt
|
||||||
|
#cryptoseed
|
||||||
|
|
|
@ -16,15 +16,15 @@ mesa-vdpau
|
||||||
>multilib lib32-mesa-vdpau
|
>multilib lib32-mesa-vdpau
|
||||||
>multilib lib32-libxvmc
|
>multilib lib32-libxvmc
|
||||||
>multilib lib32-primus
|
>multilib lib32-primus
|
||||||
>nonfree_default catalyst-utils
|
#>nonfree_default catalyst-utils
|
||||||
>nonfree_default KERNEL-catalyst
|
#>nonfree_default KERNEL-catalyst
|
||||||
>nonfree_default KERNEL-nvidia
|
>nonfree_default KERNEL-nvidia
|
||||||
>nonfree_default KERNEL-nvidia-340xx
|
>nonfree_default KERNEL-nvidia-340xx
|
||||||
>nonfree_default KERNEL-nvidia-390xx
|
>nonfree_default KERNEL-nvidia-390xx
|
||||||
>nonfree_default nvidia-340xx-utils
|
>nonfree_default nvidia-340xx-utils
|
||||||
>nonfree_default nvidia-390xx-utils
|
>nonfree_default nvidia-390xx-utils
|
||||||
>nonfree_default nvidia-utils
|
>nonfree_default nvidia-utils
|
||||||
>nonfree_multilib lib32-catalyst-utils
|
#>nonfree_multilib lib32-catalyst-utils
|
||||||
>nonfree_multilib lib32-nvidia-utils
|
>nonfree_multilib lib32-nvidia-utils
|
||||||
>nonfree_multilib lib32-nvidia-340xx-utils
|
>nonfree_multilib lib32-nvidia-340xx-utils
|
||||||
>nonfree_multilib lib32-nvidia-390xx-utils
|
>nonfree_multilib lib32-nvidia-390xx-utils
|
||||||
|
|
Loading…
Reference in a new issue