From 31a509c8735daa85c232b34ab544bfbdbfb4a059 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Thu, 24 Aug 2023 13:30:10 -0400 Subject: [PATCH] Removed custom .bashrc, organized .zshrc and set more histfile options --- README.md | 2 +- chrootInstall.sh | 6 +----- config-files/bashrc | 17 ----------------- config-files/zshrc | 38 +++++++++++++++++++------------------- install.sh | 2 +- 5 files changed, 22 insertions(+), 43 deletions(-) delete mode 100644 config-files/bashrc diff --git a/README.md b/README.md index eb8695e..64adf25 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Some major/noteworthy differences from common configurations: - EXT4 fast_commit mode is enabled by default - makepkg is configured for better than stock performance and uses more space-efficient compression - dash is used as the system and login shell -- custom zshrc and bashrc files are included with useful system management aliases +- zsh (with a custom zshrc) is used aas the defualt KDE (Konsole/Yakuake) shell - ...all of this and more on KDE Plasma Wayland # Usage diff --git a/chrootInstall.sh b/chrootInstall.sh index 2a992c0..39d4c7c 100755 --- a/chrootInstall.sh +++ b/chrootInstall.sh @@ -76,13 +76,9 @@ if [ "$gpu" == 'NVIDIA' ]; then fi # shell configuration -mkdir -p /home/"$username"/.local/share/zsh -chmod 755 /home/"$username"/.local/share /home/"$username"/.local/share/zsh -chown "$username":users /home/"$username"/.local/share /home/"$username"/.local/share/zsh curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/shell-profile -o /home/"$username"/.profile -curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/bashrc -o /home/"$username"/.bashrc curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/zshrc -o /home/"$username"/.zshrc -chown "$username":users /home/"$username"/{.profile,.bashrc,.zshrc} /home/"$username"/.local/share/zsh +chown "$username":users /home/"$username"/{.profile,.zshrc} chsh -s /bin/dash "$username" ln -sfT dash /usr/bin/sh pacman -Sy zsh zsh-autosuggestions zsh-syntax-highlighting openrc-zsh-completions --noconfirm diff --git a/config-files/bashrc b/config-files/bashrc deleted file mode 100644 index 8b69a73..0000000 --- a/config-files/bashrc +++ /dev/null @@ -1,17 +0,0 @@ -# -# ~/.bashrc -# - -# If not running interactively, don't do anything -[[ $- != *i* ]] && return - -alias ls='ls --color=auto' -alias orphans='doas pacman -Rcns $(pacman -Qqdt)' -alias powersave='doas /usr/local/bin/powerset.sh powersave' -alias performance='doas /usr/local/bin/powerset.sh performance' -alias schedutil='doas /usr/local/bin/powerset.sh schedutil' -alias ondemand='doas /usr/local/bin/powerset.sh ondemand' -alias poweroff='doas /usr/bin/poweroff' -alias reboot='doas /usr/bin/reboot' - -PS1='\[\e[36m\]\u\[\e[0m\]@\[\e[36m\]\h:\[\e[0m\]\W\[\e[36m\]|$\[\e[0m\] ' diff --git a/config-files/zshrc b/config-files/zshrc index 9dac72d..0941373 100644 --- a/config-files/zshrc +++ b/config-files/zshrc @@ -1,16 +1,23 @@ -# Lines configured by zsh-newuser-install -HISTFILE=~/.local/share/zsh/histfile -HISTSIZE=1000 -SAVEHIST=1000 +# shell settings (this section impacts shell functionality) +HISTFILE="$XDG_CACHE_HOME"/zsh_histfile +HISTSIZE=2500 +SAVEHIST=2000 +setopt INC_APPEND_HISTORY +setopt HIST_EXPIRE_DUPS_FIRST +setopt HIST_FIND_NO_DUPS unsetopt beep bindkey -e -# End of lines configured by zsh-newuser-install -# The following lines were added by compinstall zstyle :compinstall filename "/home/$USER/.zshrc" autoload -Uz compinit compinit -# End of lines added by compinstall -# The following lines represent custom user configuration +PS1='%F{cyan}%n%f@%F{cyan}%m:%f%1~%f%F{cyan}|%#%f ' +source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh +bindkey '^[[H' beginning-of-line +bindkey '^[[F' end-of-line +bindkey '^[[3~' delete-char + +# random text art (this section can be safely deleted) art_cat='%F{214}/\_,_/\ \ 0 0 /%f' art_dog=' %F{222}/___/ @@ -27,21 +34,15 @@ art_school=' %F{214}<°))>< %F{222}><(((.> %F{114}><(((°> %F{183}><((((°>%f' art_array=("$art_cat" "$art_dog" "$art_bear" "$art_snail" "$art_bunny" "$art_jellyfish" "$art_school") print -Pr "$art_array[$((RANDOM%7+1))]" -PS1='%F{cyan}%n%f@%F{cyan}%m:%f%1~%f%F{cyan}|%#%f ' -source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh -bindkey '^[[H' beginning-of-line -bindkey '^[[F' end-of-line -bindkey '^[[3~' delete-char -function yakuake_clear() { +function term_clear() { clear print -Pr "$art_array[$((RANDOM%7+1))]" print -Pn $PS1 } -zle -N zsh-redraw yakuake_clear +zle -N zsh-redraw term_clear bindkey "^L" zsh-redraw -# End of lines representing custom user configuration -# The following lines represent custom user aliases + +# aliases alias ls='ls --color=auto' alias orphans='doas pacman -Rcns $(pacman -Qqdt)' alias powersave='doas /usr/local/bin/powerset.sh powersave' @@ -50,4 +51,3 @@ alias schedutil='doas /usr/local/bin/powerset.sh schedutil' alias ondemand='doas /usr/local/bin/powerset.sh ondemand' alias poweroff='doas /usr/bin/poweroff' alias reboot='doas /usr/bin/reboot' -# End of lines representing custom user aliases diff --git a/install.sh b/install.sh index 30f93e7..4c2fc39 100755 --- a/install.sh +++ b/install.sh @@ -3,7 +3,7 @@ loadkeys us echo ---------------------------------------------------------------------------------------------- echo rwinkhart\'s artix install script -echo last updated august 15, 2023 +echo last updated august 24, 2023 echo ---------------------------------------------------------------------------------------------- echo You will be asked some questions before installation. echo -e "----------------------------------------------------------------------------------------------\n"