1
0
mirror of https://github.com/frebib/dotfiles.git synced 2024-06-14 12:57:23 +00:00

Merge branch 'master' into surface-docked

This commit is contained in:
Joe Groocock 2018-03-31 13:46:20 +01:00
commit 061f358a7f
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86
2 changed files with 6 additions and 9 deletions

View File

@ -18,6 +18,7 @@ set smartindent
set number set number
set linebreak set linebreak
set autoindent set autoindent
set breakindent
set laststatus=2 set laststatus=2
set encoding=utf-8 set encoding=utf-8
set background=dark set background=dark

14
.zshrc
View File

@ -5,9 +5,10 @@ CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}"
ZSH_DIR="$CONFIG_DIR/zsh" ZSH_DIR="$CONFIG_DIR/zsh"
ZSH_CACHE_DIR="$CONFIG_DIR/oh-my-zsh/cache" ZSH_CACHE_DIR="$CONFIG_DIR/oh-my-zsh/cache"
ADOTDIR="$ZSH_DIR/antigen" # Antigen directory ADOTDIR="$ZSH_DIR/antigen" # Antigen directory
ANTIGEN_LOG="$ADOTDIR/log/antigen-$(date +"%Y_%m_%d_%I_%M_%p").log" LOG_DIR="$ZSH_DIR/log"
ANTIGEN_LOG="$LOG_DIR/antigen-$(date +"%Y_%m_%d_%I_%M_%p").log"
mkdir -p "$ZSH_CACHE_DIR" "$ZSH_DIR" "$ADOTDIR/log" mkdir -p "$ZSH_CACHE_DIR" "$ZSH_DIR" "$LOG_DIR"
HISTFILE="$ZSH_DIR/histfile" HISTFILE="$ZSH_DIR/histfile"
HISTSIZE=999999 HISTSIZE=999999
@ -43,14 +44,9 @@ zstyle ':compinstall' filename "$HOME/.zshrc"
# Load antigen & plugins # Load antigen & plugins
antigen_src="$ZSH_DIR/antigen.zsh" antigen_src="$ADOTDIR/antigen.zsh"
if [ ! -f "$antigen_src" ]; then if [ ! -f "$antigen_src" ]; then
if exists curl; then git clone https://github.com/zsh-users/antigen.git "$ADOTDIR"
getcmd='curl -L'
else
getcmd='wget -qO-'
fi
eval $getcmd git.io/antigen > "$antigen_src"
fi fi
source "$antigen_src" source "$antigen_src"