diff options
author | Franck Cuny <franckcuny@gmail.com> | 2016-02-12 20:58:37 -0800 |
---|---|---|
committer | Franck Cuny <franckcuny@gmail.com> | 2016-02-12 20:58:37 -0800 |
commit | 5f2b301a8df5410962519d2b7e9a977b03e75977 (patch) | |
tree | da73920a1109c0820cdf3a3e2902087c95f3b3a7 | |
parent | [emacs] Move some packages to a new config file. (diff) | |
download | emacs.d-5f2b301a8df5410962519d2b7e9a977b03e75977.tar.gz |
[emacs] Split the config into 'core' and 'modes'.
Separate the modules that are 'core' (e.g.: related to editing, manipulating text, and so on) and the 'modes' (e.g.: related to syntax, langage support, etc).
-rw-r--r-- | emacs.d/core/core-autocompletion.el | 7 | ||||
-rw-r--r-- | emacs.d/core/core-bindings.el (renamed from emacs.d/inits/00_bindings.el) | 7 | ||||
-rw-r--r-- | emacs.d/core/core-default.el (renamed from emacs.d/inits/00_defaults.el) | 4 | ||||
-rw-r--r-- | emacs.d/core/core-defun.el (renamed from emacs.d/inits/10_defun.el) | 2 | ||||
-rw-r--r-- | emacs.d/core/core-editor.el (renamed from emacs.d/inits/50_development.el) | 50 | ||||
-rw-r--r-- | emacs.d/core/core-flycheck.el (renamed from emacs.d/inits/50_flycheck.el) | 2 | ||||
-rw-r--r-- | emacs.d/core/core-flyspell.el (renamed from emacs.d/inits/50_flyspell.el) | 2 | ||||
-rw-r--r-- | emacs.d/core/core-git.el | 24 | ||||
-rw-r--r-- | emacs.d/core/core-load-paths.el | 12 | ||||
-rw-r--r-- | emacs.d/core/core-modes.el | 7 | ||||
-rw-r--r-- | emacs.d/core/core-ui.el (renamed from emacs.d/inits/00_ui.el) | 15 | ||||
-rw-r--r-- | emacs.d/init.el | 6 | ||||
-rw-r--r-- | emacs.d/inits/10_editor.el | 10 | ||||
-rw-r--r-- | emacs.d/inits/20_helm.el | 5 | ||||
-rw-r--r-- | emacs.d/inits/20_ivy.el | 12 | ||||
-rw-r--r-- | emacs.d/inits/50_git.el | 10 | ||||
-rw-r--r-- | emacs.d/inits/90_lang-haskell.el | 22 | ||||
-rw-r--r-- | emacs.d/inits/90_mustache.el | 4 | ||||
-rw-r--r-- | emacs.d/modes/cfg-puppet.el (renamed from emacs.d/inits/90_puppet.el) | 2 | ||||
-rw-r--r-- | emacs.d/modes/cfg-thrift.el (renamed from emacs.d/inits/90_thrift.el) | 2 | ||||
-rw-r--r-- | emacs.d/modes/cfg-yaml.el (renamed from emacs.d/inits/90_yaml.el) | 2 | ||||
-rw-r--r-- | emacs.d/modes/lang-c.el (renamed from emacs.d/inits/90_lang-c.el) | 2 | ||||
-rw-r--r-- | emacs.d/modes/lang-go.el (renamed from emacs.d/inits/90_lang-go.el) | 20 | ||||
-rw-r--r-- | emacs.d/modes/lang-markdown.el (renamed from emacs.d/inits/90_markdown.el) | 1 | ||||
-rw-r--r-- | emacs.d/modes/lang-python.el (renamed from emacs.d/inits/90_lang-python.el) | 2 | ||||
-rw-r--r-- | emacs.d/modes/lang-scheme.el | 6 | ||||
-rw-r--r-- | emacs.d/modes/lang-shell.el (renamed from emacs.d/inits/90_shell.el) | 0 |
27 files changed, 128 insertions, 110 deletions
diff --git a/emacs.d/core/core-autocompletion.el b/emacs.d/core/core-autocompletion.el new file mode 100644 index 0000000..724ccf3 --- /dev/null +++ b/emacs.d/core/core-autocompletion.el @@ -0,0 +1,7 @@ +(use-package company + :ensure t + :config + (progn + (add-hook 'prog-mode-hook 'company-mode))) + +(provide 'core-autocompletion) diff --git a/emacs.d/inits/00_bindings.el b/emacs.d/core/core-bindings.el index ded7005..e95e837 100644 --- a/emacs.d/inits/00_bindings.el +++ b/emacs.d/core/core-bindings.el @@ -1,4 +1,9 @@ -;;; some bindings (global-set-key (kbd "M-j") 'join-line) + (global-set-key (kbd "C-x C-b") 'ivy-switch-buffer) + (global-set-key (kbd "<s-return>") 'toggle-frame-fullscreen) + +(global-set-key (kbd "C-c C-d") 'fcuny-terminal) + +(provide 'core-bindings) diff --git a/emacs.d/inits/00_defaults.el b/emacs.d/core/core-default.el index 26ec0bb..a3076eb 100644 --- a/emacs.d/inits/00_defaults.el +++ b/emacs.d/core/core-default.el @@ -23,3 +23,7 @@ (setq tab-always-indent 'complete) (global-auto-revert-mode 1) + +(setq-default indent-tabs-mode nil) + +(provide 'core-default) diff --git a/emacs.d/inits/10_defun.el b/emacs.d/core/core-defun.el index 233f771..deb315b 100644 --- a/emacs.d/inits/10_defun.el +++ b/emacs.d/core/core-defun.el @@ -5,3 +5,5 @@ (switch-to-buffer "*ansi-term*") (ansi-term "/bin/bash")) (get-buffer-process "*ansi-term*")) + +(provide 'core-defun) diff --git a/emacs.d/inits/50_development.el b/emacs.d/core/core-editor.el index a746355..c8740db 100644 --- a/emacs.d/inits/50_development.el +++ b/emacs.d/core/core-editor.el @@ -1,32 +1,25 @@ -(use-package ag - :ensure t - :defer t) - -(use-package goto-chg +(use-package swiper :ensure t - :bind (("C-." . goto-last-change) - ("C-," . goto-last-change-reverse))) + :bind ( + ("C-s" . swiper)) + :config + (setq ivy-use-virtual-buffers t) + (ivy-mode)) -(use-package projectile +(use-package counsel :ensure t - :init - (setq projectile-enable-caching t) - (setq projectile-completion-system 'ivy) :config - (projectile-global-mode)) + (setq counsel-find-file-at-point t)) -(use-package company +(use-package exec-path-from-shell :ensure t :config - (progn - (add-hook 'prog-mode-hook 'company-mode))) + (exec-path-from-shell-initialize) + (exec-path-from-shell-copy-envs '("TMPDIR" "GOPATH"))) -(use-package rainbow-delimiters +(use-package ag :ensure t - :defer t - :init - (progn - (add-hook 'emacs-lisp-mode-hook #'rainbow-delimiters-mode))) + :defer t) (use-package smartparens :ensure t @@ -58,14 +51,17 @@ ("M-S-<right>" . sp-backward-barf-sexp) ("M-d" . sp-splice-sexp)))) -(use-package gist +(use-package projectile :ensure t - :bind ("C-c g p" . gist-region-or-buffer-private) + :init + (setq projectile-enable-caching t) + (setq projectile-completion-system 'ivy) :config - (setq gist-view-gist t)) + (projectile-global-mode)) -(use-package github-browse-file - :ensure t - :defer t) +(use-package server + :config + (unless (server-running-p) + (server-start))) -(setq-default indent-tabs-mode nil) +(provide 'core-editor) diff --git a/emacs.d/inits/50_flycheck.el b/emacs.d/core/core-flycheck.el index 3d835e3..9c64bb1 100644 --- a/emacs.d/inits/50_flycheck.el +++ b/emacs.d/core/core-flycheck.el @@ -29,3 +29,5 @@ (eval-after-load 'feature-flycheck '(setq-default flycheck-display-errors-function #'flycheck-pos-tip-error-messages))) :ensure t) + +(provide 'core-flycheck) diff --git a/emacs.d/inits/50_flyspell.el b/emacs.d/core/core-flyspell.el index 14887e8..7c61b49 100644 --- a/emacs.d/inits/50_flyspell.el +++ b/emacs.d/core/core-flyspell.el @@ -7,3 +7,5 @@ ispell-list-command "--list") (add-hook 'prog-mode-hook 'flyspell-prog-mode) (add-hook 'text-mode-hook 'turn-on-flyspell))) + +(provide 'core-flyspell) diff --git a/emacs.d/core/core-git.el b/emacs.d/core/core-git.el new file mode 100644 index 0000000..2fa1167 --- /dev/null +++ b/emacs.d/core/core-git.el @@ -0,0 +1,24 @@ +(delete 'Git vc-handled-backends) + +(use-package magit + :ensure t + :bind ("C-x g" . magit-status) + :config + (progn + (setq magit-completing-read-function 'ivy-completing-read) + (setq magit-item-highlight-face 'bold))) + +(use-package gist + :ensure t + :bind ("C-c g p" . gist-region-or-buffer-private) + :config + (setq gist-view-gist t)) + +(use-package github-browse-file + :ensure t + :defer t) + +(provide 'core-git) + + + diff --git a/emacs.d/core/core-load-paths.el b/emacs.d/core/core-load-paths.el new file mode 100644 index 0000000..0dec695 --- /dev/null +++ b/emacs.d/core/core-load-paths.el @@ -0,0 +1,12 @@ +(add-to-list 'load-path (concat user-emacs-directory "core/")) + +(require 'core-default) +(require 'core-ui) +(require 'core-editor) +(require 'core-defun) +(require 'core-git) +(require 'core-flycheck) +(require 'core-flyspell) +(require 'core-autocompletion) +(require 'core-bindings) +(require 'core-modes) diff --git a/emacs.d/core/core-modes.el b/emacs.d/core/core-modes.el new file mode 100644 index 0000000..b994b1e --- /dev/null +++ b/emacs.d/core/core-modes.el @@ -0,0 +1,7 @@ +(defun fcuny/load-layers () + (mapc 'load + (directory-files (concat user-emacs-directory "modes") t "\\.el$"))) + +(fcuny/load-layers) + +(provide 'core-modes) diff --git a/emacs.d/inits/00_ui.el b/emacs.d/core/core-ui.el index 29d900a..ff70ae3 100644 --- a/emacs.d/inits/00_ui.el +++ b/emacs.d/core/core-ui.el @@ -40,10 +40,15 @@ (use-package smart-mode-line :ensure t :config - (use-package smart-mode-line-powerline-theme - :ensure t - :if window-system ; enable only in gui mode - :config - (setq sml/theme 'light)) + (setq sml/theme 'light) (setq rm-whitelist '("")) (sml/setup)) + +(use-package rainbow-delimiters + :ensure t + :defer t + :init + (progn + (add-hook 'emacs-lisp-mode-hook #'rainbow-delimiters-mode))) + +(provide 'core-ui) diff --git a/emacs.d/init.el b/emacs.d/init.el index 3ce0c2b..ddab1ba 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -20,8 +20,4 @@ (setq use-package-minimum-reported-time 0 use-package-verbose t) -(use-package init-loader - :ensure t - :config - (setq init-loader-show-log-after-init t) - (init-loader-load (locate-user-emacs-file "inits"))) +(load-file (concat user-emacs-directory "core/core-load-paths.el")) diff --git a/emacs.d/inits/10_editor.el b/emacs.d/inits/10_editor.el deleted file mode 100644 index af0ee01..0000000 --- a/emacs.d/inits/10_editor.el +++ /dev/null @@ -1,10 +0,0 @@ -(use-package exec-path-from-shell - :ensure t - :config - (exec-path-from-shell-initialize) - (exec-path-from-shell-copy-envs '("TMPDIR" "GOPATH"))) - -(use-package server - :config - (unless (server-running-p) - (server-start))) diff --git a/emacs.d/inits/20_helm.el b/emacs.d/inits/20_helm.el deleted file mode 100644 index 04822a5..0000000 --- a/emacs.d/inits/20_helm.el +++ /dev/null @@ -1,5 +0,0 @@ -(use-package helm - :ensure t) - -(use-package helm-ag - :ensure t) diff --git a/emacs.d/inits/20_ivy.el b/emacs.d/inits/20_ivy.el deleted file mode 100644 index cdd488b..0000000 --- a/emacs.d/inits/20_ivy.el +++ /dev/null @@ -1,12 +0,0 @@ -(use-package swiper - :ensure t - :diminish ivy-mode - :bind ("C-s" . swiper) - :config - (setq ivy-use-virtual-buffers t) - (ivy-mode)) - -(use-package counsel - :ensure t - :config - (setq counsel-find-file-at-point t)) diff --git a/emacs.d/inits/50_git.el b/emacs.d/inits/50_git.el deleted file mode 100644 index 3231df1..0000000 --- a/emacs.d/inits/50_git.el +++ /dev/null @@ -1,10 +0,0 @@ -(delete 'Git vc-handled-backends) - -(use-package magit - :ensure t - :bind ("C-x g" . magit-status) - :config - (progn - (setq magit-completing-read-function 'ivy-completing-read) - (setq magit-item-highlight-face 'bold) - (setenv "GIT_PAGER" ""))) diff --git a/emacs.d/inits/90_lang-haskell.el b/emacs.d/inits/90_lang-haskell.el deleted file mode 100644 index be245f3..0000000 --- a/emacs.d/inits/90_lang-haskell.el +++ /dev/null @@ -1,22 +0,0 @@ -(use-package haskell-mode - :ensure t - :init - (progn - (add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode) - (add-hook 'haskell-mode-hook 'turn-on-haskell-simple-indent) - (add-hook 'haskell-mode-hook 'interactive-haskell-mode) - ) - (setq haskell-stylish-on-save t)) - -(use-package ghc - :ensure t - :config - (add-hook 'haskell-mode-hook 'ghc-init) - :bind (("C-c C-t" . ghc-show-type) - ("C-c t" . ghc-show-type))) - -(use-package hindent - :ensure t - :config - (add-hook 'haskell-mode-hook #'hindent-mode) - (setq hindent-style "gibiansky")) diff --git a/emacs.d/inits/90_mustache.el b/emacs.d/inits/90_mustache.el deleted file mode 100644 index 32e1161..0000000 --- a/emacs.d/inits/90_mustache.el +++ /dev/null @@ -1,4 +0,0 @@ -(use-package mustache-mode - :mode ("\\.\\(alert\\|mustache\\)$" . mustache-mode) - :ensure t - :defer t) diff --git a/emacs.d/inits/90_puppet.el b/emacs.d/modes/cfg-puppet.el index 97b8a67..5c1185a 100644 --- a/emacs.d/inits/90_puppet.el +++ b/emacs.d/modes/cfg-puppet.el @@ -1,3 +1,5 @@ (use-package puppet-mode :ensure t :mode ("\\.pp$" . puppet-mode)) + +(provide 'cfg-puppet) diff --git a/emacs.d/inits/90_thrift.el b/emacs.d/modes/cfg-thrift.el index 3a99429..4f491c2 100644 --- a/emacs.d/inits/90_thrift.el +++ b/emacs.d/modes/cfg-thrift.el @@ -1,3 +1,5 @@ (use-package thrift :ensure t :defer t) + +(provide 'cfg-thrift) diff --git a/emacs.d/inits/90_yaml.el b/emacs.d/modes/cfg-yaml.el index 6758789..7dc74e0 100644 --- a/emacs.d/inits/90_yaml.el +++ b/emacs.d/modes/cfg-yaml.el @@ -1,3 +1,5 @@ (use-package yaml-mode :ensure t :defer t) + +(provide 'cfg-yaml) diff --git a/emacs.d/inits/90_lang-c.el b/emacs.d/modes/lang-c.el index bd4cc7f..9b4f357 100644 --- a/emacs.d/inits/90_lang-c.el +++ b/emacs.d/modes/lang-c.el @@ -4,3 +4,5 @@ :config (progn (setq c-basic-offset 2))) + +(provide 'lang-c) diff --git a/emacs.d/inits/90_lang-go.el b/emacs.d/modes/lang-go.el index b20b467..8d81f2c 100644 --- a/emacs.d/inits/90_lang-go.el +++ b/emacs.d/modes/lang-go.el @@ -1,12 +1,3 @@ -(use-package go-eldoc - :ensure t - :defer t - :init (add-hook 'go-mode-hook 'go-eldoc-setup)) - -(use-package company-go - :ensure t - :defer t) - (use-package go-mode :ensure t :defer t @@ -21,3 +12,14 @@ (go-eldoc-setup) (add-hook 'before-save-hook 'gofmt-before-save) (set (make-local-variable 'company-backends) '(company-go)))))) + +(use-package go-eldoc + :ensure t + :defer t + :init (add-hook 'go-mode-hook 'go-eldoc-setup)) + +(use-package company-go + :ensure t + :defer t) + +(provide 'lang-go) diff --git a/emacs.d/inits/90_markdown.el b/emacs.d/modes/lang-markdown.el index 3ec3ec4..f4f544d 100644 --- a/emacs.d/inits/90_markdown.el +++ b/emacs.d/modes/lang-markdown.el @@ -7,3 +7,4 @@ (when (executable-find preferred-markdown-impl) (setq markdown-command preferred-markdown-impl))))) +(provide 'lang-markdown) diff --git a/emacs.d/inits/90_lang-python.el b/emacs.d/modes/lang-python.el index 84fafab..b22ce16 100644 --- a/emacs.d/inits/90_lang-python.el +++ b/emacs.d/modes/lang-python.el @@ -3,3 +3,5 @@ :config (progn (setq python-indent-offset 2))) + +(provide 'lang-python) diff --git a/emacs.d/modes/lang-scheme.el b/emacs.d/modes/lang-scheme.el new file mode 100644 index 0000000..1f0dec3 --- /dev/null +++ b/emacs.d/modes/lang-scheme.el @@ -0,0 +1,6 @@ +(use-package geiser + :config + (setq geiser-active-implementations '(racket)) + :ensure t) + +(provide 'lang-scheme) diff --git a/emacs.d/inits/90_shell.el b/emacs.d/modes/lang-shell.el index aa3fab5..aa3fab5 100644 --- a/emacs.d/inits/90_shell.el +++ b/emacs.d/modes/lang-shell.el |