forked from mirrored-repos/iso-profiles
Merge branch 'master' into xfce2awesome
This commit is contained in:
commit
af63397465
7 changed files with 38 additions and 16 deletions
|
@ -1,5 +1,6 @@
|
||||||
adwaita-icon-theme
|
adwaita-icon-theme
|
||||||
alsa-firmware
|
alsa-firmware
|
||||||
|
apparmor
|
||||||
baobab
|
baobab
|
||||||
dconf-editor
|
dconf-editor
|
||||||
dmidecode
|
dmidecode
|
||||||
|
@ -100,6 +101,7 @@ networkmanager-vpnc
|
||||||
nss-mdns
|
nss-mdns
|
||||||
numlockx
|
numlockx
|
||||||
openresolv
|
openresolv
|
||||||
|
gnome-software-snap
|
||||||
pamac
|
pamac
|
||||||
flatpak
|
flatpak
|
||||||
polkit-gnome
|
polkit-gnome
|
||||||
|
@ -128,7 +130,6 @@ ttf-inconsolata
|
||||||
ttf-indic-otf
|
ttf-indic-otf
|
||||||
ttf-liberation
|
ttf-liberation
|
||||||
usb_modeswitch
|
usb_modeswitch
|
||||||
haveged
|
|
||||||
vino
|
vino
|
||||||
xdg-su
|
xdg-su
|
||||||
xdg-user-dirs
|
xdg-user-dirs
|
||||||
|
|
2
manjaro/gnome/desktop-overlay/etc/gdm/PostLogin/Default
Executable file
2
manjaro/gnome/desktop-overlay/etc/gdm/PostLogin/Default
Executable file
|
@ -0,0 +1,2 @@
|
||||||
|
#!/bin/sh
|
||||||
|
grep -q "^AutomaticLoginEnable=True" /etc/gdm/custom.conf || pkill -KILL -u gdm
|
|
@ -34,7 +34,7 @@ displaymanager="gdm"
|
||||||
|
|
||||||
# unset defaults to given values
|
# unset defaults to given values
|
||||||
# names must match systemd service names
|
# names must match systemd service names
|
||||||
enable_systemd=('bluetooth' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-demon' 'haveged')
|
enable_systemd=('bluetooth' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-demon' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
|
||||||
disable_systemd=('pacman-init')
|
disable_systemd=('pacman-init')
|
||||||
|
|
||||||
# unset defaults to given values,
|
# unset defaults to given values,
|
||||||
|
@ -45,6 +45,13 @@ disable_systemd=('pacman-init')
|
||||||
# unset defaults to given values
|
# unset defaults to given values
|
||||||
# addgroups="lp,network,power,wheel"
|
# addgroups="lp,network,power,wheel"
|
||||||
|
|
||||||
|
# add strict snaps: strict_snaps="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="candidate"
|
||||||
|
|
||||||
# the same workgroup name if samba is used
|
# the same workgroup name if samba is used
|
||||||
# smb_workgroup=""
|
# smb_workgroup=""
|
||||||
|
|
||||||
|
|
|
@ -92,15 +92,19 @@ terminus-font
|
||||||
|
|
||||||
## Package management
|
## Package management
|
||||||
appimagelauncher
|
appimagelauncher
|
||||||
#packagekit-qt5
|
pamac-cli
|
||||||
|
packagekit-qt5
|
||||||
|
apparmor
|
||||||
|
snapd
|
||||||
|
discover-snap
|
||||||
#discover
|
#discover
|
||||||
flatpak
|
#flatpak
|
||||||
#fwupd
|
fwupd
|
||||||
#octopi
|
octopi
|
||||||
#octopi-cachecleaner
|
#octopi-cachecleaner
|
||||||
#octopi-repoeditor
|
#octopi-repoeditor
|
||||||
#octopi-notifier-frameworks
|
#octopi-notifier-frameworks
|
||||||
pamac-qt
|
#pamac-qt
|
||||||
#manjaro-application-utility
|
#manjaro-application-utility
|
||||||
|
|
||||||
## Printing
|
## Printing
|
||||||
|
@ -319,6 +323,6 @@ xdg-su
|
||||||
manjaro-hotfixes
|
manjaro-hotfixes
|
||||||
|
|
||||||
## Flatpak support
|
## Flatpak support
|
||||||
#>extra flatpak
|
>extra flatpak
|
||||||
#>extra xdg-desktop-portal
|
>extra xdg-desktop-portal
|
||||||
#>extra xdg-desktop-portal-kde
|
>extra xdg-desktop-portal-kde
|
||||||
|
|
|
@ -31,9 +31,16 @@ extra="true"
|
||||||
# use geoip for localization
|
# use geoip for localization
|
||||||
# geoip='true'
|
# geoip='true'
|
||||||
|
|
||||||
|
# add strict snaps: strict_snaps="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="candidate"
|
||||||
|
|
||||||
# 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')
|
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' 'apparmor' 'snapd.apparmor' 'snapd')
|
||||||
disable_systemd=('pacman-init')
|
disable_systemd=('pacman-init')
|
||||||
|
|
||||||
# unset defaults to given values,
|
# unset defaults to given values,
|
||||||
|
|
|
@ -82,9 +82,10 @@ ttf-bitstream-vera # xfce4-terminal default Monospace
|
||||||
>extra steam-manjaro
|
>extra steam-manjaro
|
||||||
|
|
||||||
## Package management
|
## Package management
|
||||||
|
gnome-software-snap
|
||||||
pamac
|
pamac
|
||||||
flatpak
|
flatpak
|
||||||
snapd
|
apparmor
|
||||||
|
|
||||||
## Java
|
## Java
|
||||||
>extra jdk8-openjdk
|
>extra jdk8-openjdk
|
||||||
|
|
|
@ -32,15 +32,15 @@ displaymanager="lightdm"
|
||||||
|
|
||||||
# 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' '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')
|
disable_systemd=('pacman-init')
|
||||||
|
|
||||||
# add strict snaps: strict_snaps="core core18 gnome-3-28-1804 gtk-common-themes snap-store"
|
# add strict snaps: strict_snaps="snapd 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=""
|
||||||
# add classic snaps: classic_snaps="code"
|
# add classic snaps: classic_snaps="code"
|
||||||
# classic_snaps=""
|
# classic_snaps=""
|
||||||
# choose the snap channel. Possible options are: stable, candidate, beta, edge
|
# 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
|
# the same workgroup name if samba is used
|
||||||
# smb_workgroup=""
|
# smb_workgroup=""
|
||||||
|
|
Loading…
Reference in a new issue