some improvements in shells

3 files changed, 47 insertions, 12 deletions

diff --git a/config/shell/aliasrc b/config/shell/aliasrc
new file mode 100644
index 0000000..6dfbc17
--- /dev/null
+++ b/config/shell/aliasrc
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+[ -f $XINITRC ] && alias startx="startx $XINITRC"
+[ -x "$(command -v vim)" ] && alias vi="vim"
+[ -x "$(command -v nvim)" ] && alias vi="nvim"
+
+alias ls="ls -A --color=auto"
+alias grep="grep --color=auto"
+alias ping="ping -c 2"
+alias clear="clear -x"
+alias open="xdg-open"
+alias lf="lfcd"
+
+# Directory change aliases
+alias gp="cd ~/proj"
+alias gt="cd ~/testProj"
+alias gc="cd ~/.config"
+alias gu="cd /usr/local/bin"
+
+# Init system aliases
+if [ -x "$(command -v systemctl)" ]; then
+	alias systemctl="sudo systemctl"
+	alias net="sudo systemctl start NetworkManager"
+	alias is="systemctl stop NetworkManager"
+	alias blue="sudo systemctl start bluetooth"
+	alias red="sudo systemctl stop bluetooth"
+
+elif [ -x "$(command -v rc-service)" ]; then
+	alias rc-service="sudo rc-service"
+	alias net="sudo rc-service NetworkManager start"
+	alias is="sudo rc-service NetworkManager stop"
+	alias blue="sudo rc-service bluetooth start"
+	alias red="sudo rc-service bluetooth stop"
+
+fi
+
+# Systemd and Arch linux specific aliases
+alias pacman="sudo pacman"
+alias arch-wiki="cd /usr/share/doc/arch-wiki/html/en/"
diff --git a/config/shell/profile b/config/shell/profile
index 264d4ef..40fef77 100644
--- a/config/shell/profile
+++ b/config/shell/profile
@@ -1,16 +1,18 @@
 #Directories
-export XDG_CACHE_HOME=$HOME/.cache
-export XDG_CONFIG_HOME=$HOME/.config
-export XDG_DATA_HOME=$HOME/.local/share
-export XDG_STATE_HOME=$HOME/.local/state
-export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
-export ZSHRC="$XDG_CONFIG_HOME/zsh/zshrc"
+export XDG_CACHE_HOME="$HOME"/.cache
+export XDG_CONFIG_HOME="$HOME"/.config
+export XDG_DATA_HOME="$HOME"/.local/share
+export XDG_STATE_HOME="$HOME"/.local/state
+export XINITRC="$XDG_CONFIG_HOME"/x11/xinitrc
+export ZSHRC="$XDG_CONFIG_HOME"/zsh/zshrc
 
 
 # Environment variables
 [ -x "$(command -v vim)" ] && export EDITOR="vim"
 [ -x "$(command -v nvim)" ] && export EDITOR="nvim"
+[ -x "$(command -v alacritty)" ] && export  TERMINAL="alacritty"
 [ -x "$(command -v st)" ] && export  TERMINAL="st"
+[ -x "$(command -v firefox)" ] && export  BROWSER="firefox"
 [ -x "$(command -v qutebrowser)" ] && export  BROWSER="qutebrowser"
 
 export MAKEFLAGS="-j8"		# Reduce compile times
diff --git a/config/zsh/zshrc b/config/zsh/zshrc
index 9404f7f..da3d682 100755
--- a/config/zsh/zshrc
+++ b/config/zsh/zshrc
@@ -66,9 +66,3 @@ setopt HIST_FIND_NO_DUPS		# Don't show duplicate commands when backward searchin
 bindkey '^R' history-incremental-search-backward
 bindkey -s '^o' '^ulfcd\n'
 bindkey -s '^f' '^ucd "$(dirname "$(fzf --reverse)")"\n'
-
-# Load other shell configurations
-
-if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/zshnameddirrc" ]; then
-	source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/profile"
-fi