aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.shenanigans.sh7
-rw-r--r--.vimrc4
2 files changed, 7 insertions, 4 deletions
diff --git a/.shenanigans.sh b/.shenanigans.sh
index d771d8d..7738514 100755
--- a/.shenanigans.sh
+++ b/.shenanigans.sh
@@ -17,14 +17,17 @@ if [[ "${BASH_SOURCE[0]}" != "${0}" ]]; then
17 export VISUAL=vim 17 export VISUAL=vim
18 export EDITOR=vim 18 export EDITOR=vim
19 19
20 export LANG=en_US.UTF-8
21 export LC_ALL=en_US.UTF-8
22
20 # Customized Bash prompt. 23 # Customized Bash prompt.
21 SYMBOL='\[\e[38;5;214m\]\$\[\e[0m\]' 24 SYMBOL='\[\e[38;5;214m\]\$\[\e[0m\]'
22 git_branch() { git branch 2>/dev/null | sed -n 's/^\* \(.*\)/(\1)/p'; } 25 git_branch() { git branch 2>/dev/null | sed -n 's/^\* \(.*\)/(\1)/p'; }
23 export PS1="\n$SYMBOL \u@\h \t \w \$(git_branch)\n$SYMBOL " 26 export PS1="\n$SYMBOL \u@\h \t \w \$(git_branch)\n$SYMBOL "
24 27
25 # General aliases. 28 # General aliases.
26 alias l='ls -lh' 29 alias l='ls -lh --group-directories-first'
27 alias ll='ls -lha' 30 alias ll='ls -lha --group-directories-first'
28 alias t='tree -L 2' 31 alias t='tree -L 2'
29 alias ..='cd ..' 32 alias ..='cd ..'
30 alias less='less -R' 33 alias less='less -R'
diff --git a/.vimrc b/.vimrc
index ff6fe2a..6eddbff 100644
--- a/.vimrc
+++ b/.vimrc
@@ -7,10 +7,10 @@ call plug#begin()
7 Plug 'airblade/vim-gitgutter' 7 Plug 'airblade/vim-gitgutter'
8call plug#end() 8call plug#end()
9 9
10set laststatus=2 encoding=utf8 spelllang=en_us tabstop=4 shiftwidth=4 path=** 10set laststatus=2 encoding=utf8 spelllang=en_us tabstop=4 shiftwidth=4
11set number relativenumber autoindent cursorline ignorecase signcolumn=yes 11set number relativenumber autoindent cursorline ignorecase signcolumn=yes
12set hidden nowrap nobackup noswapfile noundofile autoread updatetime=300 12set hidden nowrap nobackup noswapfile noundofile autoread updatetime=300
13set hlsearch incsearch 13set hlsearch incsearch backspace=indent,eol,start path=**
14colorscheme wildcharm 14colorscheme wildcharm
15 15
16nnoremap <C-Right> :bnext<cr> 16nnoremap <C-Right> :bnext<cr>