Merge branch 'master' of git.barakmich.com:barak/dotfiles

.emacs.d/Cask

@@ -4,12 +4,21 @@
 (source org)
 
 (depends-on "ack-and-a-half")
+(depends-on "auto-complete")
+(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 "exec-path-from-shell")
 (depends-on "flx-ido")
 (depends-on "flycheck")
+(depends-on "go-autocomplete")
+(depends-on "go-mode")
+(depends-on "jedi")
 (depends-on "magit")
 (depends-on "pallet")
 (depends-on "projectile")

.emacs.d/init.el

@@ -22,9 +22,9 @@
 ;; Root directory
 (setq root-dir (file-name-directory
                 (or (buffer-file-name) load-file-name)))
+(setq make-backup-files nil)
 
 (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")
-
 ;; Don't show startup screen
 (let ((background-color "#2F2F2F")
       (foreground-color "LightGrey")
@@ -56,6 +56,11 @@
 (evil-mode 1)
 (setq evil-default-cursor t) 
 
+;; Jedi.el
+(add-hook 'python-mode-hook 'jedi:setup)
+(setq jedi:setup-keys t)                      ; optional
+(setq jedi:complete-on-dot t)                 ; optional
+
 ;; Git
 (require 'magit)
 (eval-after-load 'magit
@@ -72,6 +77,24 @@
 (require 'projectile)
 (projectile-global-mode)
 
+; Autocomplete
+(require 'auto-complete-config)
+(ac-config-default)
+(setq ac-dwim t)
+(setq ac-expand-on-auto-complete nil)
+(setq ac-use-fuzzy t) 
+(setq ac-auto-start t) 
+(define-key ac-completing-map (kbd "<escape>") 'ac-stop)
+
+Company-mode autocomplete
+(require 'company)                                   ; load company mode
+(require 'company-go)                                ; load company mode go backend
+(setq company-tooltip-limit 20)                      ; bigger popup window
+(setq company-minimum-prefix-length 0)               ; autocomplete right after '.'
+(setq company-idle-delay .3)                         ; shorter delay before autocompletion popup
+(setq company-echo-delay 0)                          ; removes annoying blinking
+(setq company-begin-commands '(self-insert-command)) ; start autocompletion only after typing
+
 ;; Snippets
 ;; https://github.com/capitaomorte/yasnippet
 (require 'yasnippet)
@@ -81,8 +104,19 @@
 ;; Evil Key Defines
 (define-key evil-normal-state-map "gc" 'kill-buffer-and-window)
 
-(load-theme 'barak)
+(load-theme 'barak t)
+
+
+
  
+;;  _                                      
+;; | |__ _ _ _  __ _ _  _ __ _ __ _ ___ ___
+;; | / _` | ' \/ _` | || / _` / _` / -_|_-<
+;; |_\__,_|_||_\__, |\_,_\__,_\__, \___/__/
+;;             |___/          |___/        
+(add-hook 'go-mode-hook (lambda ()
+                          (set (make-local-variable 'company-backends) '(company-go))
+                          (company-mode)))
   
 
 

.gitmodules

@@ -31,9 +31,6 @@
 [submodule ".vim/bundle/EasyGrep"]
 	path = .vim/bundle/EasyGrep
 	url = https://github.com/vim-scripts/EasyGrep.git
-[submodule ".vim/bundle/snipmate"]
-	path = .vim/bundle/snipmate
-	url = git://github.com/msanders/snipmate.vim.git
 [submodule ".vim/bundle/syntastic"]
 	path = .vim/bundle/syntastic
 	url = https://github.com/scrooloose/syntastic.git
@@ -79,3 +76,18 @@
 [submodule ".vim/bundle/tagbar"]
 	path = .vim/bundle/tagbar
 	url = git://github.com/majutsushi/tagbar
+[submodule ".vim/bundle/delimitMate"]
+	path = .vim/bundle/delimitMate
+	url = https://github.com/Raimondi/delimitMate/
+[submodule ".vim/bundle/neco-ghc"]
+	path = .vim/bundle/neco-ghc
+	url = http://github.com/eagletmt/neco-ghc
+[submodule ".vim/bundle/ghcmod-vim"]
+	path = .vim/bundle/ghcmod-vim
+	url = https://github.com/eagletmt/ghcmod-vim
+[submodule ".vim/bundle/vimproc"]
+	path = .vim/bundle/vimproc
+	url = https://github.com/Shougo/vimproc.vim.git
+[submodule ".vim/bundle/ultisnips"]
+	path = .vim/bundle/ultisnips
+	url = https://github.com/SirVer/ultisnips

.vim/after/ftplugin/haskell.vim

@@ -0,0 +1,2 @@
+setlocal omnifunc=necoghc#omnifunc
+let g:ycm_key_invoke_completion = '<Leader><TAB>'

.vim/bundle/delimitMate

@@ -0,0 +1 @@
+Subproject commit 35280c1444bf62d651f56ccaf03ad8db29c02383

.vim/bundle/ghcmod-vim

@@ -0,0 +1 @@
+Subproject commit 788b193dbeb1bebe303b0d0c6b17c09fdd1ebabb

.vim/bundle/neco-ghc

@@ -0,0 +1 @@
+Subproject commit 41c7160ee129209b758c5a9f0fc196ffeeb866f9

.vim/bundle/snipmate

@@ -1 +0,0 @@
-Subproject commit f5a75d075d3c005ebe69e3f5e56cf99516e8aa3b

.vim/bundle/ultisnips

@@ -0,0 +1 @@
+Subproject commit ae611ccf950a93f93cab64542cbe48029f1e9c02

.vim/bundle/vimproc

@@ -0,0 +1 @@
+Subproject commit 11bd6853b25f73f3729cccbb9282fecade2bf50a

.vim/filetype.vim

@@ -43,6 +43,7 @@ au Filetype html,xml,xsl source ~/.vim/closetag.vim
 
 au BufRead,BufNewFile *.go set filetype=go
 
+au FileType cpp let b:delimitMate_matchpairs = "(:),[:],{:},<:>"
 
 "Settings per filetype
 augroup python

.vim/snippets/c.snippets

@@ -0,0 +1,87 @@
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+
+snippet ifndef "#ifndef ... #define ... #endif" !b
+#ifndef ${1/([A-Za-z0-9_]+).*/$1/}
+#define ${1:SYMBOL} ${2:value}
+#endif
+endsnippet
+
+snippet #if "#if #endif" !b
+#if ${1:0}
+${VISUAL}${0:${VISUAL/(.*)/(?1::code)/}}
+#endif
+endsnippet
+
+snippet main "main() (main)" !
+int main(int argc, char *argv[]) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+  return 0;
+}
+endsnippet
+
+snippet for "for loop (for)" !
+for (${2:i} = 0; $2 < ${1:count}; ${3:++$2}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+
+snippet enum "Enumeration" !
+enum ${1:name} { 
+  $0 
+};
+endsnippet
+
+snippet wh "while loop" !
+while(${1:/* condition */}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet do "do...while loop (do)" !
+do {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+} while(${1:/* condition */});
+endsnippet
+
+snippet if "if .. (if)" !
+if (${1:/* condition */}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet el "else .. (else)" !
+else {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet eli "else if .. (eli)" !
+else if (${1:/* condition */}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet ife "if .. else (ife)" !
+if (${1:/* condition */}) {
+  ${2:/* code */}
+} else {
+  ${3:/* else */}
+}
+endsnippet
+
+snippet st "struct" !
+struct ${1:`!p snip.rv = (snip.basename or "name") + "_t"`} {
+  ${0:/* data */}
+};
+endsnippet
+
+snippet fun "function" b!
+${1:void} ${2:function_name}(${3}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+# vim:ft=snippets:

.vim/snippets/cpp.snippets

@@ -0,0 +1,27 @@
+extends c
+
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+snippet beginend "$1.begin(), $1.end() (beginend)"
+${1:v}${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}begin(), $1${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}end()
+endsnippet
+
+snippet cl "class .. (class)" !
+class ${1:`!p snip.rv = snip.basename or "name"`} {
+ public:
+  ${1/(\w+).*/$1/}(${2:arguments});
+  virtual ~${1/(\w+).*/$1/}();
+
+ private:
+  ${0:/* data */}
+};
+endsnippet
+
+snippet ns "namespace .. (namespace)" !
+namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`} {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}  // namespace $1
+endsnippet
+
+# vim:ft=snippets:

.vimrc

@@ -174,8 +174,14 @@ let g:ConqueTerm_SendVisKey = '<Leader>ss'
 " * YouCompleteMe
 let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
 let g:ycm_confirm_extra_conf = 0
-let g:ycm_add_preview_to_completeopt = 1
+"let g:ycm_add_preview_to_completeopt = 1
-let g:ycm_autoclose_preview_window_after_completion = 1
+"let g:ycm_autoclose_preview_window_after_completion = 1
+
+" * UltiSnips
+let g:UltiSnipsSnippetDirectories=["UltiSnips", "snippets"]
+let g:UltiSnipsExpandTrigger="<Leader>,"
+let g:UltiSnipsJumpForwardTrigger="<Leader>,"
+let g:UltiSnipsJumpBackwardTrigger="<Leader><s-,>"
 
 " * MinBufExplorer
 "let g:miniBufExplMapWindowNavVim = 1
@@ -469,6 +475,7 @@ nnoremap <silent> <Leader>o :CtrlPBuffer<CR>
 "nnoremap <Leader>p  :PTW 
 nnoremap <Leader>p  :LustyJugglePrevious<CR>
 nnoremap <Leader>jd :YcmCompleter GoToDefinitionElseDeclaration<CR>
+nnoremap <Leader>ii :GhcModInfo!<CR>
 
 " ** EXTRA INCLUDES **
 "