Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Frede Hundewadt 2019-08-10 09:24:19 +02:00
commit ba16286d12
No known key found for this signature in database
GPG Key ID: 7605992471F3F073
8 changed files with 24 additions and 9 deletions

View File

@ -1,7 +1,7 @@
adapta-maia-theme
alsa-firmware
alsa-utils
apparmor
>extra apparmor
autoconf
automake
avahi
@ -21,7 +21,7 @@ fakeroot
flatpak
flex
fpakman
>extra freeoffice
#>extra freeoffice
>extra galculator
>extra gcc
>extra >multilib gcc-libs-multilib
@ -118,7 +118,7 @@ python2-ptyprocess
python-ptyprocess
qt5-styleplugins
screenfetch
snapd
>extra snapd
>extra subversion
>extra system-config-printer
>extra terminus-font
@ -153,6 +153,7 @@ xdg-user-dirs
xorg-server
xorg-xhost
xorg-xkill
>extra xorg-xrandr
>extra yay
yelp
zensu

View File

@ -1,4 +1,4 @@
calamares
calamares-git
cinnamon-live
clonezilla
grub-theme-live-manjaro

View File

@ -35,7 +35,9 @@ enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManag
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"
#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

View File

@ -61,7 +61,6 @@ inxi
>multilib lib32-flex
>extra libdvdcss
>extra libimobiledevice
>extra libreoffice-fresh
libtool
KERNEL-headers # needed for deepin-anything and its vfs_monitor dkms-module...
m4

View File

@ -1,4 +1,4 @@
calamares
calamares-git
deepin-live
grub-theme-live-manjaro
gsmartcontrol

View File

@ -2,6 +2,7 @@ accountsservice
alsa-firmware
alsa-plugins
alsa-utils
>extra apparmor
arandr
>basic i3-default-artwork
>extra artwork-i3
@ -25,6 +26,7 @@ fakeroot
>extra ffmpegthumbnailer
>extra flac
flex
>extra fpakman
>extra gcc
>extra >multilib gcc-libs-multilib
>extra >multilib gcc-multilib
@ -118,6 +120,7 @@ qt5-styleplugins
ranger
sbxkb
screenfetch
>extra snapd
speedtest-cli
>extra subversion
syslog-ng

View File

@ -194,6 +194,7 @@ for_window [title="alsamixer"] floating enable border pixel 1
for_window [class="calamares"] floating enable border normal
for_window [class="Clipgrab"] floating enable
for_window [title="File Transfer*"] floating enable
for_window [class="fpakman"] floating enable
for_window [class="Galculator"] floating enable border pixel 1
for_window [class="GParted"] floating enable border normal
for_window [title="i3_help"] floating enable sticky enable border normal

View File

@ -15,7 +15,7 @@ displaymanager="lightdm"
# autologin="true"
# nonfree xorg drivers
# nonfree_mhwd="true"
nonfree_mhwd="true"
# possible values: grub;systemd-boot
# efi_boot_loader="grub"
@ -31,9 +31,18 @@ displaymanager="lightdm"
# 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')
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"