From b9693018f280b7fec086e2e5c5921ce41c29fceb Mon Sep 17 00:00:00 2001
From: ubq323 <ubq323@ubq323.website>
Date: Sun, 28 May 2023 15:12:35 +0100
Subject: move aliases and bashrc around

---
 .aliases.bashrc | 18 ++++++++++++++++++
 .bashrc         | 35 ++++++++++++-----------------------
 2 files changed, 30 insertions(+), 23 deletions(-)
 create mode 100644 .aliases.bashrc

diff --git a/.aliases.bashrc b/.aliases.bashrc
new file mode 100644
index 0000000..419438f
--- /dev/null
+++ b/.aliases.bashrc
@@ -0,0 +1,18 @@
+
+alias ls='ls --color=auto'
+alias grep='grep --color=auto'
+alias xqr='xbps-query -R'
+alias xqrs='xbps-query -Rs'
+
+
+alias kb='kak ~/.bashrc'
+alias .b='source ~/.bashrc'
+
+alias l='ls -lah'
+
+apwd () {
+	pwd | sed -e 's!'"$HOME"'!~!'
+}
+
+alias mirror='mpv --untimed --profile=low-latency --vf=hflip /dev/video0'
+
diff --git a/.bashrc b/.bashrc
index 0c0ed32..d77d158 100644
--- a/.bashrc
+++ b/.bashrc
@@ -3,54 +3,43 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
-alias ls='ls --color=auto'
-alias grep='grep --color=auto'
+# prompt
 PROMPT_DIRTRIM=0
 PS1='\[\e[90m\][\u@\h \W]\$\[\e[0m\] '
 
+# history
 shopt -s histappend
 HISTCONTROL=ignoreboth
 HISTSIZE=1000000
 HISTFILESIZE=1000000
 
-alias xqr='xbps-query -R'
-alias xqrs='xbps-query -Rs'
-
+# input
 bind -s 'set completion-ignore-case on'
 
-
-
-alias kb='kak ~/.bashrc'
-alias .b='source ~/.bashrc'
-
-alias l='ls -lah'
-
-export XDG_CONFIG_HOME=$HOME/.config
-export EDITOR=kak
-
-apwd () {
-	pwd | sed -e 's!'"$HOME"'!~!'
-}
-
-alias mirror='mpv --untimed --profile=low-latency --vf=hflip /dev/video0'
-
+# title
 set_title () { printf "\e]2;%s\e\\" "$1"; }
 _lastcmd () { history 1 | sed -e 's/^ *[0-9]* *//g' ; }
 trap 'set_title "$(_lastcmd)"' DEBUG
 PROMPT_COMMAND='history -a; set_title "$(apwd)"'
 
+# aliases
+. ~/.aliases.bashrc
+
+# environment
+export XDG_CONFIG_HOME=$HOME/.config
+export EDITOR=kak
+
+# paths
 export LUA_PATH_5_3="$HOME/.local/lib/lua/5.3/?.lua;;"
 export LUA_PATH_5_1="$HOME/.local/lib/lua/5.1/?.lua;;"
 export LUA_CPATH_5_3="$HOME/.local/lib/lua/5.3/?.so;;"
 export LUA_CPATH_5_1="$HOME/.local/lib/lua/5.1/?.so;;"
-
 export MANPATH="$HOME/.local/share/man:"
 
 add_path () {
 	export PATH="$1:$PATH"
 }
 
-
 add_path ~/.local/bin
 add_path ~/bin
 
-- 
cgit v1.2.3