diff --git a/archiso/airootfs/etc/skel/.bashrc b/archiso/airootfs/etc/skel/.bashrc index 3a70979..4b20d46 100644 --- a/archiso/airootfs/etc/skel/.bashrc +++ b/archiso/airootfs/etc/skel/.bashrc @@ -5,11 +5,43 @@ # If not running interactively, don't do anything [[ $- != *i* ]] && return +[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion + +# Change the window title of X terminals +case ${TERM} in + xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*) + PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\007"' + ;; + screen*) + PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\033\\"' + ;; +esac + alias ls='ls --color=auto' alias la='ls -a' alias ll='ls -la' alias l='ls' 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. +# Enable checkwinsize so that bash will check the terminal size when +# it regains control. #65623 +# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11) +shopt -s checkwinsize + +shopt -s expand_aliases + +# export QT_SELECT=4 + +# Enable history appending instead of overwriting. #139609 +shopt -s histappend + #neofetch diff --git a/archiso/airootfs/etc/skel/.config/Kvantum/kvantum.kvconfig b/archiso/airootfs/etc/skel/.config/Kvantum/kvantum.kvconfig new file mode 100644 index 0000000..ee69333 --- /dev/null +++ b/archiso/airootfs/etc/skel/.config/Kvantum/kvantum.kvconfig @@ -0,0 +1,2 @@ +[General] +theme=KvMojave diff --git a/archiso/airootfs/etc/skel/.xinitrc b/archiso/airootfs/etc/skel/.xinitrc index b578fad..2cd2f8b 100644 --- a/archiso/airootfs/etc/skel/.xinitrc +++ b/archiso/airootfs/etc/skel/.xinitrc @@ -1,2 +1,66 @@ -[ -f ~/.xprofile ] && . ~/.xprofile && dbus-launch startplasma-x11 -#[ -f ~/.xprofile ] && . ~/.xprofile && dbus-launch xfce4-session +#!/bin/bash +# +# ~/.xinitrc +# +# Executed by startx (run your window manager from here) + +userresources=$HOME/.Xresources +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 + xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" +fi + +if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" +fi + +# start some nice programs + +if [ -d /etc/X11/xinit/xinitrc.d ] ; then + for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do + [ -x "$f" ] && . "$f" + done + 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") diff --git a/archiso/airootfs/usr/local/bin/removeun b/archiso/airootfs/usr/local/bin/removeun index 52f23a0..6f30e1d 100755 --- a/archiso/airootfs/usr/local/bin/removeun +++ b/archiso/airootfs/usr/local/bin/removeun @@ -28,28 +28,6 @@ _clean_packages(){ expect gpart tcpdump - libpwquality - refind - rate-mirrors-bin - kvantum-qt5 - polkit-qt5 - qca-qt5 - qt5-location - qt5-multimedia - qt5-speech - qt5-wayland - qt5-webchannel - qt5-webengine - qt5-xmlpatterns - qt5-base - sonnet - kwidgetsaddons - kitemviews - kguiaddons - kdbusaddons - kcoreaddons - karchive - qt5ct arch-install-scripts squashfs-tools extra-cmake-modules @@ -58,8 +36,6 @@ _clean_packages(){ yaml-cpp syslinux clonezilla - ckbcomp - xcompmgr memtest86+ mkinitcpio-archiso ) diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index 5d419d0..a0c8f97 100644 --- a/archiso/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -140,6 +140,7 @@ xorg-xinput xorg-xrdb mkinitcpio-openswap alacritty +konsole kwin-scripts-forceblur #network