|  | @@ -133,14 +133,15 @@
 | 
											
												
													
														|  |  	evil-tabs
 |  |  	evil-tabs
 | 
											
												
													
														|  |  	powerline-evil
 |  |  	powerline-evil
 | 
											
												
													
														|  |  	monokai-theme
 |  |  	monokai-theme
 | 
											
												
													
														|  | -	auto-complete
 |  | 
 | 
											
												
													
														|  | 
 |  | +	;auto-complete
 | 
											
												
													
														|  |  	linum-relative
 |  |  	linum-relative
 | 
											
												
													
														|  |  	multi-term
 |  |  	multi-term
 | 
											
												
													
														|  |  	neotree
 |  |  	neotree
 | 
											
												
													
														|  |  	evil-numbers
 |  |  	evil-numbers
 | 
											
												
													
														|  |  	editorconfig
 |  |  	editorconfig
 | 
											
												
													
														|  |  	company
 |  |  	company
 | 
											
												
													
														|  | -	helm
 |  | 
 | 
											
												
													
														|  | 
 |  | +	;helm
 | 
											
												
													
														|  | 
 |  | +	ivy
 | 
											
												
													
														|  |  	))
 |  |  	))
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  ;; List of optional packages
 |  |  ;; List of optional packages
 | 
											
										
											
												
													
														|  | @@ -151,7 +152,7 @@
 | 
											
												
													
														|  |  	latex-preview-pane
 |  |  	latex-preview-pane
 | 
											
												
													
														|  |  	tide
 |  |  	tide
 | 
											
												
													
														|  |  	web-mode
 |  |  	web-mode
 | 
											
												
													
														|  | -	ac-html
 |  | 
 | 
											
												
													
														|  | 
 |  | +	;ac-html
 | 
											
												
													
														|  |  	racket-mode
 |  |  	racket-mode
 | 
											
												
													
														|  |  	fuzzy
 |  |  	fuzzy
 | 
											
												
													
														|  |  	general))
 |  |  	general))
 | 
											
										
											
												
													
														|  | @@ -340,7 +341,8 @@
 | 
											
												
													
														|  |   "m" 'recentf-open-files
 |  |   "m" 'recentf-open-files
 | 
											
												
													
														|  |   "l" 'auto-fill-mode
 |  |   "l" 'auto-fill-mode
 | 
											
												
													
														|  |   "s" '(lambda () (interactive) (if flyspell-mode (funcall 'flyspell-mode '0) (flyspell-mode) (flyspell-buffer)))
 |  |   "s" '(lambda () (interactive) (if flyspell-mode (funcall 'flyspell-mode '0) (flyspell-mode) (flyspell-buffer)))
 | 
											
												
													
														|  | - "a" 'auto-complete-mode
 |  | 
 | 
											
												
													
														|  | 
 |  | + ;"a" 'auto-complete-mode
 | 
											
												
													
														|  | 
 |  | + "a" 'company-mode
 | 
											
												
													
														|  |   "g" 'magit-status
 |  |   "g" 'magit-status
 | 
											
												
													
														|  |   "M-g" 'magit-dispatch-popup
 |  |   "M-g" 'magit-dispatch-popup
 | 
											
												
													
														|  |   )
 |  |   )
 | 
											
										
											
												
													
														|  | @@ -383,20 +385,24 @@
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  ;;helm
 |  |  ;;helm
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -(require 'helm-config)
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -(global-set-key (kbd "M-x") #'helm-M-x)
 |  | 
 | 
											
												
													
														|  | -(global-set-key (kbd "C-x r b") #'helm-filtered-bookmarks)
 |  | 
 | 
											
												
													
														|  | -(global-set-key (kbd "C-x C-f") #'helm-find-files)
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -(helm-mode 1)
 |  | 
 | 
											
												
													
														|  | -(define-key helm-find-files-map "\t" 'helm-execute-persistent-action) ; make TAB run C-j's command.
 |  | 
 | 
											
												
													
														|  | 
 |  | +;; (require 'helm-config)
 | 
											
												
													
														|  | 
 |  | +;; 
 | 
											
												
													
														|  | 
 |  | +;; (global-set-key (kbd "M-x") #'helm-M-x)
 | 
											
												
													
														|  | 
 |  | +;; (global-set-key (kbd "C-x r b") #'helm-filtered-bookmarks)
 | 
											
												
													
														|  | 
 |  | +;; (global-set-key (kbd "C-x C-f") #'helm-find-files)
 | 
											
												
													
														|  | 
 |  | +;; 
 | 
											
												
													
														|  | 
 |  | +;; (helm-mode 1)
 | 
											
												
													
														|  | 
 |  | +;; (define-key helm-find-files-map "\t" 'helm-execute-persistent-action) ; make TAB run C-j's command.
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  ;; ac-helm
 |  |  ;; ac-helm
 | 
											
												
													
														|  |  ;(require 'ac-helm)  ;; Not necessary if using ELPA package
 |  |  ;(require 'ac-helm)  ;; Not necessary if using ELPA package
 | 
											
												
													
														|  |  ;;(global-set-key (kbd "C-:") 'ac-complete-with-helm)
 |  |  ;;(global-set-key (kbd "C-:") 'ac-complete-with-helm)
 | 
											
												
													
														|  |  ;(define-key ac-complete-mode-map (kbd "<tab>") 'ac-complete-with-helm)
 |  |  ;(define-key ac-complete-mode-map (kbd "<tab>") 'ac-complete-with-helm)
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +;; ivy
 | 
											
												
													
														|  | 
 |  | +(require 'ivy)
 | 
											
												
													
														|  | 
 |  | +(ivy-mode)
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |  ;; company
 |  |  ;; company
 | 
											
												
													
														|  |  (require 'company)
 |  |  (require 'company)
 | 
											
												
													
														|  |  (add-hook 'after-init-hook 'global-company-mode)
 |  |  (add-hook 'after-init-hook 'global-company-mode)
 |