From f59cdd87d7afb8b3b2df16dcd24931ef0e83bfe6 Mon Sep 17 00:00:00 2001
From: Vladislav Nepogodin <nepogodin.vlad@gmail.com>
Date: Sat, 21 Aug 2021 03:00:53 +0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20use=20plasma=20as=20default?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 airootfs/etc/skel/.xinitrc |   5 +-
 packages.x86_64            |  38 ++--
 packages_xfce.x86_64       | 361 +++++++++++++++++++++++++++++++++++++
 3 files changed, 383 insertions(+), 21 deletions(-)
 create mode 100644 packages_xfce.x86_64

diff --git a/airootfs/etc/skel/.xinitrc b/airootfs/etc/skel/.xinitrc
index f77dc00..b578fad 100755
--- a/airootfs/etc/skel/.xinitrc
+++ b/airootfs/etc/skel/.xinitrc
@@ -1,3 +1,2 @@
-[ -f ~/.xprofile ] && . ~/.xprofile && dbus-launch xfce4-session
-#exec xfce4-session
-
+[ -f ~/.xprofile ] && . ~/.xprofile && dbus-launch startplasma-x11
+#[ -f ~/.xprofile ] && . ~/.xprofile && dbus-launch xfce4-session
diff --git a/packages.x86_64 b/packages.x86_64
index 7d2d544..13fa997 100644
--- a/packages.x86_64
+++ b/packages.x86_64
@@ -97,31 +97,27 @@ lightdm-gtk-greeter-settings
 accountsservice
 
 # default.desktop.cachyos
-xfce4
-#xfce4-goodies
+plasma-browser-integration
+plasma-desktop
+plasma-firewall
+plasma-framework
+plasma-integration
+plasma-nm
+plasma-pa
+plasma-systemmonitor
+plasma-thunderbolt
+plasma-workspace
 # goodies selection
 # mousepad (issues with sudo)
 xed
 parole
 ristretto
-thunar-archive-plugin
-thunar-media-tags-plugin
-xfce4-battery-plugin
-xfce4-datetime-plugin
-xfce4-mount-plugin
-xfce4-netload-plugin
-xfce4-notifyd
-xfce4-pulseaudio-plugin
-xfce4-screensaver
-xfce4-screenshooter
-xfce4-taskmanager
-xfce4-wavelan-plugin
-xfce4-weather-plugin
-xfce4-whiskermenu-plugin
-xfce4-xkb-plugin
+dolphin
+dolphin-plugins
+konsole
 neofetch
 
-# theme.xfce4.cachyos
+# theme.plasma.cachyos
 capitaine-cursors
 gtk-engine-murrine
 gnome-themes-extra
@@ -353,3 +349,9 @@ xf86-video-vmware
 
 #screen tearing at ISO
 xcompmgr
+
+# cachyos.welcome
+yad
+gspell
+#welcome
+meld
diff --git a/packages_xfce.x86_64 b/packages_xfce.x86_64
new file mode 100644
index 0000000..209e1fd
--- /dev/null
+++ b/packages_xfce.x86_64
@@ -0,0 +1,361 @@
+#
+# Additions from new archiso config files
+bind-tools
+edk2-shell
+#irssi
+#kitty-terminfo
+#lftp
+#lynx
+memtest86+
+nbd
+nmap
+nvme-cli
+rxvt-unicode-terminfo
+sudo
+syslinux
+systemd-resolvconf
+#terminus-font
+#termite-terminfo
+mkinitcpio-archiso
+
+#default.groups.packages
+# now packages
+base
+base-devel
+
+
+# kernel.cachy
+# linux (base-group)
+# not anymore in base-group, needs explicit install
+# adding old base packages here as a list
+linux
+linux-headers
+linux-firmware
+mkinitcpio
+mkinitcpio-busybox
+mkinitcpio-nfs-utils
+#dkms (broadcom-wl-dkms will bring this in)
+cryptsetup
+device-mapper
+diffutils
+e2fsprogs
+inetutils
+jfsutils
+less
+logrotate
+man-db
+man-pages
+mdadm
+nano
+perl
+reiserfsprogs
+s-nail
+sysfsutils
+systemd-sysvcompat
+texinfo
+usbutils
+vi
+which
+xfsprogs
+
+# hardware-support.packages
+lsscsi
+sdparm
+sg3_utils
+smartmontools
+
+# EFI/UEFI.packages
+refind
+
+# keyring_mirros.cachyos
+cachyos-keyring
+cachyos-mirrorlist
+
+# xorg.cachyos
+xf86-video-vesa
+xorg-server
+xorg-xinit
+xorg-xkill
+xorg-xrandr
+xorg-xinput
+mesa
+xf86-input-libinput
+xf86-video-amdgpu
+xf86-video-ati
+xf86-video-fbdev
+xf86-video-intel
+#xf86-video-nouveau
+nvidia-dkms
+nvidia-utils
+#removed as it is not needed to run nvidia driver
+#nvidia-settings
+
+# loginmanager.packages
+lightdm-gtk-greeter
+lightdm-gtk-greeter-settings
+# now needed for lightdm in some cases
+accountsservice
+
+# default.desktop.cachyos
+xfce4
+#xfce4-goodies
+# goodies selection
+# mousepad (issues with sudo)
+xed
+parole
+ristretto
+thunar-archive-plugin
+thunar-media-tags-plugin
+xfce4-battery-plugin
+xfce4-datetime-plugin
+xfce4-mount-plugin
+xfce4-netload-plugin
+xfce4-notifyd
+xfce4-pulseaudio-plugin
+xfce4-screensaver
+xfce4-screenshooter
+xfce4-taskmanager
+xfce4-wavelan-plugin
+xfce4-weather-plugin
+xfce4-whiskermenu-plugin
+xfce4-xkb-plugin
+neofetch
+
+# theme.xfce4.cachyos
+capitaine-cursors
+gtk-engine-murrine
+gnome-themes-extra
+adwaita-icon-theme
+cachyos-grub-theme
+
+# extra.desktop.packages
+dconf-editor
+file-roller
+libwnck3
+network-manager-applet
+transmission-gtk
+gnome-calculator
+
+# default.browser.cachyos
+cachy-browser
+
+# fonts
+ttf-dejavu
+ttf-liberation
+ttf-bitstream-vera
+#ttf-ubuntu-font-family
+cantarell-fonts
+#ttf-croscore
+#ttf-carlito
+#ttf-caladea
+noto-fonts
+adobe-source-han-sans-jp-fonts
+adobe-source-han-sans-kr-fonts
+adobe-source-han-sans-cn-fonts
+opendesktop-fonts
+ttf-opensans
+
+# filesystems.packages
+btrfs-progs
+dosfstools
+f2fs-tools
+lvm2
+mtools
+ntfs-3g
+exfat-utils
+nfs-utils
+nilfs-utils
+mlocate
+gvfs
+gvfs-afc
+gvfs-goa
+gvfs-gphoto2
+gvfs-mtp
+gvfs-nfs
+gvfs-smb
+
+# installation.packages
+arch-install-scripts
+pacman-contrib
+crda
+dialog
+dmraid
+efibootmgr
+efitools
+fakeroot
+gptfdisk
+grub
+haveged
+hwdetect
+hwinfo
+ntp
+os-prober
+
+# system.packages
+expect
+git
+pkgfile
+reflector
+tlp
+unrar
+unzip
+wget
+xdg-user-dirs-gtk
+xz
+gpm
+intel-ucode
+amd-ucode
+
+# for ssh
+gnome-keyring
+
+# network.packages
+#b43-firmware
+b43-fwcutter
+broadcom-wl-dkms
+dnsutils
+ipw2100-fw
+ipw2200-fw
+modemmanager
+netctl
+net-tools
+networkmanager
+networkmanager-openvpn
+nss-mdns
+usb_modeswitch
+whois
+wireless_tools
+dhclient
+dnsmasq
+elinks
+ethtool
+openconnect
+openssh
+openvpn
+rp-pppoe
+wireless-regdb
+wpa_supplicant
+wvdial
+gnu-netcat
+iwd
+linux-atm
+ndisc6
+ppp
+pptpclient
+vpnc
+xl2tpd
+r8168
+
+# calamares.cachy
+calamares
+calamares-branding-cachyos
+#calamares_current
+#calamares_test
+
+# calamares.dependencies
+lsb-release
+libpwquality
+cmake
+qt5-svg
+qt5-webengine
+yaml-cpp
+extra-cmake-modules
+boost
+
+# calamares.modules
+# dependencies for installer modules
+#for encrypted swap
+#for showing keyboard layouts
+
+# calamares.welcome
+upower
+
+# calamares.partition
+kcoreaddons
+kconfig
+ki18n
+kservice
+kwidgetsaddons
+kpmcore
+parted
+gparted
+
+# calamares.unpackfs
+squashfs-tools
+
+# calamares.others
+qt5-xmlpatterns
+doxygen
+tcpdump
+dmidecode
+kparts
+polkit-qt5
+python
+solid
+qt5-tools
+#pythonqt
+
+# liveiso.rescue-tools
+grsync
+#ddrescue
+#dd_rescue
+#testdisk
+clonezilla
+#partclone
+#partimage
+gftp
+hdparm
+fsarchiver
+#mc
+
+# sound
+alsa-utils
+alsa-plugins
+alsa-firmware
+pulseaudio-alsa
+pulseaudio-bluetooth
+pulseaudio-equalizer
+pulseaudio-jack
+
+# developers.wishes
+#htop
+glances
+#rsync (grsync will bring this in)
+hardinfo
+bash-completion
+pcurses
+tldr
+
+# needed.dependencies
+pavucontrol
+ffmpegthumbnailer
+poppler-glib
+libgsf
+libopenraw
+freetype2
+gst-libav
+gst-plugins-bad
+gst-plugins-ugly
+gst-plugin-pipewire
+gpart
+libdvdcss
+
+# AUR-support
+paru
+
+#virtualbox.packages
+virtualbox-guest-utils
+
+#Vmware.packages
+open-vm-tools
+xf86-input-vmmouse
+xf86-video-vmware
+
+#screen tearing at ISO
+xcompmgr
+
+# cachyos.welcome
+yad
+gspell
+#welcome
+meld