From 6cff3e4716567aeed5eee43c46fd67813e66c027 Mon Sep 17 00:00:00 2001
From: Vladislav Nepogodin <nepogodin.vlad@gmail.com>
Date: Sat, 6 Nov 2021 17:20:24 +0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20offline=20install=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 archiso/airootfs/etc/skel/.bashrc  |  2 --
 archiso/airootfs/etc/skel/.xinitrc | 29 +----------------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/archiso/airootfs/etc/skel/.bashrc b/archiso/airootfs/etc/skel/.bashrc
index 4b20d46..5c71db5 100644
--- a/archiso/airootfs/etc/skel/.bashrc
+++ b/archiso/airootfs/etc/skel/.bashrc
@@ -25,10 +25,8 @@ alias l.="ls -A | egrep '^\.'"
 alias grep='grep --colour=auto'
 alias egrep='egrep --colour=auto'
 alias fgrep='fgrep --colour=auto'
-alias cp="cp -i"                          # confirm before overwriting something
 alias df='df -h'                          # human-readable sizes
 alias free='free -m'                      # show sizes in MB
-alias np='nano -w PKGBUILD'
 PS1='[\u@\h \W]\$ '
 
 # Bash won't get SIGWINCH if another process is in the foreground.
diff --git a/archiso/airootfs/etc/skel/.xinitrc b/archiso/airootfs/etc/skel/.xinitrc
index 2cd2f8b..4164bb9 100644
--- a/archiso/airootfs/etc/skel/.xinitrc
+++ b/archiso/airootfs/etc/skel/.xinitrc
@@ -9,8 +9,6 @@ usermodmap=$HOME/.Xmodmap
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
-SESSION=${1:-startplasma-x11}
-
 # merge in defaults and keymaps
 
 if [ -f $sysresources ]; then
@@ -38,29 +36,4 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
     unset f
 fi
 
-get_session(){
-    local dbus_args=(--sh-syntax --exit-with-session)
-    case "$1" in
-        awesome) dbus_args+=(awesome) ;;
-        bspwm) dbus_args+=(bspwm-session) ;;
-        budgie) dbus_args+=(budgie-desktop) ;;
-        cinnamon) dbus_args+=(cinnamon-session) ;;
-        deepin) dbus_args+=(startdde) ;;
-        enlightenment) dbus_args+=(enlightenment_start) ;;
-        fluxbox) dbus_args+=(startfluxbox) ;;
-        gnome) dbus_args+=(gnome-session) ;;
-        i3|i3wm) dbus_args+=(i3 --shmlog-size 0) ;;
-        jwm) dbus_args+=(jwm) ;;
-        kde) dbus_args+=(startplasma-x11) ;;
-        lxde) dbus_args+=(startlxde) ;;
-        lxqt) dbus_args+=(lxqt-session) ;;
-        mate) dbus_args+=(mate-session) ;;
-        xfce) dbus_args+=(xfce4-session) ;;
-        openbox) dbus_args+=(openbox-session) ;;
-        *) dbus_args+=("$1") ;;
-    esac
-
-    echo "dbus-launch ${dbus_args[*]}"
-}
-
-exec $(get_session "$1")
+exec dbus-launch startplasma-x11