From eaba6069bb21ed5d332b76571f60b1b94ea22615 Mon Sep 17 00:00:00 2001
From: nkoehring <n@koehr.in>
Date: Fri, 26 Feb 2016 02:26:05 +0100
Subject: [PATCH] updated xinitrc and neovim

---
 dot.xinitrc                   | 26 +++++++++-----------------
 neovim/autoload/plug.vim      |  1 +
 dot.nvimrc => neovim/init.vim | 26 +++++++++++++-------------
 3 files changed, 23 insertions(+), 30 deletions(-)
 create mode 120000 neovim/autoload/plug.vim
 rename dot.nvimrc => neovim/init.vim (67%)

diff --git a/dot.xinitrc b/dot.xinitrc
index 7895d9a..c444f9b 100644
--- a/dot.xinitrc
+++ b/dot.xinitrc
@@ -1,27 +1,19 @@
 setxkbmap de
 xset -b
 
-# synaptics touchpad (order is important here)
 synclient RightButtonAreaLeft=4501
 synclient RightButtonAreaRight=0
 synclient RightButtonAreaTop=4100
 synclient RightButtonAreaBottom=0
-synclient MiddleButtonAreaRight=4500
 synclient MiddleButtonAreaLeft=2500
-synclient MiddleButtonAreaTop=4100
+synclient MiddleButtonAreaRight=4500
+synclient MiddleButtonAreaTop=410
 synclient MiddleButtonAreaBottom=0
-xinput set-prop "SynPS/2 Synaptics TouchPad" "Device Accel Profile" 2
-xinput set-prop "SynPS/2 Synaptics TouchPad" "Device Accel Constant Deceleration" 4
-xinput set-prop "SynPS/2 Synaptics TouchPad" "Device Accel Adaptive Deceleration" 4
-xinput set-prop "SynPS/2 Synaptics TouchPad" "Device Accel Velocity Scaling" 8
-
-# syndaemon (disable touchpad while typing)
-syndaemon -Rtki 1 &
-
-# no eyestrain please
-xflux -l 52.3 -g 13.3 -r 1
-
-# sound
-#exec start-pulseaudio-x11
 
-exec herbstluftwm
+syndaemon -Rtki 1 &       # disable touchpad while typing
+redshift -l 52.3:13.3 &   # no eyestrain please
+[ -x ~/.fehbg ] && ~/.fehbg
+compton --config ~/.config/comptonrc -b
+exec sxhkd &              # shortcuts
+exec panel &              # panel
+exec bspwm
diff --git a/neovim/autoload/plug.vim b/neovim/autoload/plug.vim
new file mode 120000
index 0000000..b21786e
--- /dev/null
+++ b/neovim/autoload/plug.vim
@@ -0,0 +1 @@
+/home/nk/src/pkg/vim-plug/plug.vim
\ No newline at end of file
diff --git a/dot.nvimrc b/neovim/init.vim
similarity index 67%
rename from dot.nvimrc
rename to neovim/init.vim
index a8f0791..40cd95c 100644
--- a/dot.nvimrc
+++ b/neovim/init.vim
@@ -1,18 +1,15 @@
-call plug#begin('~/.nvim/plugged')
+call plug#begin('~/.config/nvim/plugged')
 
-Plug 'kchmck/vim-coffee-script'
-Plug 'tpope/vim-haml'
 Plug 'tpope/vim-speeddating'
 Plug 'kien/ctrlp.vim'
 Plug 'spolu/dwm.vim'
 Plug 'mileszs/ack.vim'
-Plug 'sunaku/xoria256.vim'
 Plug 'mattn/emmet-vim'
-Plug 'digitaltoad/vim-jade'
-Plug 'wavded/vim-stylus'
-Plug 'wting/rust.vim'
-Plug 'farseer90718/vim-taskwarrior'
+Plug 'scrooloose/syntastic'
 Plug 'majutsushi/tagbar'
+Plug 'freitass/todo.txt-vim'
+Plug 'jnurmine/zenburn'
+Plug 'sheerun/vim-polyglot'
 
 call plug#end()
 
@@ -25,12 +22,14 @@ let g:tagbar_indent = 2
 let g:tagbar_show_linenumbers = 1
 let g:tagbar_iconchars = ['►', '▼']
 let g:ackprg = 'ag --nogroup --nocolor --column'
-colorscheme xoria256
+let mapleader=' '
+let maplocalleader=' '
+colorscheme zenburn
 
 set expandtab
-set shiftwidth=4
-set tabstop=4
-set softtabstop=4
+set shiftwidth=2
+set tabstop=2
+set softtabstop=2
 set encoding=utf-8
 set textwidth=79
 set colorcolumn=80
@@ -39,5 +38,6 @@ set laststatus=2
 set number
 set wildmenu
 set wildmode=list:longest,full
+set hlsearch
 "set cryptmethod=blowfish
-set t_Co=256
+"set t_Co=256