dotfiles

commit 62b2740fa8256d9e14a7ebc42d634e6be749ae7d
parent dc90e7286789bb4115ac5e0b0dc0c276ba4d37e9
Author: Yuval Langer <yuval.langer@gmail.com>
Date:   Sat,  2 Jul 2016 19:26:15 +0300

Add emacs, update neovim, update bash

Diffstat:
M
bash/bashrc
 | 
2
+-
A
emacs/emacs
 | 
6
++++++
M
neovim/init.vim
 | 
34
++++++++++++++++++----------------

3 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/bash/bashrc b/bash/bashrc
@@ -115,4 +115,4 @@ if ! shopt -oq posix; then
     . /etc/bash_completion
   fi
 fi
-[ -r /home/yuvallanger/.byobu/prompt ] && . /home/yuvallanger/.byobu/prompt   #byobu-prompt#
+[ -r ~/.byobu/prompt ] && . ~/.byobu/prompt   #byobu-prompt#
diff --git a/emacs/emacs b/emacs/emacs
@@ -0,0 +1,6 @@
+(require 'package)
+(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
+
+(add-to-list 'load-path "~/.emacs.d/evil")
+(require 'evil)
+(evil-mode 1)
diff --git a/neovim/init.vim b/neovim/init.vim
@@ -1,5 +1,7 @@
 call plug#begin('~/.config/nvim/plugged')
 
+Plug 'jceb/vim-orgmode'
+
 Plug 'junegunn/seoul256.vim'
 Plug 'junegunn/vim-easy-align'
 
@@ -8,7 +10,7 @@ Plug 'easymotion/vim-easymotion'
 Plug 'chrisbra/NrrwRgn'
 Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-commentary'
-Plug 'davidhalter/jedi-vim'
+" Plug 'davidhalter/jedi-vim'
 
 " Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
 " Plug 'scrooloose/syntastic'
@@ -21,12 +23,12 @@ Plug 'dannyob/quickfixstatus'
 
 Plug 'benekastah/neomake'
 
-Plug 'eagletmt/neco-ghc'
-Plug 'eagletmt/ghcmod-vim'
-" Plug 'bitc/vim-hdevtools' " , { 'for': 'hs' }
-Plug 'lukerandall/haskellmode-vim' " , { 'for': 'hs' }
-Plug 'Shougo/vimproc'
-Plug 'dan-t/vim-hsimport'
+Plug 'eagletmt/neco-ghc', { 'for': 'hs' }
+Plug 'eagletmt/ghcmod-vim', { 'for': 'hs' }
+Plug 'bitc/vim-hdevtools', { 'for': 'hs' }
+Plug 'lukerandall/haskellmode-vim', { 'for': 'hs' }
+Plug 'Shougo/vimproc', { 'for': 'hs' }
+Plug 'dan-t/vim-hsimport', { 'for': 'hs' }
 
 Plug 'majutsushi/tagbar'
 
@@ -46,7 +48,7 @@ call plug#end()
 syntax on
 filetype plugin on
 
-autocmd! BufWritePost * Neomake
+"autocmd! BufWritePost * Neomake
 
 let g:haddock_browser = "firefox"
 
@@ -68,12 +70,12 @@ smap <C-k>     <Plug>(neosnippet_expand_or_jump)
 xmap <C-k>     <Plug>(neosnippet_expand_target)
 
 " SuperTab like snippets behavior.
-imap <expr><TAB> neosnippet#expandable_or_jumpable() ?
-\ "\<Plug>(neosnippet_expand_or_jump)"
-\: pumvisible() ? "\<C-n>" : "\<TAB>"
-smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
-\ "\<Plug>(neosnippet_expand_or_jump)"
-\: "\<TAB>"
+"imap <expr><TAB> neosnippet#expandable_or_jumpable() ?
+"\ "\<Plug>(neosnippet_expand_or_jump)"
+"\: pumvisible() ? "\<C-n>" : "\<TAB>"
+"smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
+"\ "\<Plug>(neosnippet_expand_or_jump)"
+"\: "\<TAB>"
 
 " For conceal markers.
 if has('conceal')
@@ -100,7 +102,7 @@ let g:necoghc_enable_detailed_browse = 1
 " " set softtabstop=4
 " set shiftwidth=4
 " set shiftround
-set noexpandtab
+"set noexpandtab
 
 autocmd FileType cabal setlocal softtabstop=4 shiftwidth=4 tabstop=4 expandtab
-autocmd FileType haskell setlocal tabstop=2 shiftwidth=2 softtabstop=2 expandtab
+autocmd FileType haskell setlocal tabstop=2 shiftwidth=2 softtabstop=2 expandtab formatprg=stylish-haskell\ -c\ ~/.stylish-haskell.conf