From c979fafc0d613dab3011da6f7b5adde2581fe2f3 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <72007820+behdanisohrab@users.noreply.github.com>
Date: Sat, 11 May 2024 18:23:51 +0330
Subject: [PATCH] fixed some problems

---
 etc/calamares/modules/netinstall.yaml | 560 +++++++++++++-------------
 1 file changed, 281 insertions(+), 279 deletions(-)

diff --git a/etc/calamares/modules/netinstall.yaml b/etc/calamares/modules/netinstall.yaml
index f17174f..6a162db 100644
--- a/etc/calamares/modules/netinstall.yaml
+++ b/etc/calamares/modules/netinstall.yaml
@@ -1,212 +1,208 @@
-  description: "needed ParchLinux packages"
-  hidden: true
-  selected: true
-  critical: true
-  packages:
-     - parch-branding
-     - parch-pacman
-     - parch-emoji-ios
-     - fastfetch
-     - paru
-     - parch-grub
-     - reflector-simple
-     - parch-plymouth
-     - base-devel
 - name: "ParchLinux Packages"
   description: "needed ParchLinux packages"
   hidden: false
   selected: true
   critical: true
   packages:
-     - firefox
+    - parch-branding
+    - parch-pacman
+    - parch-emoji-ios
+    - fastfetch
+    - paru
+    - parch-grub
+    - reflector-simple
+    - parch-plymouth
+    - base-devel
+
 - name: "Base-devel + Common packages"
   description: "Recommended. Don't change unless you know what you're doing (generic)."
   hidden: false
   selected: true
   critical: true
   subgroups:
-      - name: "X-system"
-        description: "Default X-system"
-        selected: true
-        packages:
-           - libwnck3
-           - mesa-utils
-           - xf86-input-libinput
-           - xorg-xdpyinfo
-           - xorg-server
-           - xorg-xinit
-           - xorg-xinput
-           - xorg-xkill
-           - xorg-xrandr
-      - name: "Network"
-        description: "Network apps drivers and tools"
-        selected: true
-        packages:
-          - b43-fwcutter
-          - broadcom-wl-dkms
-          - dhclient
-          - dnsmasq
-          - dnsutils
-          - ethtool
-          - iwd
-          - modemmanager
-          - networkmanager
-          - networkmanager-openvpn
-          - nss-mdns
-          - usb_modeswitch
-          - wpa_supplicant
-          - xl2tpd
-      - name: "Browser and Proxy"
-        description: "Some Browsers and stuff"
-        selected: true
-        packages:
-          - falkon
-          - epiphany
-          - chromium
-          - vivaldi
-          - angelfish
-          - torbrowser-launcher
-          - windscribe-v2-bin
-          - carburetor
-          - dnsch
-      - name: "firewall"
-        description: "Firewall support"
-        selected: true
-        packages:
-          - firewalld
-          - python-pyqt5
-          - python-capng
-      - name: "bluetooth"
-        description: "Bluetooth support"
-        selected: true
-        packages:
-          - bluez
-          - bluez-hid2hci
-          - bluez-libs
-          - bluez-utils
-      - name: "packages management"
-        description: "Packages tools"
-        selected: true
-        packages:
-          - pacman-contrib
-          - pkgfile
-          - rebuild-detector
-      - name: "desktop integration"
-        description: "Useful helper tools and libs for desktop usage"
-        selected: true
-        packages:
-          - accountsservice
-          - bash-completion
-          - ffmpegthumbnailer
-          - gst-libav
-          - gst-plugin-pipewire
-          - gst-plugins-bad
-          - gst-plugins-ugly
-          - libdvdcss
-          - libgsf
-          - libopenraw
-          - mlocate
-          - poppler-glib
-          - xdg-user-dirs
-          - xdg-utils
-      - name: "filesystem"
-        description: "Filesystem tools and apps"
-        selected: true
-        packages:
-          - efitools
-          - haveged
-          - nfs-utils
-          - nilfs-utils
-          - ntp
-          - smartmontools
-          - unrar
-          - unzip
-          - xz
-      - name: "fonts"
-        description: "ParchLinux font selection"
-        selected: true
-        packages:
-          - adobe-source-han-sans-cn-fonts
-          - adobe-source-han-sans-jp-fonts
-          - adobe-source-han-sans-kr-fonts
-          - awesome-terminal-fonts
-          - noto-fonts-emoji
-          - noto-color-emoji-fontconfig
-          - cantarell-fonts
-          - freetype2
-          - noto-fonts
-          - opendesktop-fonts
-          - ttf-bitstream-vera
-          - ttf-dejavu
-          - ttf-liberation
-          - ttf-opensans
-          - ttf-meslo-nerd
-          - noto-fonts-cjk
-          - estedad-fonts
-          - mikhak-fonts
-      - name: "audio"
-        description: "Audio handling tools apps and libs"
-        selected: true
-        packages:
-          - alsa-firmware
-          - alsa-plugins
-          - alsa-utils
-          - pavucontrol
-          - pipewire-pulse
-          - wireplumber
-          - pipewire-alsa
-          - pipewire-jack
-          - rtkit
-      - name: "hardware"
-        description: "Hardware support libs and firmware"
-        selected: true
-        packages:
-          - dmidecode
-          - dmraid
-          - hdparm
-          - hwdetect
-          - lsscsi
-          - mtools
-          - sg3_utils
-          - sof-firmware
-          - linux-firmware
-      - name: "power"
-        description: "Powermanagement support"
-        selected: true
-        packages:
-          - cpupower
-          - power-profiles-daemon
-          - upower
-      - name: "Some applications selection"
-        description: "General tools and applications"
-        selected: true
-        packages:
-          - alacritty
-          - btop
-          - duf
-          - findutils
-          - fsarchiver
-          - git
-          - glances
-          - hwinfo
-          - inxi
-          - meld
-          - nano-syntax-highlighting
-          - neofetch
-          - fastfetch
-          - pcurses
-          - pv
-          - python-defusedxml
-          - python-packaging
-          - rsync
-          - sed
-          - vi
-          - wget
-          - ripgrep
-          - micro
-          - nano
-          - vim
-          - openssh
+    - name: "X-system"
+      description: "Default X-system"
+      selected: true
+      packages:
+        - libwnck3
+        - mesa-utils
+        - xf86-input-libinput
+        - xorg-xdpyinfo
+        - xorg-server
+        - xorg-xinit
+        - xorg-xinput
+        - xorg-xkill
+        - xorg-xrandr
+    - name: "Network"
+      description: "Network apps drivers and tools"
+      selected: true
+      packages:
+        - b43-fwcutter
+        - broadcom-wl-dkms
+        - dhclient
+        - dnsmasq
+        - dnsutils
+        - ethtool
+        - iwd
+        - modemmanager
+        - networkmanager
+        - networkmanager-openvpn
+        - nss-mdns
+        - usb_modeswitch
+        - wpa_supplicant
+        - xl2tpd
+    - name: "Browser and Proxy"
+      description: "Some Browsers and stuff"
+      selected: true
+      packages:
+        - falkon
+        - epiphany
+        - chromium
+        - vivaldi
+        - angelfish
+        - torbrowser-launcher
+        - windscribe-v2-bin
+        - carburetor
+        - dnsch
+    - name: "firewall"
+      description: "Firewall support"
+      selected: true
+      packages:
+        - firewalld
+        - python-pyqt5
+        - python-capng
+    - name: "bluetooth"
+      description: "Bluetooth support"
+      selected: true
+      packages:
+        - bluez
+        - bluez-hid2hci
+        - bluez-libs
+        - bluez-utils
+    - name: "packages management"
+      description: "Packages tools"
+      selected: true
+      packages:
+        - pacman-contrib
+        - pkgfile
+        - rebuild-detector
+    - name: "desktop integration"
+      description: "Useful helper tools and libs for desktop usage"
+      selected: true
+      packages:
+        - accountsservice
+        - bash-completion
+        - ffmpegthumbnailer
+        - gst-libav
+        - gst-plugin-pipewire
+        - gst-plugins-bad
+        - gst-plugins-ugly
+        - libdvdcss
+        - libgsf
+        - libopenraw
+        - mlocate
+        - poppler-glib
+        - xdg-user-dirs
+        - xdg-utils
+    - name: "filesystem"
+      description: "Filesystem tools and apps"
+      selected: true
+      packages:
+        - efitools
+        - haveged
+        - nfs-utils
+        - nilfs-utils
+        - ntp
+        - smartmontools
+        - unrar
+        - unzip
+        - xz
+    - name: "fonts"
+      description: "ParchLinux font selection"
+      selected: true
+      packages:
+        - adobe-source-han-sans-cn-fonts
+        - adobe-source-han-sans-jp-fonts
+        - adobe-source-han-sans-kr-fonts
+        - awesome-terminal-fonts
+        - noto-fonts-emoji
+        - noto-color-emoji-fontconfig
+        - cantarell-fonts
+        - freetype2
+        - noto-fonts
+        - opendesktop-fonts
+        - ttf-bitstream-vera
+        - ttf-dejavu
+        - ttf-liberation
+        - ttf-opensans
+        - ttf-meslo-nerd
+        - noto-fonts-cjk
+        - estedad-fonts
+        - mikhak-fonts
+    - name: "audio"
+      description: "Audio handling tools apps and libs"
+      selected: true
+      packages:
+        - alsa-firmware
+        - alsa-plugins
+        - alsa-utils
+        - pavucontrol
+        - pipewire-pulse
+        - wireplumber
+        - pipewire-alsa
+        - pipewire-jack
+        - rtkit
+    - name: "hardware"
+      description: "Hardware support libs and firmware"
+      selected: true
+      packages:
+        - dmidecode
+        - dmraid
+        - hdparm
+        - hwdetect
+        - lsscsi
+        - mtools
+        - sg3_utils
+        - sof-firmware
+        - linux-firmware
+    - name: "power"
+      description: "Powermanagement support"
+      selected: true
+      packages:
+        - cpupower
+        - power-profiles-daemon
+        - upower
+    - name: "Some applications selection"
+      description: "General tools and applications"
+      selected: true
+      packages:
+        - alacritty
+        - btop
+        - duf
+        - findutils
+        - fsarchiver
+        - git
+        - glances
+        - hwinfo
+        - inxi
+        - meld
+        - nano-syntax-highlighting
+        - neofetch
+        - fastfetch
+        - pcurses
+        - pv
+        - python-defusedxml
+        - python-packaging
+        - rsync
+        - sed
+        - vi
+        - wget
+        - ripgrep
+        - micro
+        - nano
+        - vim
+        - openssh
+
 - name: "Kernel"
   description: "Selection of Kernels to install"
   hidden: false
@@ -219,6 +215,7 @@
     - linux-zen-headers
     - linux-lts
     - linux-lts-headers
+
 - name: "KDE-Desktop"
   description: "KDE-Plasma Desktop - Simple by default, powerful when needed."
   hidden: false
@@ -265,6 +262,7 @@
     - xdg-desktop-portal-kde
     - phonon-qt6-vlc
     - xwaylandvideobridge
+
 - name: "GNOME-Desktop"
   description: "GNOME Desktop - designed to put you in control and get things done."
   hidden: false
@@ -308,6 +306,7 @@
     - qt6-wayland
     - xdg-user-dirs-gtk
     - xdg-desktop-portal-gnome
+
 - name: "Xfce4"
   description: "Xfce is a lightweight desktop environment for UNIX-like operating systems. It aims to be fast and low on system resources, while still being visually appealing and user friendly."
   hidden: false
@@ -347,6 +346,7 @@
     - xfce4-weather-plugin
     - xfce4-whiskermenu-plugin
     - xfce4-xkb-plugin
+
 - name: "bspwm"
   description: "bspwm is a tiling window manager that represents windows as the leaves of a full binary tree. bspwm supports multiple monitors and is configured and controlled through messages."
   hidden: false
@@ -359,6 +359,7 @@
     - ly
     - alacritty
     - openssh
+
 - name: "Budgie-Desktop"
   description: "Budgie - an independent, familiar, and modern desktop."
   hidden: false
@@ -392,6 +393,7 @@
     - sushi
     - totem
     - xdg-user-dirs-gtk
+
 - name: "Cinnamon"
   description: "Linux desktop which provides advanced innovative features and a traditional user experience."
   hidden: false
@@ -406,6 +408,7 @@
     - metacity
     - lightdm
     - lightdm-gtk-greeter
+
 - name: "CuteFish"
   description: "CuteFish – An Elegant, Beautiful and Easy-to-Use Linux Desktop."
   hidden: false
@@ -430,6 +433,7 @@
     - sddm
     - xdg-desktop-portal
     - xdg-desktop-portal-kde
+
 - name: "i3-Window-Manager"
   description: "i3 tiling window manager, primarily targeted at developers and advanced users."
   hidden: false
@@ -445,6 +449,7 @@
     - polybar
     - ly
     - dunst
+
 - name: "Hyprland"
   description: "Hyprland is a highly customizable dynamic tiling Wayland compositor that doesn't sacrifice on its looks."
   hidden: false
@@ -475,9 +480,7 @@
     - bemenu
     - bemenu-wayland
     - xorg-xwayland
-    - capitaine-cursors
-    - kvantum-theme-nordic-git
-    - cachyos-nord-gtk-theme-git
+
 - name: "LXDE-Desktop"
   description: "The Lightweight Desktop Environment."
   hidden: false
@@ -516,6 +519,7 @@
     - network-manager-applet
     - xdg-user-dirs-gtk
     - xed
+
 - name: "LXQT-Desktop"
   description: "The Lightweight Qt Desktop Environment."
   hidden: false
@@ -544,6 +548,7 @@
     - xdg-utils
     - xscreensaver
     - xsettingsd
+
 - name: "MATE-Desktop"
   description: "MATE Desktop - the continuation of GNOME 2"
   hidden: false
@@ -563,6 +568,7 @@
     - mate-extra
     - network-manager-applet
     - xdg-user-dirs-gtk
+
 - name: "Openbox"
   description: "Openbox is a highly configurable, floating window manager with extensive standards support."
   hidden: false
@@ -614,6 +620,7 @@
     - xdg-user-dirs-gtk
     - xed
     - xfce4-terminal
+
 - name: "Qtile"
   description: "Qtile is a X11 window manager that is configured with the Python programming language."
   hidden: false
@@ -635,6 +642,7 @@
     - ttf-font-awesome
     - picom
     - ly
+
 - name: "Sway"
   description: "Sway is a tiling Wayland compositor and a drop-in replacement for the i3 window manager for X11. It works with your existing i3 configuration and supports most of i3's features, plus a few extras."
   hidden: false
@@ -654,6 +662,7 @@
     - xorg-xwayland
     - xdg-desktop-portal
     - xdg-desktop-portal-wlr
+
 - name: "UKUI"
   description: "It is a lightweight desktop environment, which consumes few resources and works with older computers. It has been developed with GTK and Qt technologies. Its visual appearance is similar to Windows 7, making it easier for new users of Linux."
   hidden: false
@@ -663,104 +672,97 @@
     - sddm
     - thunar
     - thunar-archive-plugin
+   
+
+ - thunar-media-tags-plugin
     - thunar-volman
-    - peony
-    - xfce4-terminal
-    - qt5-ukui-platformtheme
-    - ukui-biometric-auth
+    - network-manager-applet
+    - parch-ukui
+    - parch-wallpapers
+    - parch-icons
+    - parch-themes
     - ukui-control-center
-    - ukui-interface
+    - ukui-dark-sound-theme
+    - ukui-default-settings
+    - ukui-greeter
     - ukui-media
     - ukui-menu
-    - ukui-menus
-    - ukui-notebook
+    - ukui-notification-daemon
     - ukui-panel
+    - ukui-polkit
     - ukui-power-manager
-    - ukui-screensaver
     - ukui-session-manager
     - ukui-settings-daemon
-    - ukui-sidebar
-    - ukui-system-monitor
-    - ukui-themes
+    - ukui-session
     - ukui-wallpapers
     - ukui-window-switch
-    - mate-terminal
-    - mate-system-monitor
-    - mate-control-center
-    - redshift
-    - gnome-screenshot
-    - accountsservice
-    - gvfs
-    - qt5-quickcontrols
+    - ukui-screensaver
+    - ukui-brightness-control
+
 - name: "Wayfire"
-  description: "Wayfire is a wayland compositor based on wlroots. It aims to create a customizable, extendable and lightweight environment without sacrificing its appearance."
+  description: "Wayfire is a 3D Wayland compositor, inspired by Compiz and based on wlroots. It aims to create a customizable, extendable, and lightweight environment without sacrificing its appearance."
   hidden: false
   selected: false
-  expanded: false
   critical: true
   packages:
-    - wayfire-desktop
-    - egl-wayland
+    - parch-wayfire
+    - wayfire
+    - wf-config
+    - wf-recorder
+    - wf-shell
+    - wf-osk
+    - wf-panel
+    - wf-touch
+    - wf-backgrounds
+    - wf-applets
+    - wf-autoconfig
+    - wf-shortcuts
+    - wf-clipboards
+    - wf-dock
+    - wf-greeter
+    - wf-hotcorners
+    - wf-randr
+    - wf-wallpapers
+    - wf-widgets
+    - wf-xwayland
     - wayland-protocols
     - wofi
     - ly
-    - xorg-xhost
-    - xorg-xwayland
-- name: "CPU specific Microcode update packages"
-  description: "Microcode update image for AMD and Intel CPU"
-  hidden: false
-  selected: true
-  critical: false
-  packages:
-    - amd-ucode
-    - intel-ucode
-- name: "Firefox and language package"
-  description: "Add firefox and language pack if possible"
-  hidden: false
-  selected: false
-  critical: false
-  packages:
-    - firefox
-    - firefox-i18n-$LOCALE
-- name: "Printing-Support"
-  description: "Support for printing (Cups)"
+    - xdg-desktop-portal
+    - xdg-desktop-portal-wlr
+
+- name: "XFCE-Desktop"
+  description: "Xfce is a lightweight desktop environment for UNIX-like operating systems. It aims to be fast and low on system resources, while still being visually appealing and user friendly."
   hidden: false
   selected: false
   critical: true
   packages:
-    - cups
-    - cups-filters
-    - cups-pdf
-    - foomatic-db
-    - foomatic-db-engine
-    - foomatic-db-gutenprint-ppds
-    - foomatic-db-nonfree
-    - foomatic-db-nonfree-ppds
-    - foomatic-db-ppds
-    - ghostscript
-    - gsfonts
-    - gutenprint
-    - splix
-    - system-config-printer
-- name: "Support for HP Printer/Scanner"
-  description: "Extra Packages for HP Printer/Scanner"
-  hidden: false
-  selected: false
-  critical: true
-  packages:
-    - hplip
-    - python-pyqt5
-    - python-reportlab
-    - xsane
-    - cups
-    - cups-filters
-    - cups-pdf
-- name: "Accessibility Tools"
-  description: "Screen reader and mouse tweaks (impaired vision)"
-  hidden: false
-  selected: false
-  critical: true
-  packages:
-    - espeak-ng
-    - mousetweaks
-    - orca
+    - xfce4
+    - thunar
+    - thunar-archive-plugin
+    - thunar-media-tags-plugin
+    - thunar-volman
+    - xfce4-appfinder
+    - xfce4-panel
+    - xfce4-session
+    - xfce4-settings
+    - xfce4-terminal
+    - xfce4-taskmanager
+    - xfce4-notifyd
+    - xfce4-power-manager
+    - xfce4-pulseaudio-plugin
+    - xfce4-screensaver
+    - xfce4-taskmanager
+    - xfce4-terminal
+    - xfce4-volumed-pulse
+    - xfce4-whiskermenu-plugin
+    - network-manager-applet
+    - lightdm
+    - lightdm-gtk-greeter
+    - gvfs
+    - gvfs-afc
+    - gvfs-gphoto2
+    - gvfs-mtp
+    - gvfs-nfs
+    - gvfs-smb
+    - xdg-user-dirs-gtk