From a00586b6e72012a87c829e3b287ada51e963d251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Tue, 5 Apr 2016 17:54:16 +0200 Subject: [PATCH] Update init and custom files. --- .emacs.d/custom.el | 7 +++++-- .emacs.d/init.el | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index 3dfb2cc..ff1b1a4 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -3,12 +3,14 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. + '(flycheck-gcc-args (quote (""))) '(package-selected-packages (quote - (nlinum solarized-theme helm-flycheck helm-flyspell yaml-mode web-mode sr-speedbar sokoban smart-compile pythonic python-mode powerline poker php-mode openwith markdown-mode magit json-mode js-comint jedi javadoc-lookup java-snippets java-imports hydandata-light-theme helm-spotify helm-package helm-ls-git helm-bibtex flycheck-pos-tip flycheck-color-mode-line fish-mode diffview cython-mode company-web company-math company-jedi company-dict company-c-headers company-auctex ac-octave ac-math ac-c-headers 2048-game))) + (abyss-theme helm-projectile projectile ggtags ssh nlinum solarized-theme helm-flycheck helm-flyspell yaml-mode web-mode sr-speedbar sokoban smart-compile pythonic python-mode powerline poker php-mode openwith markdown-mode magit json-mode js-comint jedi javadoc-lookup java-snippets java-imports hydandata-light-theme helm-spotify helm-package helm-ls-git helm-bibtex flycheck-pos-tip flycheck-color-mode-line fish-mode diffview cython-mode company-web company-math company-jedi company-dict company-c-headers company-auctex ac-octave ac-math ac-c-headers 2048-game))) '(safe-local-variable-values (quote - ((company-clang-arguments + ((company-clang-arguments "-std=c++14" "-I/home/mcapelle/Dev/cpp/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/" "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include") + (company-clang-arguments ("-std=c++14" "-I/home/mcapelle/Dev/cpp/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/")) (company-clang-arguments . clang-args) (eval setq clang-args @@ -35,4 +37,5 @@ '(flycheck-fringe-error ((t (:inherit font-lock-warning-face :background "firebrick" :foreground "white")))) '(flycheck-fringe-warning ((t (:inherit warning)))) '(linum ((t (:inherit fringe :background "white" :foreground "gray")))) + '(whitespace-line ((t (:background "lightgray" :foreground "dark violet" :init font-lock-warning-face)))) '(whitespace-space ((t (:background "white" :foreground "gray"))))) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 3287f0d..973284e 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -83,7 +83,10 @@ (global-set-key (kbd "C-x r b") 'helm-filtered-bookmarks) (global-set-key (kbd "C-x C-f") 'helm-find-files) (global-set-key (kbd "C-x C-b") 'helm-buffers-list) - (helm-mode 1)) + (helm-mode 1) + (projectile-global-mode) + (setq projectile-completion-system 'helm) + (helm-projectile-on)) (use-package yasnippet :config @@ -185,7 +188,8 @@ :mode "\\.text\\'" "\\.markdown\\'" "\\.md\\'") ;; White space mode -(setq whitespace-line-column 100) +(setq-default fill-column 95) +(setq whitespace-line-column 95) (add-hook 'before-save-hook 'whitespace-cleanup) @@ -193,6 +197,8 @@ (add-hook 'LaTeX-mode-hook (lambda () (setq whitespace-line-column -1))) (global-whitespace-mode 1) +(add-hook 'web-mode-hook 'turn-on-auto-fill) +(add-hook 'LaTeX-mode-hook 'turn-on-auto-fill) ;; Electric pair mode (electric-pair-mode 1) @@ -291,5 +297,9 @@ (setq python-indent-offset 4) :mode "\\.pyx\\'") +;; Web mode +(add-to-list 'auto-mode-alist '("\\.ctp\\'" . web-mode)) + + (setq custom-file "~/.emacs.d/custom.el") (load custom-file)