changing shellconfig directories for better structure

.bashrc

@@ -1 +1 @@
-.config/shellrc
+.config/shell/shellrc

.config/shell/aliasrc

@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# bash
+alias ":wq"="exit"
+alias ":q"="exit"
+
+# calcurse
+alias cal="calcurse-caldav --init=keep-remote && calcurse"
+alias calchange="cd ~/.calcurse/caldav"
+
+# cd
+alias ".."="cd .."
+alias "..1"="cd .."
+alias "..2"="cd ../.."
+alias "..3"="cd ../../.."
+alias "..4"="cd ../../../.."
+alias "..5"="cd ../../../../.."
+
+# cp
+alias cp="cp -i"
+
+# clear
+alias c="clear"
+
+# config
+alias config="/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME"
+
+# fzf
+sc() { find ~/.config/* ~/.local/bin/* -type f | fzf | xargs -r $EDITOR ;}
+sd() { find ~/ownCloud/* -type f | grep ".pdf" | fzf | xargs -r $READER ;}
+
+# git
+alias TexHandout="cp ~/github/Tools/LaTeX\ Templates/LaTeX\ Handout/Handout.tex"
+
+# grep
+alias grep="grep --color=auto"
+
+# lastpass
+alias lastpass="lpass"
+
+# ls(d)
+alias l="lsd"
+alias la="lsd -la"
+alias ll="lsd -l"
+alias tree="lsd --tree"
+
+# mkdir
+alias mkdir="mkdir -p"
+
+# mount
+alias mount="mount |column -t"
+
+# mv
+alias mv="mv -i"
+
+# pacman
+alias pac="sudo pacman"
+alias pacclean="sudo pacman -Rs $(pacman -Qtdq)"
+
+# ping
+alias ping="ping -c 5"
+
+# rm
+alias rm="rm -i"
+
+# root/sudo
+alias root="sudo -i"
+alias su="sudo -i"
+
+# nvim
+alias svim="sudo nvim"
+command -v nvim >/dev/null && alias vim="nvim" vimdiff="nvim -d"
+
+# weather
+alias weather="curl wttr.in"
+
+# various
+alias fuck='sudo $(history -p !!)'

.config/shell/bashspecific

@@ -0,0 +1,2 @@
+#!/bin/bash
+shopt -s autocd #Allows you to cd into directory without cd

.config/shell/shellrc

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -o vi
+stty -ixon # Disable ctrl-s and ctrl-q.
+HISTSIZE=10000
+SAVEHIST=10000
+HISTFILE=~/.cache/shell/history
+
+[ -f "$HOME/.config/shell/shortcutrc" ] && source "$HOME/.config/shell/shortcutrc" # Load shortcut aliases
+[ -f "$HOME/.config/shell/aliasrc" ] && source "$HOME/.config/shell/aliasrc" # Load aliases
+
+# Load options depending on current shell
+if [ $(echo $0) = "/bin/zsh" ]; then
+	[ -f "$HOME/.config/shell/zspecific" ] && source "$HOME/.config/shell/zspecific"
+fi
+if [ $(echo $0) = "/bin/bash" ]; then
+	[ -f "$HOME/.config/shell/bashspecific" ] && source "$HOME/.config/shell/bashspecific"
+fi
+
+pfetch && echo $(vrms) | grep "non-free"

.config/shell/shortcutrc

@@ -0,0 +1 @@
+# vim: filetype=sh

.config/shell/zshspecific

@@ -0,0 +1 @@
+#!/bin/zsh

.zshrc

@@ -1 +1 @@
-.config/shellrc
+.config/shell/shellrc