updated iso, added calamares

base/Packages-Root

@@ -20,6 +20,7 @@ intel-ucode
 amd-ucode
 xf86-video-intel
 xf86-video-amdgpu
+calamares
 mpv
 ffmpeg
 xdotool
@@ -49,11 +50,70 @@ xclip
 pacman-contrib
 
 # parch packages
-plasma
+bluedevil
+breeze
+breeze-gtk
+breeze-plymouth
+drkonqi
+kactivitymanagerd
+kde-cli-tools
+kde-gtk-config
+kdecoration
+kdeplasma-addons
+kgamma
+kglobalacceld
+kinfocenter
+kmenuedit
+kpipewire
+krdp
+kscreen
+kscreenlocker
+ksshaskpass
+ksystemstats
+kwallet-pam
+kwayland
+kwin
+kwrited
+layer-shell-qt
+libkscreen
+libksysguard
+libplasma
+milou
+ocean-sound-theme
+oxygen
+oxygen-sounds
+plasma-activities
+plasma-activities-stats
+plasma-browser-integration
+plasma-desktop
+plasma-disks
+plasma-firewall
+plasma-integration
+plasma-nm
+plasma-pa
+plasma-sdk
+plasma-systemmonitor
+plasma-thunderbolt
+plasma-vault
+plasma-workspace
+plasma-workspace-wallpapers
+plasma5support
+plymouth-kcm
+polkit-kde-agent
+powerdevil
+print-manager
+qqc2-breeze-style
+sddm-kcm
+systemsettings
+wacomtablet
+xdg-desktop-portal-kde
 dolphin
+ark
+unzip
+unrar
+firefox
 konsole
-kate
+
-#parch-branding
 
 # Utilities
 git

base/root-overlay/etc/X11/xinit/xinitrc

@@ -7,5 +7,3 @@ if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/x11/xprofile" ]; then
 else
 	. "$HOME/.xprofile"
 fi
-
-exec dbus-launch dwm

base/root-overlay/etc/calamares/branding/parchlinux/ImageSlide.qml

@@ -0,0 +1,23 @@
+
+
+import QtQuick 2.5
+
+Item {
+    id: imageslide
+
+    visible: false
+
+    anchors.fill: parent
+
+    property bool isSlide: true;
+
+    property string notes;
+
+    property string src;
+
+    Image {
+        id: image
+        source: src
+        anchors.centerIn: parent
+    }
+}

base/root-overlay/etc/calamares/branding/parchlinux/branding.desc

@@ -0,0 +1,42 @@
+---
+componentName:  parchlinux
+
+welcomeStyleCalamares:   false
+
+welcomeExpandingLogo:   true
+
+windowExpanding:    fullscreen
+
+windowPlacement: center
+
+sidebar: none
+
+navigation: widget
+
+strings:
+    productName:         ParchLinux
+    shortProductName:    Parch
+    version:             Rolling
+    shortVersion:        Rolling
+    versionedName:       Parch Linux Rolling
+    shortVersionedName:  ParchLinux
+    bootloaderEntryName: Parch
+
+images:
+    productIcon:            "logo.png"
+    productLogo:            "squid.png"
+    productWelcome:         "idioma.png"
+
+style:
+   sidebarBackground:       "#FFFFFF"
+   sidebarText:             "#292F34"
+   sidebarTextSelect:       "#ffffff"
+   sidebarTextHighlight:    "#2093d1"
+
+slideshow:               "show.qml"
+
+slideshowAPI: 2
+
+uploadServer :
+    type :    "fiche"
+    url :     "http://termbin.com:9999"

base/root-overlay/etc/calamares/branding/parchlinux/lang/calamares-default_ar.ts

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ar">
+<context>
+    <name>show</name>
+    <message>
+        <location filename="../show.qml" line="64"/>
+        <source>This is a second Slide element.</source>
+        <translation>عرض الثاني</translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="68"/>
+        <source>This is a third Slide element.</source>
+        <translation>عرض الثالث</translation>
+    </message>
+</context>
+</TS>

base/root-overlay/etc/calamares/branding/parchlinux/lang/calamares-default_en.ts

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en">
+<context>
+    <name>show</name>
+    <message>
+        <location filename="../show.qml" line="64"/>
+        <source>This is a second Slide element.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="68"/>
+        <source>This is a third Slide element.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>

base/root-overlay/etc/calamares/branding/parchlinux/lang/calamares-default_eo.ts

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="eo">
+<context>
+    <name>show</name>
+    <message>
+        <location filename="../show.qml" line="64"/>
+        <source>This is a second Slide element.</source>
+        <translation>Ĉi tio estas la dua gliteja.</translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="68"/>
+        <source>This is a third Slide element.</source>
+        <translation>Ĉi tio estas la tria gliteja.</translation>
+    </message>
+</context>
+</TS>

base/root-overlay/etc/calamares/branding/parchlinux/lang/calamares-default_fa.ts

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en">
+<context>
+    <name>show</name>
+    <message>
+        <location filename="../show.qml" line="64"/>
+        <source>This is a second Slide element.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="68"/>
+        <source>This is a third Slide element.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>

base/root-overlay/etc/calamares/branding/parchlinux/lang/calamares-default_fr.ts

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fr">
+<context>
+    <name>show</name>
+    <message>
+        <location filename="../show.qml" line="64"/>
+        <source>This is a second Slide element.</source>
+        <translation>Ceci est la deuxieme affiche.</translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="68"/>
+        <source>This is a third Slide element.</source>
+        <translation>La troisième affice ce trouve ici.</translation>
+    </message>
+</context>
+</TS>

base/root-overlay/etc/calamares/branding/parchlinux/lang/calamares-default_nl.ts

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="nl">
+<context>
+    <name>show</name>
+    <message>
+        <location filename="../show.qml" line="64"/>
+        <source>This is a second Slide element.</source>
+        <translation>Dit is het tweede Dia element.</translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="68"/>
+        <source>This is a third Slide element.</source>
+        <translation>Dit is het derde Dia element.</translation>
+    </message>
+</context>
+</TS>

base/root-overlay/etc/calamares/branding/parchlinux/show.qml

@@ -0,0 +1,53 @@
+
+
+import QtQuick 2.0;
+import calamares.slideshow 1.0;
+import io.calamares.ui 1.0  // Calamares internals: Branding
+
+Presentation
+{
+    id: presentation
+
+    Timer {
+        interval: 30000
+        running: presentation.activatedInCalamares
+        repeat: true
+        onTriggered: presentation.goToNextSlide()
+    }
+
+    function onActivate() { }
+    function onLeave() { }
+
+    Rectangle {
+        id: mybackground
+        anchors.fill: parent
+        color: Branding.styleString(Branding.SidebarBackground)
+        z: -1
+    }
+
+    ImageSlide {
+        src: "slide01.png"
+    }
+
+    ImageSlide {
+        src: "slide02.png"
+    }
+
+    ImageSlide {
+        src: "slide03.png"
+    }
+
+    ImageSlide {
+        src: "slide04.png"
+    }
+
+    ImageSlide {
+        src: "slide05.png"
+    }
+
+    ImageSlide {
+        src: "slide06.png"
+    }
+
+
+}

base/root-overlay/etc/calamares/branding/parchlinux/stylesheet.qss

@@ -0,0 +1,253 @@
+
+/* ########## MAIN APPLICATION WINDOW ########## */
+
+#mainApp {
+}
+
+#mainText{
+	font : bold 16px;
+}
+
+#sidebarApp {
+
+}
+
+#logoApp {
+}
+
+#sidebarMenuApp {
+	padding: 0px;
+	background-color: none;
+}
+
+QWidget {
+	font: 16px;
+}
+
+QTextEdit, QListView {
+}
+QDialogButtonBox {
+}
+QAbstractSpinBox {
+}
+QListWidget::item:alternate {
+}
+
+
+#debugButton {
+	font: bold 8px;
+	color: #292F34;
+}
+
+
+/* ########## TOOLTIP ########## */
+
+QPushButton {
+    font : 16px;
+}
+
+QDialogButtonBox {
+	dialogbuttonbox-buttons-have-icons: 0;
+}
+
+/* ########## QLIST VIEW ########## */
+
+QListView {
+		font: 16px;
+}
+
+/* ########## QLINE EDIT ########## */
+
+QLineEdit#LE_TestKeyboard {
+	font: 16px;
+}
+
+QLineEdit#m_passphraseLineEdit, QLineEdit#vgName,
+QLineEdit#m_confirmLineEdit {
+	font: 16px;
+}
+
+QLineEdit#textBoxUserVerifiedPassword, QLineEdit#textBoxVerifiedRootPassword {
+	font: 16px;
+}
+
+QLineEdit#textBoxFullName, QLineEdit#textBoxLoginName, QLineEdit#textBoxHostName,
+QLineEdit#textBoxUserPassword, QLineEdit#textBoxRootPassword {
+	font: 16px;
+}
+
+#textBoxFullName, #textBoxLoginName, #textBoxHostName, #textBoxUserPassword,
+#textBoxRootPassword, #textBoxAutoLogin, #vgName {
+	font: 16px;
+}
+
+#textBoxUserVerifiedPassword, #textBoxVerifiedRootPassword,
+#LE_TestKeyboard, #m_confirmLineEdit, #m_passphraseLineEdit {
+	font: 16px;
+}
+
+/* ##########PARTITION ########## */
+
+#partResizerWidget {
+	font: 16px;
+}
+
+/* ########## PAGE_USERSETUP ########## */
+
+ #labelWhatIsYourName {
+	font: 16px;
+}
+ #textBoxFullName {
+	font: 16px;
+}
+ #labelFullName {
+	font: 16px;
+}
+ #labelFullNameError {
+	font: 16px;
+}
+ #username_label_2 {
+	font: 16px;
+}
+ #textBoxLoginName {
+	font: 16px;
+}
+ #labelUsername {
+	font: 16px;
+}
+ #labelUsernameError {
+	font: 16px;
+}
+ #hostname_label_2 {
+	font: 16px;
+}
+ #textBoxHostName {
+	font: 16px;
+}
+ #labelHostname {
+	font: 16px;
+}
+ #labelHostnameError {
+	font: 16px;
+}
+ #password_label_2 {
+	font: 16px;
+}
+ #textBoxUserPassword {
+	font: 16px;
+}
+ #textBoxUserVerifiedPassword {
+	font: 16px;
+}
+ #labelUserPassword {
+	font: 16px;
+}
+ #labelUserPasswordError {
+	font: 16px;
+}
+ #checkBoxRequireStrongPassword {
+	font: 16px;
+}
+ #checkBoxDoAutoLogin {
+	font: 16px;
+}
+ #checkBoxReusePassword {
+	font: 16px;
+}
+ #labelChooseRootPassword {
+	font: 16px;
+}
+ #textBoxRootPassword {
+	font: 16px;
+}
+ #textBoxVerifiedRootPassword {
+	font: 16px;
+}
+ #labelRootPassword {
+	font: 16px;
+}
+ #labelRootPasswordError {
+	font: 16px;
+}
+
+/* ########## COMBO BOX ########## */
+
+QComboBox {
+	font: 16px;
+}
+
+#mountPointComboBox::drop-down {
+	font: 16px;
+}
+
+/* ########## SPIN BOX ########## */
+
+QSpinBox {
+	font: 16px;
+}
+
+QLineEdit {
+	font: 16px;
+}
+
+/* ########## TREE VIEW ########## */
+
+QTreeView {
+	font: 16px;
+	show-decoration-selected: 0;
+}
+
+QTreeView::item {
+	padding: 2px;
+}
+
+QTreeView::branch:has-siblings:!adjoins-item {
+}
+QTreeView::branch:has-siblings:adjoins-item {
+}
+QTreeView::branch:!has-children:!has-siblings:adjoins-item {
+}
+QTreeView::branch:has-children:!has-siblings:closed,
+QTreeView::branch:closed:has-children:has-siblings {
+}
+QTreeView::branch:open:has-children:!has-siblings,
+QTreeView::branch:open:has-children:has-siblings  {
+}
+
+/* ########## CHECK BOX ########## */
+
+QCheckBox {
+}
+QCheckBox::indicator:unchecked {
+}
+QCheckBox::indicator:checked {
+}
+QItemSelectionModel::Select {
+}
+
+/* ########## HEADER VIEW ########## */
+
+QHeaderView::section {
+  font : 16px;
+}
+
+#debugButton {
+	background-color: none;
+	font: 12px;
+	color: #edecf0;
+	height: 32px;
+	border: none;
+}
+
+#debugButton:hover {
+	color: #ff7f7f;
+}
+
+
+#aboutButton {
+	background-color: none;
+	font: 12px;
+	color: #292F34;
+	height: 32px;
+	border: none;
+}

base/root-overlay/etc/calamares/modules/bootloader.conf

@@ -0,0 +1,14 @@
+efiBootLoader: "grub"
+
+kernel: "_ALL_kver_"
+img: "_default_image_"
+fallback: "_fallback_image_"
+timeout: "10"
+
+bootloaderEntryName: "parch"
+
+grubInstall: "grub-install"
+grubMkconfig: "grub-mkconfig"
+grubCfg: "/boot/grub/grub.cfg"
+grubProbe: "grub-probe"
+efiBootMgr: "efibootmgr"

base/root-overlay/etc/calamares/modules/displaymanager.conf

@@ -0,0 +1,5 @@
+displaymanagers:
+  - sddm
+
+basicSetup: yes
+sysconfigSetup: false

base/root-overlay/etc/calamares/modules/finished.conf

@@ -0,0 +1,5 @@
+restartNowMode: user-checked
+
+restartNowCommand: "loginctl reboot"
+
+notifyOnFinished: false

base/root-overlay/etc/calamares/modules/initcpio.conf

@@ -0,0 +1,3 @@
+kernel: linux
+
+be_unsafe: false

base/root-overlay/etc/calamares/modules/machineid.conf

@@ -0,0 +1,4 @@
+---
+systemd: false
+dbus: true
+symlink: true

base/root-overlay/etc/calamares/modules/packages.conf

@@ -0,0 +1,49 @@
+backend: pacman
+
+skip_if_no_internet: true
+update_db: true
+update_system: false
+
+pacman:
+    num_retries: 0
+    disable_download_timeout: false
+    needed_only: false
+
+operations:
+  - try_remove:
+    - calamares
+    - axyl-artix-calamares-config
+    - artix-branding-base
+    - artix-grub-live
+    - artix-grub-theme
+    - artix-live-base
+    - artix-live-dinit
+    - artix-live-openrc
+    - artix-live-runit
+    - artix-live-s6
+    - artix-live-suite66
+    - boost-libs
+    - ckbcomp
+    - dex
+    - hwinfo
+    - kconfig
+    - kcoreaddons
+    - ki18n 
+    - kiconthemes
+    - kio
+    - kpmcore
+    - memtest86+
+    - mkinitcpio-archiso
+    - network-manager-applet
+    - qt5-svg
+    - qt5-xmlpatterns
+    - sddm-dinit
+    - sddm-openrc
+    - sddm-s6
+    - sddm-suite66
+    - solid
+    - squashfs-tools
+    - xorg-xkill
+    - xorg-xrdb
+    - xterm
+    - yaml-cpp

base/root-overlay/etc/calamares/modules/partition.conf

@@ -0,0 +1,19 @@
+efiSystemPartition:     "/boot/efi"
+
+userSwapChoices:
+    - none      # Create no swap, use no swap
+    - small     # Up to 4GB
+    - suspend   # At least main memory size
+    - file      # To swap file instead of partition
+
+drawNestedPartitions:   false
+
+alwaysShowPartitionLabels: true
+
+initialPartitioningChoice: none
+
+initialSwapChoice: none
+
+defaultFileSystemType:  "ext4"
+
+availableFileSystemTypes:  ["ext4","btrfs","ext3"]

base/root-overlay/etc/calamares/modules/postcfg.conf

@@ -0,0 +1,4 @@
+---
+keyrings:
+  - artix
+  - archlinux

base/root-overlay/etc/calamares/modules/shellprocess-before.conf

@@ -0,0 +1,7 @@
+i18n:
+     name: "Preparing your system for metis..."
+
+dontChroot: false
+timeout: 999
+script:
+    - command: "ls"

base/root-overlay/etc/calamares/modules/shellprocess-final.conf

@@ -0,0 +1,7 @@
+i18n:
+     name: "Finalizing Installation..."
+
+dontChroot: false
+timeout: 999
+script:
+    - command: "/usr/local/bin/remove_pkgs"

base/root-overlay/etc/calamares/modules/umount.conf

@@ -0,0 +1,3 @@
+---
+srcLog: "/root/.cache/Calamares/Metis.log"
+destLog: "/var/log/Metis.log"

base/root-overlay/etc/calamares/modules/unpackfs.conf

@@ -0,0 +1,6 @@
+---
+unpack: 
+  - source: "/run/artix/bootmnt/LiveOS/rootfs.img"
+    sourcefs: 'squashfs'
+    destination: ""
+ 

base/root-overlay/etc/calamares/modules/users.conf

@@ -0,0 +1,43 @@
+defaultGroups:
+    - name: users
+      must_exist: true
+      system: true
+    - lp
+    - power
+    - video
+    - network
+    - storage
+    - name: wheel
+      must_exist: false
+      system: true
+    - audio
+    - power
+    - log
+    - optical
+    - scanner
+    - rfkill
+
+autologinGroup:  autologin
+
+doAutologin:     false
+
+sudoersGroup:    wheel
+
+setRootPassword: true
+
+doReusePassword: false
+
+allowWeakPasswordsDefault: true
+
+userShell: /bin/bash
+
+setHostname: EtcFile
+
+writeHostsFile: true
+
+
+presets:
+    fullName:
+        editable: true
+    loginName:
+        editable: true

base/root-overlay/etc/calamares/modules/welcome.conf

@@ -0,0 +1,23 @@
+showSupportUrl:         false
+showKnownIssuesUrl:     false
+showReleaseNotesUrl:    false
+showDonateUrl:          false
+requirements:
+    requiredStorage:    5.5
+    requiredRam:        1.0
+    internetCheckUrl:   https://parchlinux.com
+    check:
+        - storage
+        - ram
+        - power
+        - root
+        - screen
+    required:
+        - root
+        - ram
+        - storage
+
+geoip:
+    style:    "none"
+    url:      "https://geoip.kde.org/v1/ubiquity"
+    selector: "CountryCode"

base/root-overlay/etc/calamares/settings.conf

@@ -0,0 +1,54 @@
+modules-search: [ local ]
+
+instances:
+- id:       before
+  module:   shellprocess
+  config:   shellprocess-before.conf
+- id:       final
+  module:   shellprocess
+  config:   shellprocess-final.conf
+  
+sequence:
+    - show:
+        - welcome
+        - locale
+        - keyboard
+        - partition
+        - users
+        - summary
+    - exec:
+        - partition
+        - mount
+        - unpackfs
+        - machineid
+        - fstab
+        - locale
+        - keyboard
+        - localecfg
+        - luksopenswaphookcfg
+        - luksbootkeyfile
+        - initcpiocfg
+        - initcpio
+        - users
+        - displaymanager
+        - networkcfg
+        - hwclock
+        - services-runit
+        - shellprocess@before
+        - packages
+        - grubcfg
+        - bootloader
+        - shellprocess@final
+        - umount
+    - show:
+        - finished
+
+branding: parchlinux
+
+prompt-install: false
+
+dont-chroot: false
+
+disable-cancel: false
+
+disable-cancel-during-exec: false

base/root-overlay/etc/hosts

@@ -2,4 +2,3 @@
 # See hosts(5) for details.
 127.0.0.1      	    localhost
 ::1		    localhost
-127.0.1.1	metislive.localdomain	metislive

base/root-overlay/etc/issue

@@ -1,3 +1,3 @@
 ]P01E1E2E]P8585B70]P7BAC2DE]PFA6ADC8]P1F38BA8]P9F38BA8]P2A6E3A1]PAA6E3A1]P3F9E2AF]PBF9E2AF]P489B4FA]PC89B4FA]P5F5C2E7]PDF5C2E7]P694E2D5]PE94E2D5
 ]P01E1E2E]P8585B70]P7BAC2DE]PFA6ADC8]P1F38BA8]P9F38BA8]P2A6E3A1]PAA6E3A1]P3F9E2AF]PBF9E2AF]P489B4FA]PC89B4FA]P5F5C2E7]PDF5C2E7]P694E2D5]PE94E2D5
-Welcome to METIS Linux :)
+Welcome to Parch Linux :)

base/root-overlay/etc/issue.live

@@ -1,3 +1,3 @@
 ]P01E1E2E]P8585B70]P7BAC2DE]PFA6ADC8]P1F38BA8]P9F38BA8]P2A6E3A1]PAA6E3A1]P3F9E2AF]PBF9E2AF]P489B4FA]PC89B4FA]P5F5C2E7]PDF5C2E7]P694E2D5]PE94E2D5
 ]P01E1E2E]P8585B70]P7BAC2DE]PFA6ADC8]P1F38BA8]P9F38BA8]P2A6E3A1]PAA6E3A1]P3F9E2AF]PBF9E2AF]P489B4FA]PC89B4FA]P5F5C2E7]PDF5C2E7]P694E2D5]PE94E2D5
-Welcome to METIS Linux :)
+Welcome to Parch Linux :)

base/root-overlay/root/.zprofile

@@ -1,63 +0,0 @@
-#!/bin/zsh
-
-export PATH="$PATH:${$(find ~/.local/bin -type d -printf %p:)%%:}" # add !/.local/bin as path
-export PATH="$PATH:${$(find ~/.local/share/cargo/bin -type d -printf %p:)%%:}" # add ~/.local/share/cargo/bin as path ( for rust )
-export PATH="$PATH:${$(find ~/.local/share/go/bin -type d -printf %p:)%%:}" # add ~/.local/share/go/bin as path ( for golang )
-export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse # Add sparse index protocol for cargo
-eval "$(zoxide init zsh)" # initialize zsh as a shell for zoxide 
-
-# Default programs:
-export EDITOR="nvim"
-export TERMINAL="st"
-export BROWSER="brave"
-
-# ~/ Clean-up:
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_CACHE_HOME="$HOME/.cache"
-export XINITRC="${XDG_CONFIG_HOME:-$HOME/.config}/x11/xinitrc"
-#export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # This line will break some DMs.
-export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/notmuch-config"
-export GTK2_RC_FILES="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-2.0/gtkrc-2.0"
-export LESSHISTFILE="-"
-export WGETRC="${XDG_CONFIG_HOME:-$HOME/.config}/wget/wgetrc"
-export INPUTRC="${XDG_CONFIG_HOME:-$HOME/.config}/shell/inputrc"
-export ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}/zsh"
-#export ALSA_CONFIG_PATH="$XDG_CONFIG_HOME/alsa/asoundrc"
-export GNUPGHOME="${XDG_DATA_HOME:-$HOME/.local/share}/gnupg"
-export WINEPREFIX="${XDG_DATA_HOME:-$HOME/.local/share}/wineprefixes/default"
-export KODI_DATA="${XDG_DATA_HOME:-$HOME/.local/share}/kodi"
-export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
-export ANDROID_SDK_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android"
-export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo"
-export RUSTUP_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/rustup"
-export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go"
-export ANSIBLE_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/ansible/ansible.cfg"
-export UNISON="${XDG_DATA_HOME:-$HOME/.local/share}/unison"
-export HISTFILE="${XDG_DATA_HOME:-$HOME/.local/share}/history"
-export WEECHAT_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/weechat"
-export MBSYNCRC="${XDG_CONFIG_HOME:-$HOME/.config}/mbsync/config"
-
-# Other program settings:
-export DICS="/usr/share/stardict/dic/"
-export SUDO_ASKPASS="$HOME/.local/bin/dmenupass"
-export FZF_DEFAULT_OPTS="--layout=reverse --height 40%"
-export LESS=-R
-export LESS_TERMCAP_mb="$(printf '%b' '')"
-export LESS_TERMCAP_md="$(printf '%b' '')"
-export LESS_TERMCAP_me="$(printf '%b' '')"
-export LESS_TERMCAP_so="$(printf '%b' '')"
-export LESS_TERMCAP_se="$(printf '%b' '')"
-export LESS_TERMCAP_us="$(printf '%b' '')"
-export LESS_TERMCAP_ue="$(printf '%b' '')"
-export LESSOPEN="| /usr/bin/highlight -O ansi %s 2>/dev/null"
-export QT_QPA_PLATFORMTHEME="gtk2"	# Have QT use gtk2 theme.
-export MOZ_USE_XINPUT2="1"		# Mozilla smooth scrolling/touchpads.
-export AWT_TOOLKIT="MToolkit wmname LG3D"	#May have to install wmname
-export _JAVA_AWT_WM_NONREPARENTING=1	# Fix for Java applications in dwm
-
-
-if [[ -z "$DISPLAY" ]] || ! pgrep -x "$(basename "$XDG_CURRENT_DESKTOP")" >/dev/null; then
-  startx
-fi
-

base/root-overlay/usr/share/grub/cfg/grub.cfg

@@ -295,14 +295,14 @@ function grub_reboot {
 function grub_bios_installed {
     if ! is_efi;  then
         menuentry "" {true}
-        menuentry --class=metis "Installed BIOS-System on $installed" {exit}
+        menuentry --class=parch "Installed BIOS-System on $installed" {exit}
     fi
 }
 
 function grub_efi_installed {
     if is_efi; then
         menu "" {true}
-        menu --class=metis "Installed EFI-System on $installed" {exit}
+        menu --class=parch "Installed EFI-System on $installed" {exit}
     fi
 }