shell: moved aliases, bashrc cleanup

3 files changed, 36 insertions, 32 deletions

diff --git a/.bash_profile b/.bash_profile
index 5277257..17750b4 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -12,7 +12,6 @@ export INPUTRC="$XDG_CONFIG_HOME"/readline/inputrc
 export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass 
 export GTK_RC_FILES="$XDG_CONFIG_HOME"/gtk-1.0/gtkrc
 export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
-export GTK_THEME=Arc:dark
 export XCURSOR_PATH=/usr/share/icons:${XDG_DATA_HOME}/icons
 export QT_QPA_PLATFORMTHEME=qt5ct
 export RANGER_LOAD_DEFAULT_RC=FALSE
diff --git a/.bashrc b/.bashrc
index 0bda25a..a060e18 100644
--- a/.bashrc
+++ b/.bashrc
@@ -12,39 +12,14 @@ PATH="$HOME/bin:$PATH"
 PATH="$HOME/.local/bin:$PATH"
 PATH="$HOME/.dotnet/tools:$PATH"
 export PATH
-export EDITOR=vim
-export VISUAL=vim
+export EDITOR=nvim
+export VISUAL=nvim
 export PAGER="less -i -j.5 -R"
 
-alias sudo='doas'
-alias sudoedit='doasedit'
-
-source '/usr/share/fzf/key-bindings.bash'
-source '/usr/share/fzf/completion.bash'
-source "/home/adam/.local/share/cargo/env"
-
-alias q='exit'
-alias c='clear'
-alias nf='pfetch'
-alias t='todo.sh'
-
-alias ls='exa'
-alias l='ls -la'
-alias lt='ls -T'
-alias lh="ls -1dI '.|..' .*"
-
-alias gs='git status'
-alias lg="git log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(cyan)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all"
-
-alias config='/usr/bin/git --git-dir=/home/adam/.cfg/ --work-tree=/home/adam'
-alias cs='config status'
-alias clg="config log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(bold yellow)%d%C(reset)' --all"
-
-alias bashrc='vim ~/.bashrc'
-alias vimrc='vim $XDG_CONFIG_HOME/vim/vimrc'
-alias nvimrc='cd $XDG_CONFIG_HOME/nvim;nvim'
-alias i3config='vim $XDG_CONFIG_HOME/i3/config'
-alias startup='vim $XDG_CONFIG_HOME/X11/xinitrc'
+source /usr/share/fzf/key-bindings.bash
+source /usr/share/fzf/completion.bash
+source $XDG_DATA_HOME/cargo/env
+source $XDG_CONFIG_HOME/aliases
 
 eval "$(zoxide init bash)"
 eval "$(starship init bash)"
diff --git a/.config/aliases b/.config/aliases
new file mode 100644
index 0000000..6348370
--- /dev/null
+++ b/.config/aliases
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+alias vim="nvim"
+alias sudo='doas'
+alias sudoedit='doasedit'
+
+alias q='exit'
+alias c='clear'
+alias nf='pfetch'
+alias t='todo.sh'
+
+alias ls='exa'
+alias l='ls -la'
+alias lt='ls -T'
+alias lh="ls -1dI '.|..' .*"
+
+alias gs='git status'
+alias lg="git log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(cyan)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all"
+
+alias config='/usr/bin/git --git-dir=/home/adam/.cfg/ --work-tree=/home/adam'
+alias cs='config status'
+alias clg="config log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(bold yellow)%d%C(reset)' --all"
+
+alias shrc="nvim $HOME/.bashrc"
+alias vars="nvim $HOME/.bash_profile"
+alias wmrc="nvim $XDG_CONFIG_HOME/i3/config"
+alias vimrc="nvim --cmd ':cd $XDG_CONFIG_HOME/nvim/ | edit lua/plugins.lua'"
+alias initrc="nvim $XDG_CONFIG_HOME/X11/xinitrc"
+alias barconf="nvim $XDG_CONFIG_HOME/polybar/config.ini"
+alias aliases="nvim $XDG_CONFIG_HOME/aliases"