diff --git a/arch_linux_init/utils.bash b/arch_linux_init/utils.bash index 3855aac..9d4e6ec 100755 --- a/arch_linux_init/utils.bash +++ b/arch_linux_init/utils.bash @@ -7,7 +7,7 @@ sudo pacman -S \ rofi \ slock \ the_silver_searcher \ - thunar \ + thunar thunar-volman \ luakit \ alsa-utils \ --noconfirm diff --git a/sh/bashrc b/sh/bashrc index 0de0961..9245fe7 100644 --- a/sh/bashrc +++ b/sh/bashrc @@ -4,7 +4,7 @@ BASE16_SHELL="$DOTFILES_PATH/colors/shell" [[ -s "$BASE16_SHELL" ]] && source "$BASE16_SHELL" # disable ctrl-s terminal freeze -stty -ixon +[[ $- == *i* ]] && stty -ixon # filesystem aliases alias lx='ls -lXB' # order by filetype @@ -36,6 +36,7 @@ alias tmatt="tmux attach -t" # git aliases alias gs="git status" +alias gl="git log" alias gpl="git pull" alias gp="git push" alias gac="git add -A && git commit -m" @@ -43,15 +44,19 @@ alias gac="git add -A && git commit -m" # networking aliases alias p="ping 8.8.8.8" +# emacs aliases +alias emacs="emacs -nw" + if command -v nvim >/dev/null 2>&1; then alias vim="nvim" alias ovim="\vim" fi # prompt -COLOR_RESET='\e[0m' -PROMPT_SUCCESS_COLOR='\e[0;34m' -PROMPT_FAILURE_COLOR='\e[0;31m' +COLOR_RESET='\[\e[0m\]' +PROMPT_SUCCESS_COLOR='\[\e[0;34m\]' +PROMPT_FAILURE_COLOR='\[\e[0;31m\]' +DIR_COLOR='\[\e[0;33m\]' prompt_command_func() { RET=$? @@ -60,7 +65,7 @@ prompt_command_func() else STATUS_COLOR=$PROMPT_FAILURE_COLOR fi; - PS1="ā”Œ $STATUS_COLOR\u@\h$COLOR_RESET \w \nā”” " + PS1="$STATUS_COLOR\u@\h$COLOR_RESET $DIR_COLOR\w$COLOR_RESET " } export PROMPT_COMMAND="prompt_command_func" diff --git a/x/xresources b/x/xresources index 011ec91..9740344 100755 --- a/x/xresources +++ b/x/xresources @@ -3,6 +3,8 @@ #define iconfont xft:stlarch-9 #define primaryletterspace -2 +#define emacspfont Monaco 9 + *font: primaryfont *faceName: primaryfont *boldFont: primaryfont @@ -14,6 +16,8 @@ *intensityStyles: true *utf8: 2 +emacs.font: emacspfont + *depth: 32 URxvt.internalBorder: 10