From 5f2b301a8df5410962519d2b7e9a977b03e75977 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Fri, 12 Feb 2016 20:58:37 -0800 Subject: [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). --- emacs.d/core/core-autocompletion.el | 7 ++++ emacs.d/core/core-bindings.el | 9 +++++ emacs.d/core/core-default.el | 29 +++++++++++++++ emacs.d/core/core-defun.el | 9 +++++ emacs.d/core/core-editor.el | 67 ++++++++++++++++++++++++++++++++++ emacs.d/core/core-flycheck.el | 33 +++++++++++++++++ emacs.d/core/core-flyspell.el | 11 ++++++ emacs.d/core/core-git.el | 24 +++++++++++++ emacs.d/core/core-load-paths.el | 12 +++++++ emacs.d/core/core-modes.el | 7 ++++ emacs.d/core/core-ui.el | 54 ++++++++++++++++++++++++++++ emacs.d/init.el | 6 +--- emacs.d/inits/00_bindings.el | 4 --- emacs.d/inits/00_defaults.el | 25 ------------- emacs.d/inits/00_ui.el | 49 ------------------------- emacs.d/inits/10_defun.el | 7 ---- emacs.d/inits/10_editor.el | 10 ------ emacs.d/inits/20_helm.el | 5 --- emacs.d/inits/20_ivy.el | 12 ------- emacs.d/inits/50_development.el | 71 ------------------------------------- emacs.d/inits/50_flycheck.el | 31 ---------------- emacs.d/inits/50_flyspell.el | 9 ----- emacs.d/inits/50_git.el | 10 ------ emacs.d/inits/90_lang-c.el | 6 ---- emacs.d/inits/90_lang-go.el | 23 ------------ emacs.d/inits/90_lang-haskell.el | 22 ------------ emacs.d/inits/90_lang-python.el | 5 --- emacs.d/inits/90_markdown.el | 9 ----- emacs.d/inits/90_mustache.el | 4 --- emacs.d/inits/90_puppet.el | 3 -- emacs.d/inits/90_shell.el | 3 -- emacs.d/inits/90_thrift.el | 3 -- emacs.d/inits/90_yaml.el | 3 -- emacs.d/modes/cfg-puppet.el | 5 +++ emacs.d/modes/cfg-thrift.el | 5 +++ emacs.d/modes/cfg-yaml.el | 5 +++ emacs.d/modes/lang-c.el | 8 +++++ emacs.d/modes/lang-go.el | 25 +++++++++++++ emacs.d/modes/lang-markdown.el | 10 ++++++ emacs.d/modes/lang-python.el | 7 ++++ emacs.d/modes/lang-scheme.el | 6 ++++ emacs.d/modes/lang-shell.el | 3 ++ 42 files changed, 337 insertions(+), 319 deletions(-) create mode 100644 emacs.d/core/core-autocompletion.el create mode 100644 emacs.d/core/core-bindings.el create mode 100644 emacs.d/core/core-default.el create mode 100644 emacs.d/core/core-defun.el create mode 100644 emacs.d/core/core-editor.el create mode 100644 emacs.d/core/core-flycheck.el create mode 100644 emacs.d/core/core-flyspell.el create mode 100644 emacs.d/core/core-git.el create mode 100644 emacs.d/core/core-load-paths.el create mode 100644 emacs.d/core/core-modes.el create mode 100644 emacs.d/core/core-ui.el delete mode 100644 emacs.d/inits/00_bindings.el delete mode 100644 emacs.d/inits/00_defaults.el delete mode 100644 emacs.d/inits/00_ui.el delete mode 100644 emacs.d/inits/10_defun.el delete mode 100644 emacs.d/inits/10_editor.el delete mode 100644 emacs.d/inits/20_helm.el delete mode 100644 emacs.d/inits/20_ivy.el delete mode 100644 emacs.d/inits/50_development.el delete mode 100644 emacs.d/inits/50_flycheck.el delete mode 100644 emacs.d/inits/50_flyspell.el delete mode 100644 emacs.d/inits/50_git.el delete mode 100644 emacs.d/inits/90_lang-c.el delete mode 100644 emacs.d/inits/90_lang-go.el delete mode 100644 emacs.d/inits/90_lang-haskell.el delete mode 100644 emacs.d/inits/90_lang-python.el delete mode 100644 emacs.d/inits/90_markdown.el delete mode 100644 emacs.d/inits/90_mustache.el delete mode 100644 emacs.d/inits/90_puppet.el delete mode 100644 emacs.d/inits/90_shell.el delete mode 100644 emacs.d/inits/90_thrift.el delete mode 100644 emacs.d/inits/90_yaml.el create mode 100644 emacs.d/modes/cfg-puppet.el create mode 100644 emacs.d/modes/cfg-thrift.el create mode 100644 emacs.d/modes/cfg-yaml.el create mode 100644 emacs.d/modes/lang-c.el create mode 100644 emacs.d/modes/lang-go.el create mode 100644 emacs.d/modes/lang-markdown.el create mode 100644 emacs.d/modes/lang-python.el create mode 100644 emacs.d/modes/lang-scheme.el create mode 100644 emacs.d/modes/lang-shell.el 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/core/core-bindings.el b/emacs.d/core/core-bindings.el new file mode 100644 index 0000000..e95e837 --- /dev/null +++ b/emacs.d/core/core-bindings.el @@ -0,0 +1,9 @@ +(global-set-key (kbd "M-j") 'join-line) + +(global-set-key (kbd "C-x C-b") 'ivy-switch-buffer) + +(global-set-key (kbd "") 'toggle-frame-fullscreen) + +(global-set-key (kbd "C-c C-d") 'fcuny-terminal) + +(provide 'core-bindings) diff --git a/emacs.d/core/core-default.el b/emacs.d/core/core-default.el new file mode 100644 index 0000000..a3076eb --- /dev/null +++ b/emacs.d/core/core-default.el @@ -0,0 +1,29 @@ +;; alias yes-or-no to y-or-n +(fset 'yes-or-no-p 'y-or-n-p) + +;; set utf-8 as the default encoding +(prefer-coding-system 'utf-8-unix) + +(setq auto-save-default nil) + +(setq auto-save-list-file-prefix nil) + +;; *no* backups +(setq make-backup-files nil) + +;; always add a newline +(setq require-final-newline t) + +;; follow symlinks +(setq vc-follow-symlinks t) + +;; navigation +(setq next-screen-context-lines 5) + +(setq tab-always-indent 'complete) + +(global-auto-revert-mode 1) + +(setq-default indent-tabs-mode nil) + +(provide 'core-default) diff --git a/emacs.d/core/core-defun.el b/emacs.d/core/core-defun.el new file mode 100644 index 0000000..deb315b --- /dev/null +++ b/emacs.d/core/core-defun.el @@ -0,0 +1,9 @@ +(defun fcuny-terminal () + "Switch to terminal. Launch if nonexistent." + (interactive) + (if (get-buffer "*ansi-term*") + (switch-to-buffer "*ansi-term*") + (ansi-term "/bin/bash")) + (get-buffer-process "*ansi-term*")) + +(provide 'core-defun) diff --git a/emacs.d/core/core-editor.el b/emacs.d/core/core-editor.el new file mode 100644 index 0000000..c8740db --- /dev/null +++ b/emacs.d/core/core-editor.el @@ -0,0 +1,67 @@ +(use-package swiper + :ensure t + :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)) + +(use-package exec-path-from-shell + :ensure t + :config + (exec-path-from-shell-initialize) + (exec-path-from-shell-copy-envs '("TMPDIR" "GOPATH"))) + +(use-package ag + :ensure t + :defer t) + +(use-package smartparens + :ensure t + :config + (progn + (require 'smartparens-config) + (smartparens-global-mode 1) + (setq sp-show-pair-delay 0) + (setq sp-autoinsert-if-followed-by-word nil) + (show-smartparens-global-mode t) + (bind-keys :map sp-keymap + ("C-M-d" . sp-down-sexp) + ("C-M-a" . sp-backward-down-sexp) + ("C-S-a" . sp-beginning-of-sexp) + ("C-S-e" . sp-end-of-sexp) + ("C-M-f" . sp-forward-sexp) + ("C-M-b" . sp-backward-sexp) + ("C-M-u" . sp-backward-up-sexp) + ("C-M-t" . sp-transpose-sexp) + ("C-M-n" . sp-next-sexp) + ("C-M-p" . sp-previous-sexp) + ("C-M-k" . sp-kill-sexp) + ("C-M-w" . sp-copy-sexp) + ("M-" . sp-unwrap-sexp) + ("M-". sp-backward-unwrap-sexp) + ("M-" . sp-forward-slurp-sexp) + ("M-" . sp-forward-barf-sexp) + ("M-S-" . sp-backward-slurp-sexp) + ("M-S-" . sp-backward-barf-sexp) + ("M-d" . sp-splice-sexp)))) + +(use-package projectile + :ensure t + :init + (setq projectile-enable-caching t) + (setq projectile-completion-system 'ivy) + :config + (projectile-global-mode)) + +(use-package server + :config + (unless (server-running-p) + (server-start))) + +(provide 'core-editor) diff --git a/emacs.d/core/core-flycheck.el b/emacs.d/core/core-flycheck.el new file mode 100644 index 0000000..9c64bb1 --- /dev/null +++ b/emacs.d/core/core-flycheck.el @@ -0,0 +1,33 @@ +(use-package flycheck + :ensure t + :defer t + :preface (progn + (defun check-source-predicate () + (and (executable-find "check.pex") + (buffer-file-name) + (string-match "src/source/.*\.py$" (buffer-file-name))))) + :init + (progn + (add-hook 'prog-mode-hook 'flycheck-mode) + (setq-default flycheck-disabled-checkers '(emacs-lisp-checkdoc))) + :config + (progn + (flycheck-define-checker source-check + "A syntax checker for python source code in Source, using `check.pex'" + :command ("check.pex" source) + ;;; errors are reported like this: + ;;; E241:ERROR : + :error-patterns ((error line-start (1+ nonl) ":ERROR" (1+ nonl) ":" line (message) line-end)) + :predicate check-source-predicate + :modes (python-mode)) + (add-to-list 'flycheck-checkers 'source-check))) + +(use-package flycheck-pos-tip + :defer t + :init + (progn + (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/core/core-flyspell.el b/emacs.d/core/core-flyspell.el new file mode 100644 index 0000000..7c61b49 --- /dev/null +++ b/emacs.d/core/core-flyspell.el @@ -0,0 +1,11 @@ +(use-package flyspell + :ensure t + :defer t + :init + (progn + (setq ispell-program-name "aspell" + 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/core/core-ui.el b/emacs.d/core/core-ui.el new file mode 100644 index 0000000..ff70ae3 --- /dev/null +++ b/emacs.d/core/core-ui.el @@ -0,0 +1,54 @@ +;; no menu +(menu-bar-mode -1) + +;; show parenthesis +(show-paren-mode +1) + +;; enable colors +(global-font-lock-mode +1) + +;; no startup screen +(setq inhibit-startup-message t) +(setq initial-scratch-message ";; scratch buffer") + +(setq frame-title-format '(buffer-file-name "%f" ("%b"))) + +;; no blink cursor +(blink-cursor-mode -1) + +;; show the column number in the mode-line +(setq column-number-mode t) + +(when window-system + ;;hide tool-bar + (tool-bar-mode 0) + ;;hide scroll-bar + (scroll-bar-mode 0) + ;;hide menu-bar + (menu-bar-mode +1) + ;; set the font size and family + (custom-set-faces '(default ((t (:height 130 :family "Droid Sans Mono")))))) + +(require 'whitespace) +(global-whitespace-mode 1) +(setq whitespace-style '(face trailing tabs tab-mark)) + +(use-package leuven-theme + :init + (load-theme 'leuven t)) + +(use-package smart-mode-line + :ensure t + :config + (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/00_bindings.el b/emacs.d/inits/00_bindings.el deleted file mode 100644 index ded7005..0000000 --- a/emacs.d/inits/00_bindings.el +++ /dev/null @@ -1,4 +0,0 @@ -;;; 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 "") 'toggle-frame-fullscreen) diff --git a/emacs.d/inits/00_defaults.el b/emacs.d/inits/00_defaults.el deleted file mode 100644 index 26ec0bb..0000000 --- a/emacs.d/inits/00_defaults.el +++ /dev/null @@ -1,25 +0,0 @@ -;; alias yes-or-no to y-or-n -(fset 'yes-or-no-p 'y-or-n-p) - -;; set utf-8 as the default encoding -(prefer-coding-system 'utf-8-unix) - -(setq auto-save-default nil) - -(setq auto-save-list-file-prefix nil) - -;; *no* backups -(setq make-backup-files nil) - -;; always add a newline -(setq require-final-newline t) - -;; follow symlinks -(setq vc-follow-symlinks t) - -;; navigation -(setq next-screen-context-lines 5) - -(setq tab-always-indent 'complete) - -(global-auto-revert-mode 1) diff --git a/emacs.d/inits/00_ui.el b/emacs.d/inits/00_ui.el deleted file mode 100644 index 29d900a..0000000 --- a/emacs.d/inits/00_ui.el +++ /dev/null @@ -1,49 +0,0 @@ -;; no menu -(menu-bar-mode -1) - -;; show parenthesis -(show-paren-mode +1) - -;; enable colors -(global-font-lock-mode +1) - -;; no startup screen -(setq inhibit-startup-message t) -(setq initial-scratch-message ";; scratch buffer") - -(setq frame-title-format '(buffer-file-name "%f" ("%b"))) - -;; no blink cursor -(blink-cursor-mode -1) - -;; show the column number in the mode-line -(setq column-number-mode t) - -(when window-system - ;;hide tool-bar - (tool-bar-mode 0) - ;;hide scroll-bar - (scroll-bar-mode 0) - ;;hide menu-bar - (menu-bar-mode +1) - ;; set the font size and family - (custom-set-faces '(default ((t (:height 130 :family "Droid Sans Mono")))))) - -(require 'whitespace) -(global-whitespace-mode 1) -(setq whitespace-style '(face trailing tabs tab-mark)) - -(use-package leuven-theme - :init - (load-theme 'leuven t)) - -(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 rm-whitelist '("")) - (sml/setup)) diff --git a/emacs.d/inits/10_defun.el b/emacs.d/inits/10_defun.el deleted file mode 100644 index 233f771..0000000 --- a/emacs.d/inits/10_defun.el +++ /dev/null @@ -1,7 +0,0 @@ -(defun fcuny-terminal () - "Switch to terminal. Launch if nonexistent." - (interactive) - (if (get-buffer "*ansi-term*") - (switch-to-buffer "*ansi-term*") - (ansi-term "/bin/bash")) - (get-buffer-process "*ansi-term*")) 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_development.el b/emacs.d/inits/50_development.el deleted file mode 100644 index a746355..0000000 --- a/emacs.d/inits/50_development.el +++ /dev/null @@ -1,71 +0,0 @@ -(use-package ag - :ensure t - :defer t) - -(use-package goto-chg - :ensure t - :bind (("C-." . goto-last-change) - ("C-," . goto-last-change-reverse))) - -(use-package projectile - :ensure t - :init - (setq projectile-enable-caching t) - (setq projectile-completion-system 'ivy) - :config - (projectile-global-mode)) - -(use-package company - :ensure t - :config - (progn - (add-hook 'prog-mode-hook 'company-mode))) - -(use-package rainbow-delimiters - :ensure t - :defer t - :init - (progn - (add-hook 'emacs-lisp-mode-hook #'rainbow-delimiters-mode))) - -(use-package smartparens - :ensure t - :config - (progn - (require 'smartparens-config) - (smartparens-global-mode 1) - (setq sp-show-pair-delay 0) - (setq sp-autoinsert-if-followed-by-word nil) - (show-smartparens-global-mode t) - (bind-keys :map sp-keymap - ("C-M-d" . sp-down-sexp) - ("C-M-a" . sp-backward-down-sexp) - ("C-S-a" . sp-beginning-of-sexp) - ("C-S-e" . sp-end-of-sexp) - ("C-M-f" . sp-forward-sexp) - ("C-M-b" . sp-backward-sexp) - ("C-M-u" . sp-backward-up-sexp) - ("C-M-t" . sp-transpose-sexp) - ("C-M-n" . sp-next-sexp) - ("C-M-p" . sp-previous-sexp) - ("C-M-k" . sp-kill-sexp) - ("C-M-w" . sp-copy-sexp) - ("M-" . sp-unwrap-sexp) - ("M-". sp-backward-unwrap-sexp) - ("M-" . sp-forward-slurp-sexp) - ("M-" . sp-forward-barf-sexp) - ("M-S-" . sp-backward-slurp-sexp) - ("M-S-" . sp-backward-barf-sexp) - ("M-d" . sp-splice-sexp)))) - -(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) - -(setq-default indent-tabs-mode nil) diff --git a/emacs.d/inits/50_flycheck.el b/emacs.d/inits/50_flycheck.el deleted file mode 100644 index 3d835e3..0000000 --- a/emacs.d/inits/50_flycheck.el +++ /dev/null @@ -1,31 +0,0 @@ -(use-package flycheck - :ensure t - :defer t - :preface (progn - (defun check-source-predicate () - (and (executable-find "check.pex") - (buffer-file-name) - (string-match "src/source/.*\.py$" (buffer-file-name))))) - :init - (progn - (add-hook 'prog-mode-hook 'flycheck-mode) - (setq-default flycheck-disabled-checkers '(emacs-lisp-checkdoc))) - :config - (progn - (flycheck-define-checker source-check - "A syntax checker for python source code in Source, using `check.pex'" - :command ("check.pex" source) - ;;; errors are reported like this: - ;;; E241:ERROR : - :error-patterns ((error line-start (1+ nonl) ":ERROR" (1+ nonl) ":" line (message) line-end)) - :predicate check-source-predicate - :modes (python-mode)) - (add-to-list 'flycheck-checkers 'source-check))) - -(use-package flycheck-pos-tip - :defer t - :init - (progn - (eval-after-load 'feature-flycheck - '(setq-default flycheck-display-errors-function #'flycheck-pos-tip-error-messages))) - :ensure t) diff --git a/emacs.d/inits/50_flyspell.el b/emacs.d/inits/50_flyspell.el deleted file mode 100644 index 14887e8..0000000 --- a/emacs.d/inits/50_flyspell.el +++ /dev/null @@ -1,9 +0,0 @@ -(use-package flyspell - :ensure t - :defer t - :init - (progn - (setq ispell-program-name "aspell" - ispell-list-command "--list") - (add-hook 'prog-mode-hook 'flyspell-prog-mode) - (add-hook 'text-mode-hook 'turn-on-flyspell))) 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-c.el b/emacs.d/inits/90_lang-c.el deleted file mode 100644 index bd4cc7f..0000000 --- a/emacs.d/inits/90_lang-c.el +++ /dev/null @@ -1,6 +0,0 @@ -(use-package google-c-style - :ensure t - :defer t - :config - (progn - (setq c-basic-offset 2))) diff --git a/emacs.d/inits/90_lang-go.el b/emacs.d/inits/90_lang-go.el deleted file mode 100644 index b20b467..0000000 --- a/emacs.d/inits/90_lang-go.el +++ /dev/null @@ -1,23 +0,0 @@ -(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 - :config - (progn - (bind-key "C-c C-f" 'gofmt go-mode-map) - (bind-key "C-c h" 'godoc go-mode-map) - (bind-key "C-c C-g" 'go-goto-imports go-mode-map) - (bind-key "C-c C-r" 'go-remove-unused-imports go-mode-map)) - :init - (progn (add-hook 'go-mode-hook (lambda () - (go-eldoc-setup) - (add-hook 'before-save-hook 'gofmt-before-save) - (set (make-local-variable 'company-backends) '(company-go)))))) 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_lang-python.el b/emacs.d/inits/90_lang-python.el deleted file mode 100644 index 84fafab..0000000 --- a/emacs.d/inits/90_lang-python.el +++ /dev/null @@ -1,5 +0,0 @@ -(use-package python - :mode ("BUILD\\|(\\.\\(py\\|aurora\\))$" . python-mode) - :config - (progn - (setq python-indent-offset 2))) diff --git a/emacs.d/inits/90_markdown.el b/emacs.d/inits/90_markdown.el deleted file mode 100644 index 3ec3ec4..0000000 --- a/emacs.d/inits/90_markdown.el +++ /dev/null @@ -1,9 +0,0 @@ -(use-package markdown-mode - :ensure t - :mode ("\\.\\(m\\(ark\\)?down\\|md\\)$" . markdown-mode) - :config - (progn - (let ((preferred-markdown-impl "peg-markdown")) - (when (executable-find preferred-markdown-impl) - (setq markdown-command preferred-markdown-impl))))) - 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/inits/90_puppet.el deleted file mode 100644 index 97b8a67..0000000 --- a/emacs.d/inits/90_puppet.el +++ /dev/null @@ -1,3 +0,0 @@ -(use-package puppet-mode - :ensure t - :mode ("\\.pp$" . puppet-mode)) diff --git a/emacs.d/inits/90_shell.el b/emacs.d/inits/90_shell.el deleted file mode 100644 index aa3fab5..0000000 --- a/emacs.d/inits/90_shell.el +++ /dev/null @@ -1,3 +0,0 @@ -(setq-default - sh-basic-offset 2 - sh-indentation 2) diff --git a/emacs.d/inits/90_thrift.el b/emacs.d/inits/90_thrift.el deleted file mode 100644 index 3a99429..0000000 --- a/emacs.d/inits/90_thrift.el +++ /dev/null @@ -1,3 +0,0 @@ -(use-package thrift - :ensure t - :defer t) diff --git a/emacs.d/inits/90_yaml.el b/emacs.d/inits/90_yaml.el deleted file mode 100644 index 6758789..0000000 --- a/emacs.d/inits/90_yaml.el +++ /dev/null @@ -1,3 +0,0 @@ -(use-package yaml-mode - :ensure t - :defer t) diff --git a/emacs.d/modes/cfg-puppet.el b/emacs.d/modes/cfg-puppet.el new file mode 100644 index 0000000..5c1185a --- /dev/null +++ b/emacs.d/modes/cfg-puppet.el @@ -0,0 +1,5 @@ +(use-package puppet-mode + :ensure t + :mode ("\\.pp$" . puppet-mode)) + +(provide 'cfg-puppet) diff --git a/emacs.d/modes/cfg-thrift.el b/emacs.d/modes/cfg-thrift.el new file mode 100644 index 0000000..4f491c2 --- /dev/null +++ b/emacs.d/modes/cfg-thrift.el @@ -0,0 +1,5 @@ +(use-package thrift + :ensure t + :defer t) + +(provide 'cfg-thrift) diff --git a/emacs.d/modes/cfg-yaml.el b/emacs.d/modes/cfg-yaml.el new file mode 100644 index 0000000..7dc74e0 --- /dev/null +++ b/emacs.d/modes/cfg-yaml.el @@ -0,0 +1,5 @@ +(use-package yaml-mode + :ensure t + :defer t) + +(provide 'cfg-yaml) diff --git a/emacs.d/modes/lang-c.el b/emacs.d/modes/lang-c.el new file mode 100644 index 0000000..9b4f357 --- /dev/null +++ b/emacs.d/modes/lang-c.el @@ -0,0 +1,8 @@ +(use-package google-c-style + :ensure t + :defer t + :config + (progn + (setq c-basic-offset 2))) + +(provide 'lang-c) diff --git a/emacs.d/modes/lang-go.el b/emacs.d/modes/lang-go.el new file mode 100644 index 0000000..8d81f2c --- /dev/null +++ b/emacs.d/modes/lang-go.el @@ -0,0 +1,25 @@ +(use-package go-mode + :ensure t + :defer t + :config + (progn + (bind-key "C-c C-f" 'gofmt go-mode-map) + (bind-key "C-c h" 'godoc go-mode-map) + (bind-key "C-c C-g" 'go-goto-imports go-mode-map) + (bind-key "C-c C-r" 'go-remove-unused-imports go-mode-map)) + :init + (progn (add-hook 'go-mode-hook (lambda () + (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/modes/lang-markdown.el b/emacs.d/modes/lang-markdown.el new file mode 100644 index 0000000..f4f544d --- /dev/null +++ b/emacs.d/modes/lang-markdown.el @@ -0,0 +1,10 @@ +(use-package markdown-mode + :ensure t + :mode ("\\.\\(m\\(ark\\)?down\\|md\\)$" . markdown-mode) + :config + (progn + (let ((preferred-markdown-impl "peg-markdown")) + (when (executable-find preferred-markdown-impl) + (setq markdown-command preferred-markdown-impl))))) + +(provide 'lang-markdown) diff --git a/emacs.d/modes/lang-python.el b/emacs.d/modes/lang-python.el new file mode 100644 index 0000000..b22ce16 --- /dev/null +++ b/emacs.d/modes/lang-python.el @@ -0,0 +1,7 @@ +(use-package python + :mode ("BUILD\\|(\\.\\(py\\|aurora\\))$" . python-mode) + :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/modes/lang-shell.el b/emacs.d/modes/lang-shell.el new file mode 100644 index 0000000..aa3fab5 --- /dev/null +++ b/emacs.d/modes/lang-shell.el @@ -0,0 +1,3 @@ +(setq-default + sh-basic-offset 2 + sh-indentation 2) -- cgit 1.4.1