From eba8f5a471d8eefda540078aafb9f648a2d2932a Mon Sep 17 00:00:00 2001 From: excalibur1234 Date: Sat, 21 Apr 2018 16:22:42 +0200 Subject: [PATCH] combined kde-basic and kde-minimal profile --- community/kde-basic/Packages-Desktop | 40 ------- community/kde-basic/Packages-Live | 29 ----- community/kde-basic/Packages-Root | 24 ----- .../etc/systemd/network/20-wired.network | 8 -- .../etc/systemd/network/25-wireless.network | 8 -- community/kde-basic/live-overlay/etc/default | 1 - community/kde-basic/live-overlay/etc/fstab | 1 - .../kde-basic/live-overlay/etc/sddm.conf | 101 ------------------ .../etc/systemd/network/20-wired.network | 8 -- .../etc/systemd/network/25-wireless.network | 8 -- community/kde-basic/live-overlay/usr | 1 - community/kde-basic/profile.conf | 72 ------------- community/kde-minimal/Packages-Desktop | 30 ++++++ community/kde-minimal/Packages-Root | 2 +- .../live-overlay/etc/skel/.config/manjaro | 0 community/kde-minimal/profile.conf | 4 +- 16 files changed, 33 insertions(+), 304 deletions(-) delete mode 100644 community/kde-basic/Packages-Desktop delete mode 100644 community/kde-basic/Packages-Live delete mode 100644 community/kde-basic/Packages-Root delete mode 100644 community/kde-basic/desktop-overlay/etc/systemd/network/20-wired.network delete mode 100644 community/kde-basic/desktop-overlay/etc/systemd/network/25-wireless.network delete mode 120000 community/kde-basic/live-overlay/etc/default delete mode 120000 community/kde-basic/live-overlay/etc/fstab delete mode 100755 community/kde-basic/live-overlay/etc/sddm.conf delete mode 100644 community/kde-basic/live-overlay/etc/systemd/network/20-wired.network delete mode 100644 community/kde-basic/live-overlay/etc/systemd/network/25-wireless.network delete mode 120000 community/kde-basic/live-overlay/usr delete mode 100644 community/kde-basic/profile.conf rename community/{kde-basic => kde-minimal}/live-overlay/etc/skel/.config/manjaro (100%) diff --git a/community/kde-basic/Packages-Desktop b/community/kde-basic/Packages-Desktop deleted file mode 100644 index 229d968..0000000 --- a/community/kde-basic/Packages-Desktop +++ /dev/null @@ -1,40 +0,0 @@ - -## plasma -plasma-desktop -dolphin -konsole -kwrite - -## plasma - extra packages -kde-servicemenus-rootactions -plasma-pa -kde-gtk-config -breeze-gtk -systemd-kcm -plasma-wayland-session -xdg-user-dirs -ark -# optional dependencies of ark: -p7zip -unrar - -## display manager -sddm -sddm-kcm - -## package manager -octopi -octopi-notifier-frameworks -# octopi-cachecleaner -# octopi-repoeditor -# pacmanlogviewer - -## AUR support -base-devel -git -yaourt - -## manjaro settings manager -manjaro-settings-manager-kcm -manjaro-settings-manager-knotifier - diff --git a/community/kde-basic/Packages-Live b/community/kde-basic/Packages-Live deleted file mode 100644 index 2b0c332..0000000 --- a/community/kde-basic/Packages-Live +++ /dev/null @@ -1,29 +0,0 @@ - -## live system environment - required packages -manjaro-live-skel -manjaro-live-systemd -grub-theme-live-manjaro -nbd -mkinitcpio-nfs-utils - -## GUI installer -calamares -squashfs-tools -xdg-user-dirs - -## system repair tools for chroot, partitioning, internet research, iso writer, SMART tool, ... -manjaro-tools-base -falkon -imagewriter -gsmartcontrol -gparted -# optional dependencies of gparted: -dosfstools -f2fs-tools -btrfs-progs -exfat-utils -ntfs-3g -xfsprogs -nilfs-utils -gpart -mtools diff --git a/community/kde-basic/Packages-Root b/community/kde-basic/Packages-Root deleted file mode 100644 index 83a5c33..0000000 --- a/community/kde-basic/Packages-Root +++ /dev/null @@ -1,24 +0,0 @@ - -## base system -base - -## manjaro base system -manjaro-system -mhwd -sudo - -## required packages -systemd-sysvcompat -licenses -KERNEL -# KERNEL-r8168 - -## boot loader -grub -os-prober -memtest86+ -efibootmgr -intel-ucode - -## network: please enable the following systemd services in profile.conf file: -# 'systemd-resolved' 'systemd-networkd' diff --git a/community/kde-basic/desktop-overlay/etc/systemd/network/20-wired.network b/community/kde-basic/desktop-overlay/etc/systemd/network/20-wired.network deleted file mode 100644 index 8a23b1c..0000000 --- a/community/kde-basic/desktop-overlay/etc/systemd/network/20-wired.network +++ /dev/null @@ -1,8 +0,0 @@ -[Match] -Name=en* - -[Network] -DHCP=yes - -[DHCP] -RouteMetric=10 diff --git a/community/kde-basic/desktop-overlay/etc/systemd/network/25-wireless.network b/community/kde-basic/desktop-overlay/etc/systemd/network/25-wireless.network deleted file mode 100644 index 94a986b..0000000 --- a/community/kde-basic/desktop-overlay/etc/systemd/network/25-wireless.network +++ /dev/null @@ -1,8 +0,0 @@ -[Match] -Name=wl* - -[Network] -DHCP=yes - -[DHCP] -RouteMetric=20 diff --git a/community/kde-basic/live-overlay/etc/default b/community/kde-basic/live-overlay/etc/default deleted file mode 120000 index 812b9ff..0000000 --- a/community/kde-basic/live-overlay/etc/default +++ /dev/null @@ -1 +0,0 @@ -../../../../shared/manjaro/live-overlay/etc/default \ No newline at end of file diff --git a/community/kde-basic/live-overlay/etc/fstab b/community/kde-basic/live-overlay/etc/fstab deleted file mode 120000 index 8750aca..0000000 --- a/community/kde-basic/live-overlay/etc/fstab +++ /dev/null @@ -1 +0,0 @@ -../../../../shared/manjaro/live-overlay/etc/fstab \ No newline at end of file diff --git a/community/kde-basic/live-overlay/etc/sddm.conf b/community/kde-basic/live-overlay/etc/sddm.conf deleted file mode 100755 index c57650b..0000000 --- a/community/kde-basic/live-overlay/etc/sddm.conf +++ /dev/null @@ -1,101 +0,0 @@ -[Autologin] -# Autologin again on session exit -Relogin=false - -# Autologin session -Session=plasma.desktop - -# Autologin user -User=manjaro - - -[General] -# Halt command -HaltCommand=/usr/bin/systemctl poweroff - -# Initial NumLock state -# Valid values: on|off|none -# If property is set to none, numlock won't be changed -Numlock=none - -# Reboot command -RebootCommand=/usr/bin/systemctl reboot - - -[Theme] -# Current theme name -Current=breeze-text-only - -# Cursor theme -CursorTheme=breeze_cursors - -# Face icon directory -# The files should be in username.face.icon format -FacesDir=/usr/share/sddm/faces - -# Theme directory path -ThemeDir=/usr/share/sddm/themes - - -[Users] -# Default $PATH -DefaultPath=/bin:/usr/bin:/usr/local/bin - -# Hidden shells -# Users with these shells as their default won't be listed -HideShells= - -# Hidden users -HideUsers= - -# Maximum user id for displayed users -MaximumUid=60000 - -# Minimum user id for displayed users -MinimumUid=1000 - -# Remember the session of the last successfully logged in user -RememberLastSession=true - -# Remember the last successfully logged in user -RememberLastUser=true - -[Wayland] -# Wayland session script path -# A script to execute when starting the desktop session -SessionCommand=/usr/share/sddm/scripts/wayland-session - -# Session description directory -SessionDir=/usr/share/wayland-sessions - -[X11] -# Xsetup script path -# A script to execute when starting the display server -DisplayCommand=/usr/share/sddm/scripts/Xsetup - -# Xstop script path -# A script to execute when stopping the display server -DisplayStopCommand=/usr/share/sddm/scripts/Xstop - -# Minimum VT -# The lowest virtual terminal number that will be used. -MinimumVT=1 - -# X server arguments -ServerArguments=-nolisten tcp - -# X server path -ServerPath=/usr/bin/X - -# Xsession script path -# A script to execute when starting the desktop session -SessionCommand=/usr/share/sddm/scripts/Xsession - -# Session description directory -SessionDir=/usr/share/xsessions - -# Xauth path -XauthPath=/usr/bin/xauth - -# Xephyr path -XephyrPath=/usr/bin/Xephyr diff --git a/community/kde-basic/live-overlay/etc/systemd/network/20-wired.network b/community/kde-basic/live-overlay/etc/systemd/network/20-wired.network deleted file mode 100644 index 8a23b1c..0000000 --- a/community/kde-basic/live-overlay/etc/systemd/network/20-wired.network +++ /dev/null @@ -1,8 +0,0 @@ -[Match] -Name=en* - -[Network] -DHCP=yes - -[DHCP] -RouteMetric=10 diff --git a/community/kde-basic/live-overlay/etc/systemd/network/25-wireless.network b/community/kde-basic/live-overlay/etc/systemd/network/25-wireless.network deleted file mode 100644 index 94a986b..0000000 --- a/community/kde-basic/live-overlay/etc/systemd/network/25-wireless.network +++ /dev/null @@ -1,8 +0,0 @@ -[Match] -Name=wl* - -[Network] -DHCP=yes - -[DHCP] -RouteMetric=20 diff --git a/community/kde-basic/live-overlay/usr b/community/kde-basic/live-overlay/usr deleted file mode 120000 index b56c83d..0000000 --- a/community/kde-basic/live-overlay/usr +++ /dev/null @@ -1 +0,0 @@ -../../../shared/manjaro/live-overlay/usr \ No newline at end of file diff --git a/community/kde-basic/profile.conf b/community/kde-basic/profile.conf deleted file mode 100644 index f36c5c6..0000000 --- a/community/kde-basic/profile.conf +++ /dev/null @@ -1,72 +0,0 @@ -########################################## -###### use this file in the profile ###### -########################################## - -# use multilib packages; x86_64 only -# multilib="true" - -displaymanager="sddm" - -# Set to false to disable autologin in the livecd -# autologin="true" - -# nonfree mhwd drivers -nonfree_mhwd="false" - -# 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 -# chrootcfg="false" - -# use geoip for localization -# geoip='true' - -# unset defaults to given values -# names must match systemd service names -enable_systemd=( 'systemd-resolved' 'systemd-networkd' ) -disable_systemd=('pacman-init') - -# unset defaults to given values, -# names must match openrc service names -# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') -# disable_openrc=() - -# the same workgroup name if samba is used -# smb_workgroup="" - -################# livecd ################# - -# unset defaults to given value -# hostname="manjaro" - -# unset defaults to given value -# username="manjaro" - -# unset defaults to given value -# password="manjaro" - -# the login shell -# defaults to bash -# login_shell=/bin/bash - -# unset defaults to given values -# addgroups="video,audio,power,disk,storage,optical,network,lp,scanner,wheel" - -# unset defaults to given values -# names must match systemd service names -# services in enable_systemd array don't need to be listed here -enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live' 'systemd-resolved' 'systemd-networkd') - -# unset defaults to given values, -# names must match openrc service names -# services in enable_openrc array don't need to be listed here -# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live') diff --git a/community/kde-minimal/Packages-Desktop b/community/kde-minimal/Packages-Desktop index bce5efe..c6fa9ae 100644 --- a/community/kde-minimal/Packages-Desktop +++ b/community/kde-minimal/Packages-Desktop @@ -3,8 +3,38 @@ plasma-desktop dolphin konsole +>extra kwrite + +## plasma - extra packages +>extra kde-servicemenus-rootactions +>extra plasma-pa +>extra kde-gtk-config +>extra breeze-gtk +>extra systemd-kcm +>extra plasma-wayland-session +>extra xdg-user-dirs +>extra ark +# optional dependencies of ark: +>extra p7zip +>extra unrar ## display manager sddm +>extra sddm-kcm +## package manager +>extra octopi +>extra octopi-notifier-frameworks +>extra octopi-cachecleaner +>extra octopi-repoeditor +>extra pacmanlogviewer +## AUR support +>extra base-devel +>extra git +>extra yaourt + +## manjaro settings manager +>extra manjaro-settings-manager +>extra manjaro-settings-manager-kcm +>extra manjaro-settings-manager-knotifier diff --git a/community/kde-minimal/Packages-Root b/community/kde-minimal/Packages-Root index 83a5c33..669c3f2 100644 --- a/community/kde-minimal/Packages-Root +++ b/community/kde-minimal/Packages-Root @@ -20,5 +20,5 @@ memtest86+ efibootmgr intel-ucode -## network: please enable the following systemd services in profile.conf file: +## network: please enable the following systemd services in profile.conf file both for live and installed systems: # 'systemd-resolved' 'systemd-networkd' diff --git a/community/kde-basic/live-overlay/etc/skel/.config/manjaro b/community/kde-minimal/live-overlay/etc/skel/.config/manjaro similarity index 100% rename from community/kde-basic/live-overlay/etc/skel/.config/manjaro rename to community/kde-minimal/live-overlay/etc/skel/.config/manjaro diff --git a/community/kde-minimal/profile.conf b/community/kde-minimal/profile.conf index f36c5c6..d5f14a7 100644 --- a/community/kde-minimal/profile.conf +++ b/community/kde-minimal/profile.conf @@ -11,10 +11,10 @@ displaymanager="sddm" # autologin="true" # nonfree mhwd drivers -nonfree_mhwd="false" +# nonfree_mhwd="false" # use extra packages as defined in pkglist to activate a full profile -# extra="false" +extra="false" ################ install ################