From 41f4efe78c4dfee79a5af02d3a5fc8001c1d4716 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Thu, 24 Jul 2014 17:34:44 -0400 Subject: [PATCH 1/4] vimrc --- .tmux.conf | 4 ++-- .vimrc | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.tmux.conf b/.tmux.conf index 8eba866..f51a60a 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -5,8 +5,8 @@ bind-key C-a select-pane -t :.+ bind-key a send-prefix bind-key j select-pane -D bind-key k select-pane -U -#bind-key h select-pane -L -#bind-key l select-pane -R +bind-key h select-pane -L +bind-key l select-pane -R bind-key C-n next-window bind-key C-p previous-window set -g set-titles off diff --git a/.vimrc b/.vimrc index a2e1fb4..2968cae 100644 --- a/.vimrc +++ b/.vimrc @@ -128,6 +128,10 @@ let g:UseGooglePythonSettings = 0 " * Eclim let g:EclimCompletionMethod = 'omnifunc' +" * Syntastic +let g:syntastic_python_flake8_args='--ignore=E111' +" E111 = Spaces should be multiples of 4. I use 2. + " * Configure browser for haskell_doc.vim let g:haddock_browser = "open" let g:haddock_browser_callformat = "%s %s" From bb110cad26e140d0e6ca28f18f6363b0b8358691 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Sun, 27 Jul 2014 14:29:34 -0400 Subject: [PATCH 2/4] add golintc --- .vimrc | 1 + bin/golintc | 3 +++ 2 files changed, 4 insertions(+) create mode 100755 bin/golintc diff --git a/.vimrc b/.vimrc index eda0060..8fe1880 100644 --- a/.vimrc +++ b/.vimrc @@ -168,6 +168,7 @@ let g:EclimCompletionMethod = 'omnifunc' " * Syntastic let g:syntastic_python_flake8_args='--ignore=E111' +let g:syntastic_go_checkers=['go', 'govet', 'golintc'] " E111 = Spaces should be multiples of 4. I use 2. " * Configure browser for haskell_doc.vim diff --git a/bin/golintc b/bin/golintc new file mode 100755 index 0000000..1efa0a1 --- /dev/null +++ b/bin/golintc @@ -0,0 +1,3 @@ +#!/bin/bash + +golint "$@" | grep -v "should have comment or be unexported" From 9e4a4a3c22c922aa22b3cf2c3795778fb3cf67d8 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Sun, 27 Jul 2014 14:30:39 -0400 Subject: [PATCH 3/4] fix vimrc --- .vim/filetype.vim | 17 +++++++++-------- .vimrc | 15 ++++++++++----- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.vim/filetype.vim b/.vim/filetype.vim index 5269fb1..28530e1 100644 --- a/.vim/filetype.vim +++ b/.vim/filetype.vim @@ -29,14 +29,15 @@ augroup END au! BufNewFile,BufRead *.pde setf arduino -"augroup org - "" leave these as is: - "au! BufRead,BufWrite,BufWritePost,BufNewFile *.org - "au BufRead,BufNewFile *.org call org#SetOrgFileType() - "au BufRead *.org :PreLoadTags - "au BufWrite *.org :PreWriteTags - "au BufWritePost *.org :PostWriteTags -"augroup END +augroup org + " leave these as is: + au! BufRead,BufWrite,BufWritePost,BufNewFile *.org + au BufRead,BufNewFile *.org call org#SetOrgFileType() + au BufRead,BufNewFile *.org :GitGutterDisable + au BufRead *.org :PreLoadTags + au BufWrite *.org :PreWriteTags + au BufWritePost *.org :PostWriteTags +augroup END au BufNewFile,BufRead motd.public,/tmp/motd.public.r.* setf motd diff --git a/.vimrc b/.vimrc index bce6364..486dc05 100644 --- a/.vimrc +++ b/.vimrc @@ -24,6 +24,7 @@ set expandtab " I like comma instead of slash, but that probably comes from playing " Nethack and Angband let mapleader = "," +let maplocalleader = "\\" " Set 'smart' things in Vim " Search case insensitive, unless it contains Uppercase letters @@ -78,10 +79,14 @@ autocmd InsertLeave * if pumvisible() == 0|pclose|endif set rtp+=~/.vim/bundle/Vundle.vim call vundle#begin() +Plugin 'gmarik/Vundle.vim' +Plugin 'conque_2.3' +Plugin 'eclim' Plugin 'vim-scripts/DrawIt' +Plugin 'tpope/vim-speeddating' Plugin 'vim-scripts/EasyGrep' Plugin 'chrisbra/NrrwRgn' -Plugin 'jceb/vim-orgmode' +Plugin 'hsitz/VimOrganizer' Plugin 'mileszs/ack.vim' Plugin 'mattn/calendar-vim' Plugin 'vim-scripts/fish-syntax' @@ -129,13 +134,13 @@ autocmd FileType python set tags+=$HOME/.vim/tags/python.ctags "autocmd FileType python call SuperTabSetCompletionType("") " Set filetype for VimOrganizer -"au! BufRead,BufWrite,BufWritePost,BufNewFile *.org -"au BufEnter *.org call org#SetOrgFileType() +au! BufRead,BufWrite,BufWritePost,BufNewFile *.org +au BufEnter *.org call org#SetOrgFileType() "au! BufRead,BufWrite,BufWritePost,BufNewFile *.org "au BufEnter *.org call org#SetOrgFileType() -"command! OrgCapture :call org#CaptureBuffer() -"command! OrgCaptureFile :call org#OpenCaptureFile() +command! OrgCapture :call org#CaptureBuffer() +command! OrgCaptureFile :call org#OpenCaptureFile() " Cull trailing whitespace for all files. autocmd BufWritePre * :call AutoTrimWhitespace() From 996e7e2198cd77c42860e1164fec4e03c870054b Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Sat, 9 Aug 2014 01:10:18 -0400 Subject: [PATCH 4/4] more emacs like vim --- .emacs.d/Cask | 9 ++++++--- .emacs.d/init.el | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.emacs.d/Cask b/.emacs.d/Cask index c4eea94..a1ffcea 100644 --- a/.emacs.d/Cask +++ b/.emacs.d/Cask @@ -1,6 +1,6 @@ (source gnu) -(source melpa) (source marmalade) +(source melpa) (source org) (depends-on "ack-and-a-half") @@ -8,21 +8,24 @@ (depends-on "auto-complete-clang") (depends-on "auto-complete-clang-async") (depends-on "cask") - (depends-on "cedit") (depends-on "company-go") (depends-on "elpy") (depends-on "epc") (depends-on "evil") -(depends-on "neotree" :git "https://github.com/jaypei/emacs-neotree") +(depends-on "evil-leader") (depends-on "exec-path-from-shell") (depends-on "flx-ido") (depends-on "flycheck") (depends-on "go-autocomplete") (depends-on "go-mode") +(depends-on "grizzl") (depends-on "jedi") +(depends-on "key-chord") (depends-on "magit") +(depends-on "neotree") (depends-on "pallet") (depends-on "projectile") +(depends-on "tabbar") (depends-on "yasnippet") (depends-on "zenburn-theme") \ No newline at end of file diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 554c9db..524811a 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -52,6 +52,9 @@ (exec-path-from-shell-initialize)) ;; Evil! +(require 'evil-leader) +(global-evil-leader-mode) +(evil-leader/set-leader ",") (require 'evil) (evil-mode 1) (setq evil-default-cursor t) @@ -68,6 +71,7 @@ ;; flx-ido completion system, recommended by Projectile (require 'flx-ido) +(require 'grizzl) (flx-ido-mode 1) ;; change it if you have a fast processor. (setq flx-ido-threshhold 1000) @@ -75,6 +79,7 @@ ;; Project management (require 'ack-and-a-half) (require 'projectile) +(setq projectile-completion-system 'grizzl) (projectile-global-mode) ; Autocomplete @@ -104,8 +109,23 @@ ;; Neotree (require 'neotree) +(require 'key-chord) +(require 'tabbar) ;; Evil Key Defines (define-key evil-normal-state-map "gc" 'kill-buffer-and-window) +(define-key evil-normal-state-map "gn" 'tabbar-forward-tab) +(define-key evil-normal-state-map "gp" 'tabbar-backward-tab) +(define-key evil-normal-state-map (kbd "C-e") 'move-end-of-line) +(define-key evil-normal-state-map (kbd "C-a") 'move-beginning-of-line) +(define-key evil-insert-state-map (kbd "C-e") 'move-end-of-line) +(define-key evil-insert-state-map (kbd "C-a") 'move-beginning-of-line) +;(setq key-chord-two-keys-delay 0.5) +(key-chord-define evil-insert-state-map "jj" 'evil-normal-state) +(key-chord-mode 1) +(evil-leader/set-key + "o" 'projectile-switch-to-buffer + "t" 'projectile-find-file +) (load-theme 'barak t)