From 57350fb2956dded1f1ac27a18216e35bcb043f5f Mon Sep 17 00:00:00 2001
From: tavo <tavo@tavo.one>
Date: Sun, 5 Jan 2025 11:02:24 -0600
Subject: [PATCH] shell

---
 shell/aliases.sh          | 51 +++++++++++++++++++++++++++
 shell/bashrc              | 73 ++++-----------------------------------
 shell/gui.sh              | 11 ++++++
 shell/profile.d/config.sh |  5 +++
 4 files changed, 73 insertions(+), 67 deletions(-)
 create mode 100644 shell/aliases.sh
 create mode 100644 shell/gui.sh

diff --git a/shell/aliases.sh b/shell/aliases.sh
new file mode 100644
index 0000000..8e48fd4
--- /dev/null
+++ b/shell/aliases.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+if ! command -v sudo >/dev/null 2>&1 ; then
+    alias sudo="doas"
+    complete -cf doas
+fi
+
+alias \
+    src="cd $HOME/.local/src/ && ls" \
+    cfg="cd $HOME/.config/ && ls" \
+    tmp="cd $HOME/Desktop/temp/ && ls" \
+    dsk="cd $HOME/Desktop/ && ls" \
+    prj="cd $HOME/Projects && ls" \
+    doc="cd $HOME/Documents/ && ls" \
+    dow="cd $HOME/Downloads/ && ls" \
+    mus="cd $HOME/Music/ && ls" \
+    prt="cd $HOME/Pictures/Screenshots/ && ls" \
+    bkg="cd $HOME/Pictures/Backgrounds/ && ls" \
+    img="cd $HOME/Pictures/ && ls" \
+    vid="cd $HOME/Videos/ && ls" \
+
+EZA_OPTS="--git --group-directories-first --icons --time-style=long-iso"
+command -v exa >/dev/null 2>&1 &&
+    alias la="exa $EZA_OPTS -alghUum" &&
+    alias lt="exa $EZA_OPTS -T -L 2" &&
+    alias ll="exa $EZA_OPTS -alg" &&
+    alias ls="exa $EZA_OPTS -1"
+
+command -v eza >/dev/null 2>&1 &&
+    alias la="eza $EZA_OPTS -alghUum" &&
+    alias lt="eza $EZA_OPTS -T -L 2" &&
+    alias ll="eza $EZA_OPTS -alg" &&
+    alias ls="eza $EZA_OPTS -1"
+
+command -v trash >/dev/null 2>&1 && alias rm="trash"
+
+alias \
+    fzf="fzf --cycle --reverse" \
+    diff="diff --color=auto" \
+    grep="grep --color=auto" \
+    calc="bc -l" \
+    cp="cp -iv" \
+    mv="mv -iv" \
+    vim="nvim" \
+    df-short="df -h | grep -v '\s/dev.*$\|\s/run.*$\|\s/boot.*$'" \
+    qr-png="qrencode -s 16 -o qr.png" \
+    qr="qrencode -t ansiutf8" \
+    clip="xsel -ib" \
+    em="emacsclient -c -a 'emacs' $@" \
+    wget="wget --hsts-file=$XDG_DATA_HOME/wget/wget-hsts" \
+    ssh="ssh ${SSH_CONFIG}"
diff --git a/shell/bashrc b/shell/bashrc
index e3b4fee..2a13a98 100644
--- a/shell/bashrc
+++ b/shell/bashrc
@@ -26,10 +26,6 @@ shopt -s cdspell
 shopt -s autocd
 set -o vi
 
-HISTCONTROL=ignoreboth
-HISTIZE=
-HISTFILESIZE=
-
 if [ -n "$HISTFILE" ] && ! [ -d "${HISTFILE%/*}" ] ; then
     mkdir -p "${HISTFILE%/*}" && touch "$HISTFILE"
 fi
@@ -47,67 +43,10 @@ PS1='\
 \[$(echo -ne $EXIT_COLOR)\]>\[\033[0m\] \
 '
 
-! command -v sudo >/dev/null 2>&1 &&
-    alias sudo="doas" &&
-    complete -cf doas
-
-alias \
-    src="cd $HOME/.local/src/ && ls" \
-    cfg="cd $HOME/.config/ && ls" \
-    tmp="cd $HOME/Desktop/temp/ && ls" \
-    dsk="cd $HOME/Desktop/ && ls" \
-    prj="cd $HOME/Projects && ls" \
-    doc="cd $HOME/Documents/ && ls" \
-    dow="cd $HOME/Downloads/ && ls" \
-    mus="cd $HOME/Music/ && ls" \
-    prt="cd $HOME/Pictures/Screenshots/ && ls" \
-    bkg="cd $HOME/Pictures/Backgrounds/ && ls" \
-    img="cd $HOME/Pictures/ && ls" \
-    vid="cd $HOME/Videos/ && ls" \
-
-EZA_OPTS="--git --group-directories-first --icons --time-style=long-iso"
-command -v exa >/dev/null 2>&1 &&
-    alias la="exa $EZA_OPTS -alghUum" &&
-    alias lt="exa $EZA_OPTS -T -L 2" &&
-    alias ll="exa $EZA_OPTS -alg" &&
-    alias ls="exa $EZA_OPTS -1"
-
-command -v eza >/dev/null 2>&1 &&
-    alias la="eza $EZA_OPTS -alghUum" &&
-    alias lt="eza $EZA_OPTS -T -L 2" &&
-    alias ll="eza $EZA_OPTS -alg" &&
-    alias ls="eza $EZA_OPTS -1"
-
-command -v trash >/dev/null 2>&1 && alias rm="trash"
-
-alias \
-    fzf="fzf --cycle --reverse" \
-    diff="diff --color=auto" \
-    grep="grep --color=auto" \
-    calc="bc -l" \
-    cp="cp -iv" \
-    mv="mv -iv" \
-    vim="nvim" \
-    df-short="df -h | grep -v '\s/dev.*$\|\s/run.*$\|\s/boot.*$'" \
-    qr-png="qrencode -s 16 -o qr.png" \
-    qr="qrencode -t ansiutf8" \
-    clip="xsel -ib" \
-    em="emacsclient -c -a 'emacs' $@" \
-    wget="wget --hsts-file=$XDG_DATA_HOME/wget/wget-hsts" \
-    ssh="ssh ${SSH_CONFIG} " \
-
-[ -f ~/.config/shell/kit ] && . ~/.config/shell/kit
-
-for func in ~/.config/shell/functions/* ; do
-    [ -f "$func" ] && . $func
-done
-
-if [ "$(tty)" = "/dev/tty1" ] ; then
-    sleep 0.5
-    amixer &
-    XDG_SESSION_TYPE=x11 GDK_BACKEND=x11 exec startx
-    #exec sway
-elif [ "$(tty)" = "/dev/tty2" ] ; then
-    sleep 0.5
-    exec /usr/lib/plasma-dbus-run-session-if-needed /usr/bin/startplasma-wayland
+if [ -f ~/.config/shell/aliases.sh ] ; then
+    . ~/.config/shell/aliases.sh
+fi
+
+if [ -f ~/.config/shell/gui.sh ] ; then
+    . ~/.config/shell/gui.sh
 fi
diff --git a/shell/gui.sh b/shell/gui.sh
new file mode 100644
index 0000000..23c921a
--- /dev/null
+++ b/shell/gui.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [ "$(tty)" = "/dev/tty1" ] ; then
+    sleep 0.5
+    amixer &
+    XDG_SESSION_TYPE=x11 GDK_BACKEND=x11 exec startx
+    #exec sway
+elif [ "$(tty)" = "/dev/tty2" ] ; then
+    sleep 0.5
+    exec /usr/lib/plasma-dbus-run-session-if-needed /usr/bin/startplasma-wayland
+fi
diff --git a/shell/profile.d/config.sh b/shell/profile.d/config.sh
index de1cd7b..b80ce24 100644
--- a/shell/profile.d/config.sh
+++ b/shell/profile.d/config.sh
@@ -1,3 +1,8 @@
+export \
+    HISTCONTROL=ignoreboth \
+    HISTIZE= \
+    HISTFILESIZE=
+
 export \
     QT_QPA_PLATFORMTHEME="qt5ct" \
     CM_SELECTIONS="clipboard" \