wgester/dotfiles
1
0
Fork 0
forked from colonelpanic/dotfiles
Code Pull Requests Activity

Fix custom before and after. Add company-jedi.

Browse Source
This commit is contained in:
Ivan Malison 2015-03-09 15:39:58 -07:00
parent d4dee9e4b1
commit 7740a34871
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dotfiles/emacs.d/init.el
View File

@ -29,9 +29,9 @@
;; ============================================================================= ;; =============================================================================
(defvar machine-custom "~/.emacs.d/this-machine.el") (defvar machine-custom "~/.emacs.d/this-machine.el")
(setq custom-file "~/.emacs.d/custom-after.el") (setq custom-file "~/.emacs.d/custom-before.el")
(setq custom-early-file "~/.emacs.d/custom-before.el") (when (file-exists-p custom-file) (load custom-file))
(when (file-exists-p custom-early-file) (load custom-early-file)) (setq custom-after-file "~/.emacs.d/custom-after.el")
(when (file-exists-p machine-custom) (load machine-custom)) (when (file-exists-p machine-custom) (load machine-custom))
;; ============================================================================= ;; =============================================================================
@ -1463,6 +1463,21 @@ window is active in the perspective."
(interactive) (interactive)
(message "%s" (get-virtual-envs))) (message "%s" (get-virtual-envs)))
(use-package jedi
:commands (jedi:goto-definition jedi-mode)
:config
(progn
(setq jedi:complete-on-dot t)
(setq jedi:install-imenu t)
(setq jedi:imenu-create-index-function 'jedi:create-flat-imenu-index))
:ensure t
:bind (("M-." . jedi:goto-definition)
("M-," . jedi:goto-definition-pop-marker)))
(use-package company-jedi
:commands company-jedi
:ensure t)
(use-package python (use-package python
:commands python-mode :commands python-mode
:mode ("\\.py\\'" . python-mode) :mode ("\\.py\\'" . python-mode)
@ -1474,16 +1489,6 @@ window is active in the perspective."
(fset 'sphinx-class ":class:`~") (fset 'sphinx-class ":class:`~")
:init :init
(progn (progn
(use-package jedi
:commands jedi:goto-definition
:config
(progn
(setq jedi:complete-on-dot t)
(setq jedi:install-imenu t)
(setq jedi:imenu-create-index-function 'jedi:create-flat-imenu-index))
:ensure t
:bind (("M-." . jedi:goto-definition)
("M-," . jedi:goto-definition-pop-marker)))
(use-package pytest (use-package pytest
:ensure t :ensure t
:bind ("C-c t" . pytest-one)) :bind ("C-c t" . pytest-one))
@ -1496,7 +1501,9 @@ window is active in the perspective."
(jedi:setup) (jedi:setup)
(add-virtual-envs-to-jedi-server) (add-virtual-envs-to-jedi-server)
(remove-hook 'completion-at-point-functions (remove-hook 'completion-at-point-functions
'python-completion-complete-at-point 'local)) 'python-completion-complete-at-point 'local)
(add-to-list 'company-backends 'company-jedi)
)
(add-hook 'python-mode-hook #'imalison:python-mode)))) (add-hook 'python-mode-hook #'imalison:python-mode))))
;; ============================================================================= ;; =============================================================================
@ -1846,7 +1853,7 @@ window is active in the perspective."
(put 'narrow-to-region 'disabled nil) (put 'narrow-to-region 'disabled nil)
(put 'narrow-to-page 'disabled nil) (put 'narrow-to-page 'disabled nil)
(when (file-exists-p custom-file) (load custom-file)) (when (file-exists-p custom-after-file) (load custom-after-file))
;; enable to set theme based on time of day. ;; enable to set theme based on time of day.
(run-at-time "00:00" 3600 'set-theme) (run-at-time "00:00" 3600 'set-theme)