Skip to content

Commit

Permalink
Update init.el and dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
mpuels committed Jan 11, 2018
1 parent bc764cd commit 3b0e7bc
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 4 deletions.
6 changes: 5 additions & 1 deletion init.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

;;; This file bootstraps the configuration, which is divided into
;;; a number of other files.
;;; a number of other files. tensorflow_p36

(let ((minver "23.3"))
(when (version<= emacs-version "23.1")
Expand Down Expand Up @@ -62,6 +62,9 @@
(require 'init-hippie-expand)
(require 'init-auto-complete)
;;(require 'init-windows) ;; Interfers with my keyboard shortcuts.
(require 'init-irony)
(require 'init-company-irony)
(require 'init-winner)
(require 'init-sessions)
(require 'init-fonts)
(require 'init-mmm)
Expand Down Expand Up @@ -94,6 +97,7 @@
(require 'init-ruby-mode)
(require 'init-rails)
(require 'init-sql)
(require 'init-latex)

(require 'init-paredit)
(require 'init-lisp)
Expand Down
Binary file added irony/bin/irony-server
Binary file not shown.
10 changes: 10 additions & 0 deletions lisp/init-company-irony.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
(require-package 'company-irony)

(add-hook 'c++-mode-hook 'company-mode)
(add-hook 'c-mode-hook 'company-mode)

(eval-after-load 'company
'(add-to-list 'company-backends 'company-irony))
(setq company-clang-executable "/usr/bin/clang-3.6")

(provide 'init-company-irony)
1 change: 1 addition & 0 deletions lisp/init-flycheck.el
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@

(setq flycheck-display-errors-function #'flycheck-display-error-messages-unless-error-list))

(setq flycheck-c/c++-clang-executable "/usr/bin/clang-3.6")

(provide 'init-flycheck)
9 changes: 9 additions & 0 deletions lisp/init-haskell.el
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
;;; package -- Summary

;;; Commentary:

;;; Code:
(require-package 'haskell-mode)


Expand Down Expand Up @@ -105,4 +110,8 @@
(define-key interactive-haskell-mode-map (kbd "M-P") 'haskell-goto-prev-error))


;; Hasktags
;;(custom-set-variables '(haskell-tags-on-save t))

(provide 'init-haskell)
;;; init-haskell.el ends here
17 changes: 17 additions & 0 deletions lisp/init-irony.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
(require-package 'irony)

(add-hook 'c++-mode-hook 'irony-mode)
(add-hook 'c-mode-hook 'irony-mode)
(add-hook 'objc-mode-hook 'irony-mode)

;; replace the `completion-at-point' and `complete-symbol' bindings in
;; irony-mode's buffers by irony-mode's function
(defun my-irony-mode-hook ()
(define-key irony-mode-map [remap completion-at-point]
'irony-completion-at-point-async)
(define-key irony-mode-map [remap complete-symbol]
'irony-completion-at-point-async))
(add-hook 'irony-mode-hook 'my-irony-mode-hook)
(add-hook 'irony-mode-hook 'irony-cdb-autosetup-compile-options)

(provide 'init-irony)
6 changes: 6 additions & 0 deletions lisp/init-latex.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
(setq TeX-auto-save t)
(setq TeX-parse-self t)
(setq TeX-save-query nil)
(setq TeX-PDF-mode t)

(provide 'init-latex)
8 changes: 5 additions & 3 deletions lisp/init-org.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
(when (< emacs-major-version 24)
(require-package 'org))
(require-package 'org-fstree)
(require-package 'org-bullets)
(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
(add-hook 'org-mode-hook (lambda () (variable-pitch-mode t)))
(when *is-a-mac*
(require-package 'org-mac-link)
(autoload 'org-mac-grab-link "org-mac-link" nil t)
Expand All @@ -22,10 +25,10 @@
(load-library "reftex")
(and (buffer-file-name) (file-exists-p (buffer-file-name))
(progn
;enable auto-revert-mode to update reftex when bibtex file changes on disk
;enable auto-revert-mode to update reftex when bibtex file changes on disk
(global-auto-revert-mode t)
(reftex-parse-all)
;add a custom reftex cite format to insert links
;add a custom reftex cite format to insert links
(reftex-set-cite-format
'((?b . "[[bib:%l]]")
(?n . "[[note:%l]]")
Expand Down Expand Up @@ -232,7 +235,6 @@
(quote ((sequence "TODO(t)" "STARTED(s)" "|" "DONE(d!/!)")
(sequence "WAITING(w@/!)" "SOMEDAY(S)" "|" "CANCELLED(c@/!)"))))


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Org clock
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Expand Down
6 changes: 6 additions & 0 deletions lisp/init-winner.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
;;----------------------------------------------------------------------------
;; Navigate window layouts with "C-c <left>" and "C-c <right>"
;;----------------------------------------------------------------------------
(winner-mode 1)

(provide 'init-winner)

0 comments on commit 3b0e7bc

Please sign in to comment.