lytedev/dotfiles
Archived
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:lytedev/dotfiles

Browse source
This commit is contained in:
Daniel Flanagan 2016-01-24 09:11:32 -06:00
parent c2ccc6feab 41b9d49c7a
commit b02b13060b
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch_linux_init/utils.bash
View file

@ -7,7 +7,7 @@ sudo pacman -S \
rofi \ rofi \
slock \ slock \
the_silver_searcher \ the_silver_searcher \
thunar \ thunar thunar-volman \
luakit \ luakit \
alsa-utils \ alsa-utils \
--noconfirm --noconfirm

15
sh/bashrc
View file

@ -4,7 +4,7 @@ BASE16_SHELL="$DOTFILES_PATH/colors/shell"
[[ -s "$BASE16_SHELL" ]] && source "$BASE16_SHELL" [[ -s "$BASE16_SHELL" ]] && source "$BASE16_SHELL"
# disable ctrl-s terminal freeze # disable ctrl-s terminal freeze
stty -ixon [[ $- == *i* ]] && stty -ixon
# filesystem aliases # filesystem aliases
alias lx='ls -lXB' # order by filetype alias lx='ls -lXB' # order by filetype
@ -36,6 +36,7 @@ alias tmatt="tmux attach -t"
# git aliases # git aliases
alias gs="git status" alias gs="git status"
alias gl="git log"
alias gpl="git pull" alias gpl="git pull"
alias gp="git push" alias gp="git push"
alias gac="git add -A && git commit -m" alias gac="git add -A && git commit -m"
@ -43,15 +44,19 @@ alias gac="git add -A && git commit -m"
# networking aliases # networking aliases
alias p="ping 8.8.8.8" alias p="ping 8.8.8.8"
# emacs aliases
alias emacs="emacs -nw"
if command -v nvim >/dev/null 2>&1; then if command -v nvim >/dev/null 2>&1; then
alias vim="nvim" alias vim="nvim"
alias ovim="\vim" alias ovim="\vim"
fi fi
# prompt # prompt
COLOR_RESET='\e[0m' COLOR_RESET='\[\e[0m\]'
PROMPT_SUCCESS_COLOR='\e[0;34m' PROMPT_SUCCESS_COLOR='\[\e[0;34m\]'
PROMPT_FAILURE_COLOR='\e[0;31m' PROMPT_FAILURE_COLOR='\[\e[0;31m\]'
DIR_COLOR='\[\e[0;33m\]'
prompt_command_func() prompt_command_func()
{ {
RET=$? RET=$?
@ -60,7 +65,7 @@ prompt_command_func()
else else
STATUS_COLOR=$PROMPT_FAILURE_COLOR STATUS_COLOR=$PROMPT_FAILURE_COLOR
fi; 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" export PROMPT_COMMAND="prompt_command_func"

4
x/xresources
View file

@ -3,6 +3,8 @@
#define iconfont xft:stlarch-9 #define iconfont xft:stlarch-9
#define primaryletterspace -2 #define primaryletterspace -2
#define emacspfont Monaco 9
*font: primaryfont *font: primaryfont
*faceName: primaryfont *faceName: primaryfont
*boldFont: primaryfont *boldFont: primaryfont
@ -14,6 +16,8 @@
*intensityStyles: true *intensityStyles: true
*utf8: 2 *utf8: 2
emacs.font: emacspfont
*depth: 32 *depth: 32
URxvt.internalBorder: 10 URxvt.internalBorder: 10