From a7c44d60af86479436f19d151fd93f4658892d76 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 17 Jul 2018 15:12:36 -0700 Subject: [emacs] Simplify the configuration Reduce the number of configuration files. --- emacs.d/config/fcuny-company.el | 17 ---- emacs.d/config/fcuny-dired.el | 15 ---- emacs.d/config/fcuny-docker.el | 7 -- emacs.d/config/fcuny-editor.el | 113 ++++++++++++++++++++++++++ emacs.d/config/fcuny-elisp.el | 13 --- emacs.d/config/fcuny-go.el | 44 ---------- emacs.d/config/fcuny-ibuffer.el | 26 ------ emacs.d/config/fcuny-magit.el | 30 ------- emacs.d/config/fcuny-make.el | 9 -- emacs.d/config/fcuny-markdown.el | 15 ---- emacs.d/config/fcuny-pants.el | 15 ---- emacs.d/config/fcuny-paren.el | 13 --- emacs.d/config/fcuny-prog.el | 158 ++++++++++++++++++++++++++++++++++++ emacs.d/config/fcuny-project.el | 84 ------------------- emacs.d/config/fcuny-puppet.el | 12 --- emacs.d/config/fcuny-python.el | 23 ------ emacs.d/config/fcuny-scala.el | 6 -- emacs.d/config/fcuny-serializers.el | 3 +- emacs.d/config/fcuny-shell.el | 13 --- emacs.d/config/fcuny-spell.el | 19 ----- emacs.d/config/fcuny-text.el | 30 +++++++ 21 files changed, 303 insertions(+), 362 deletions(-) delete mode 100644 emacs.d/config/fcuny-company.el delete mode 100644 emacs.d/config/fcuny-dired.el delete mode 100644 emacs.d/config/fcuny-docker.el delete mode 100644 emacs.d/config/fcuny-elisp.el delete mode 100644 emacs.d/config/fcuny-go.el delete mode 100644 emacs.d/config/fcuny-ibuffer.el delete mode 100644 emacs.d/config/fcuny-magit.el delete mode 100644 emacs.d/config/fcuny-make.el delete mode 100644 emacs.d/config/fcuny-markdown.el delete mode 100644 emacs.d/config/fcuny-pants.el delete mode 100644 emacs.d/config/fcuny-paren.el create mode 100644 emacs.d/config/fcuny-prog.el delete mode 100644 emacs.d/config/fcuny-project.el delete mode 100644 emacs.d/config/fcuny-puppet.el delete mode 100644 emacs.d/config/fcuny-python.el delete mode 100644 emacs.d/config/fcuny-scala.el delete mode 100644 emacs.d/config/fcuny-shell.el delete mode 100644 emacs.d/config/fcuny-spell.el create mode 100644 emacs.d/config/fcuny-text.el (limited to 'emacs.d/config') diff --git a/emacs.d/config/fcuny-company.el b/emacs.d/config/fcuny-company.el deleted file mode 100644 index 62e06de..0000000 --- a/emacs.d/config/fcuny-company.el +++ /dev/null @@ -1,17 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -(use-package company - :ensure t - :diminish company-mode - :config - (global-company-mode) - (setq company-global-modes '(not term-mode) - company-idle-delay 0.3 - company-minimum-prefix-length 3 - company-selection-wrap-around t - company-show-numbers t - company-tooltip-align-annotations t - company-require-match nil)) - -(provide 'fcuny-company) diff --git a/emacs.d/config/fcuny-dired.el b/emacs.d/config/fcuny-dired.el deleted file mode 100644 index 8c64c1f..0000000 --- a/emacs.d/config/fcuny-dired.el +++ /dev/null @@ -1,15 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -(use-package dired - :defer t - :bind ("C-x C-d" . dired) - :init - (setq-default dired-dwim-target t) - (setq dired-recursive-deletes 'always) - (setq dired-recursive-copies 'always) - - (let ((gls (executable-find "/opt/twitter/bin/gls"))) - (when gls (setq insert-directory-program gls)))) - -(provide 'fcuny-dired) diff --git a/emacs.d/config/fcuny-docker.el b/emacs.d/config/fcuny-docker.el deleted file mode 100644 index 7ed7b0b..0000000 --- a/emacs.d/config/fcuny-docker.el +++ /dev/null @@ -1,7 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -(use-package dockerfile-mode - :ensure t) - -(provide 'fcuny-docker) diff --git a/emacs.d/config/fcuny-editor.el b/emacs.d/config/fcuny-editor.el index d4dedc5..5af1ac8 100644 --- a/emacs.d/config/fcuny-editor.el +++ b/emacs.d/config/fcuny-editor.el @@ -44,4 +44,117 @@ (show-trailing-whitespace t) :hook (whitespace-mode)) +(use-package counsel + :ensure t + :bind + (("M-x" . counsel-M-x) + ("C-s" . counsel-grep-or-swiper) + ("C-x C-f" . counsel-find-file) + ("C-x C-r" . counsel-recentf) + ("C-c f" . counsel-git) + ("C-c s" . counsel-git-grep) + ("C-c /" . counsel-ag)) + :custom + (counsel-find-file-at-point t) + :config + (use-package swiper :ensure t) + (use-package counsel-projectile :ensure t)) + +(use-package ivy + :ensure t + :diminish (ivy-mode . "") + :bind ("C-c m" . ivy-switch-project) + :config + (ivy-mode 1) + (setq ivy-use-virtual-buffers t + ivy-height 10 + ivy-count-format "(%d/%d) " + ivy-initial-inputs-alist nil + ivy-use-ignore-default 'always + ivy-ignore-buffers '("company-statistics-cache.el" "company-statistics-autoload.el") + ivy-re-builders-alist '((swiper . ivy--regex-ignore-order) + (t . ivy--regex-fuzzy) + (t . ivy--regex-ignore-order))) + + (defun ivy-switch-project () + (interactive) + (ivy-read + "Switch to project: " + (if (projectile-project-p) + (cons (abbreviate-file-name (projectile-project-root)) + (projectile-relevant-known-projects)) + projectile-known-projects) + :action #'projectile-switch-project-by-name)) + + (ivy-set-actions + 'ivy-switch-project + '(("d" dired "Open Dired in project's directory") + ("v" counsel-projectile "Open project root in vc-dir or magit") + ("c" projectile-compile-project "Compile project") + ("r" projectile-remove-known-project "Remove project(s)")))) + +(use-package projectile + :ensure t + :diminish projectile-mode + :bind-keymap ("C-c p" . projectile-command-map) + + :init + (add-hook 'after-init-hook #'projectile-mode) + + :config + (setq projectile-switch-project-action 'projectile-dired + projectile-enable-caching t + projectile-completion-system 'ivy + projectile-known-projects-file (expand-file-name "var/projectile-bookmarks.eld" user-emacs-directory) + projectile-cache-file (expand-file-name "var/projectile.cache" user-emacs-directory) + projectile-globally-ignored-directories (append fcuny-projects-ignored-dirs + projectile-globally-ignored-directories) + projectile-globally-ignored-files (append + projectile-globally-ignored-files))) + +(use-package ag + :ensure t + :bind (:map ag-mode-map + ("p" . compilation-previous-error) + ("n" . compilation-next-error) + ("N" . compilation-next-file) + ("P" . compilation-previous-file)) + :custom + (ag-highlight-search t) + (ag-reuse-buffers t) + (ag-reuse-window t)) + +(use-package dired + :defer t + :bind ("C-x C-d" . dired) + :init + (setq-default dired-dwim-target t) + (setq dired-recursive-deletes 'always) + (setq dired-recursive-copies 'always) + + (let ((gls (executable-find "/opt/twitter/bin/gls"))) + (when gls (setq insert-directory-program gls)))) + +(use-package ibuffer + :ensure t + :bind ("C-x C-b" . ibuffer)) + +(use-package flycheck + :ensure t + :config + (progn + (add-hook 'prog-mode-hook 'flycheck-mode) + (setq flycheck-highlighting-mode 'lines) + (setq flycheck-check-syntax-automatically '(mode-enabled save)) + (setq flycheck-checkers (delq 'emacs-lisp-checkdoc flycheck-checkers)) + (if (fc/check-work-machine-p) + (flycheck-define-checker fc/twitter-source-check + "A syntax checker for python source code in Source, using `check.pex'" + :command ("check.pex" source) + :error-patterns ((error line-start (id (1+ nonl)) ":ERROR" (1+ nonl) ":" line (message) line-end) + (warning line-start (id (1+ nonl)) ":WARNING" (1+ nonl) ":" line (message) line-end)) + :predicate fc/check-source-p + :modes (python-mode)) + (add-to-list 'flycheck-checkers 'fc/twitter-source-check)))) + (provide 'fcuny-editor) diff --git a/emacs.d/config/fcuny-elisp.el b/emacs.d/config/fcuny-elisp.el deleted file mode 100644 index 118eb5b..0000000 --- a/emacs.d/config/fcuny-elisp.el +++ /dev/null @@ -1,13 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -(use-package lisp-mode - :bind - (("C-c C-e" . eval-buffer) - ("C-c C-r" . eval-region))) - -(use-package eldoc - :ensure t - :hook (emacs-lisp-mode-hook)) - -(provide 'fcuny-elisp) diff --git a/emacs.d/config/fcuny-go.el b/emacs.d/config/fcuny-go.el deleted file mode 100644 index dc0cd8b..0000000 --- a/emacs.d/config/fcuny-go.el +++ /dev/null @@ -1,44 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -(use-package go-mode - :ensure t - :after (company flycheck) - :preface - (defun fcuny/go-mode-setup () - (add-hook 'go-mode-hook 'flycheck-mode) - (setq-default) - (setq tab-width 2)) - :config - (add-hook 'go-mode-hook #'fcuny/go-mode-setup)) - -(use-package go-eldoc - :after go-mode - :ensure t - :hook (go-mode . go-eldoc-setup)) - -(use-package gotest - :ensure t) - -(use-package go-guru - :ensure t) - -(use-package go-imports - :ensure t) - -(use-package golint - :ensure t) - -(use-package go-projectile - :ensure t) - -(use-package company-go - :ensure t - :after (company go-mode) - :custom - (company-go-show-annotation t) - :config - (add-hook 'go-mode-hook 'company-mode) - (add-to-list 'company-backends 'company-go)) - -(provide 'fcuny-go) diff --git a/emacs.d/config/fcuny-ibuffer.el b/emacs.d/config/fcuny-ibuffer.el deleted file mode 100644 index b949c87..0000000 --- a/emacs.d/config/fcuny-ibuffer.el +++ /dev/null @@ -1,26 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -(use-package ibuffer - :ensure t - :bind ("C-x C-b" . ibuffer)) - -(use-package flycheck - :ensure t - :config - (progn - (add-hook 'prog-mode-hook 'flycheck-mode) - (setq flycheck-highlighting-mode 'lines) - (setq flycheck-check-syntax-automatically '(mode-enabled save)) - (setq flycheck-checkers (delq 'emacs-lisp-checkdoc flycheck-checkers)) - (if (fc/check-work-machine-p) - (flycheck-define-checker fc/twitter-source-check - "A syntax checker for python source code in Source, using `check.pex'" - :command ("check.pex" source) - :error-patterns ((error line-start (id (1+ nonl)) ":ERROR" (1+ nonl) ":" line (message) line-end) - (warning line-start (id (1+ nonl)) ":WARNING" (1+ nonl) ":" line (message) line-end)) - :predicate fc/check-source-p - :modes (python-mode)) - (add-to-list 'flycheck-checkers 'fc/twitter-source-check)))) - -(provide 'fcuny-ibuffer) diff --git a/emacs.d/config/fcuny-magit.el b/emacs.d/config/fcuny-magit.el deleted file mode 100644 index 97ef7fe..0000000 --- a/emacs.d/config/fcuny-magit.el +++ /dev/null @@ -1,30 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -(use-package magit - :ensure t - :mode (("differential-update-comments" . git-commit-mode) - ("new-commit" . git-commit-mode)) - :bind (("C-x g s" . magit-status) - ("C-x g b" . magit-checkout)) - :init - (progn - (setq magit-completing-read-function 'ivy-completing-read)) - - :config - (progn - (global-git-commit-mode) - - ;; I don't care about other VC backend for work - (if (fc/check-work-machine-p) - (setf vc-handled-backends nil - vc-follow-symlinks t)) - - (use-package git-commit :ensure t) - - (add-hook 'magit-log-edit-mode-hook - #'(lambda () - (set-fill-column 72) - (flyspell-mode))))) - -(provide 'fcuny-magit) diff --git a/emacs.d/config/fcuny-make.el b/emacs.d/config/fcuny-make.el deleted file mode 100644 index 1218f7a..0000000 --- a/emacs.d/config/fcuny-make.el +++ /dev/null @@ -1,9 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -(use-package make-mode - :ensure t - :config - (add-hook 'makefile-mode-hook (lambda () (setq-local tab-width 2)))) - -(provide 'fcuny-make) diff --git a/emacs.d/config/fcuny-markdown.el b/emacs.d/config/fcuny-markdown.el deleted file mode 100644 index 404b5d3..0000000 --- a/emacs.d/config/fcuny-markdown.el +++ /dev/null @@ -1,15 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -(use-package markdown-mode - :ensure t - :after (flyspell) - :mode (("\\.md\\'" . gfm-mode) - ("\\.markdown\\'" . gfm-mode)) - :hook (markdown-mode . flyspell-mode) - :init (setq markdown-command "pandoc -f markdown_github -c https://goo.gl/OVmlwT --self-contained" - markdown-header-scaling 't) - :config - (add-hook 'gfm-mode-hook 'visual-line-mode)) - -(provide 'fcuny-markdown) diff --git a/emacs.d/config/fcuny-pants.el b/emacs.d/config/fcuny-pants.el deleted file mode 100644 index 3ed1ef1..0000000 --- a/emacs.d/config/fcuny-pants.el +++ /dev/null @@ -1,15 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -(use-package pants - :load-path (lambda () (expand-file-name "github.com/fcuny/pants.el/" fcuny-path-workspace)) - :custom - (pants-completion-system 'ivy) - (pants-source-tree-root (expand-file-name "git.twitter.biz/source" fcuny-path-workspace)) - (pants-bury-compilation-buffer t) - (pants-extra-args "-q") - :bind (("C-c b" . pants-find-build-file) - ("C-c r" . pants-run-binary) - ("C-c t" . pants-run-test))) - -(provide 'fcuny-pants) diff --git a/emacs.d/config/fcuny-paren.el b/emacs.d/config/fcuny-paren.el deleted file mode 100644 index db6bdeb..0000000 --- a/emacs.d/config/fcuny-paren.el +++ /dev/null @@ -1,13 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -;; auto close bracket, parenthesis insertion -(electric-pair-mode 1) - -(use-package paren - :custom - (show-paren-delay 0) - :config - (show-paren-mode 1)) - -(provide 'fcuny-paren) diff --git a/emacs.d/config/fcuny-prog.el b/emacs.d/config/fcuny-prog.el new file mode 100644 index 0000000..8124952 --- /dev/null +++ b/emacs.d/config/fcuny-prog.el @@ -0,0 +1,158 @@ +(eval-when-compile + (require 'use-package)) + +;; auto close bracket, parenthesis insertion +(electric-pair-mode 1) + +(use-package paren + :custom + (show-paren-delay 0) + :config + (show-paren-mode 1)) + +(use-package lisp-mode + :bind + (("C-c C-e" . eval-buffer) + ("C-c C-r" . eval-region))) + +(use-package eldoc + :ensure t + :hook (emacs-lisp-mode-hook)) + +(use-package pants + :load-path (lambda () (expand-file-name "github.com/fcuny/pants.el/" fcuny-path-workspace)) + :custom + (pants-completion-system 'ivy) + (pants-source-tree-root (expand-file-name "git.twitter.biz/source" fcuny-path-workspace)) + (pants-bury-compilation-buffer t) + (pants-extra-args "-q") + :bind (("C-c b" . pants-find-build-file) + ("C-c r" . pants-run-binary) + ("C-c t" . pants-run-test))) + +(use-package make-mode + :ensure t + :config + (add-hook 'makefile-mode-hook (lambda () (setq-local tab-width 2)))) + +(use-package company + :ensure t + :diminish company-mode + :config + (global-company-mode) + (setq company-global-modes '(not term-mode) + company-idle-delay 0.3 + company-minimum-prefix-length 3 + company-selection-wrap-around t + company-show-numbers t + company-tooltip-align-annotations t + company-require-match nil)) + +(use-package magit + :ensure t + :mode (("differential-update-comments" . git-commit-mode) + ("new-commit" . git-commit-mode)) + :bind (("C-x g s" . magit-status) + ("C-x g b" . magit-checkout)) + :init + (progn + (setq magit-completing-read-function 'ivy-completing-read)) + + :config + (progn + (global-git-commit-mode) + + ;; I don't care about other VC backend for work + (if (fc/check-work-machine-p) + (setf vc-handled-backends nil + vc-follow-symlinks t)) + + (use-package git-commit :ensure t) + + (add-hook 'magit-log-edit-mode-hook + #'(lambda () + (set-fill-column 72) + (flyspell-mode))))) + +(use-package go-mode + :ensure t + :after (company flycheck) + :preface + (defun fcuny/go-mode-setup () + (add-hook 'go-mode-hook 'flycheck-mode) + (setq-default) + (setq tab-width 2)) + :config + (add-hook 'go-mode-hook #'fcuny/go-mode-setup)) + +(use-package go-eldoc + :after go-mode + :ensure t + :hook (go-mode . go-eldoc-setup)) + +(use-package gotest + :ensure t) + +(use-package go-guru + :ensure t) + +(use-package go-imports + :ensure t) + +(use-package golint + :ensure t) + +(use-package go-projectile + :ensure t) + +(use-package company-go + :ensure t + :after (company go-mode) + :custom + (company-go-show-annotation t) + :config + (add-hook 'go-mode-hook 'company-mode) + (add-to-list 'company-backends 'company-go)) + +(use-package python + :mode (("\\.py$" . python-mode)) + :ensure t + :commands python-mode + :custom (python-indent-offset 2)) + +(use-package anaconda-mode + :ensure t + :after python + :hook ((python-mode . anaconda-mode) + (python-mode . eldoc-mode)) + :custom (anaconda-mode-eldoc-as-single-line t)) + +(use-package company-anaconda + :ensure t + :after anaconda-mode + :init + (add-to-list 'company-backends 'company-anaconda)) + +(use-package scala-mode :ensure t) + +(use-package sh-script + :mode ("bashrc" . sh-mode) + :config + (defun set-sh-mode-indent () + (setq sh-basic-offset 2 + sh-indentation 2)) + (add-hook 'sh-mode-hook 'set-sh-mode-indent) + (add-hook 'after-save-hook 'executable-make-buffer-file-executable-if-script-p)) + +(use-package dockerfile-mode + :ensure t) + +(use-package puppet-mode + :ensure t + :mode ("\\.pp\\'" . puppet-mode) + ;:hook (flycheck-mode) + :config + (if (fc/check-work-machine-p) + (setq flycheck-puppet-lint-rc fcuny-path-puppet-linter-svn))) + +(provide 'fcuny-prog) diff --git a/emacs.d/config/fcuny-project.el b/emacs.d/config/fcuny-project.el deleted file mode 100644 index c94c40b..0000000 --- a/emacs.d/config/fcuny-project.el +++ /dev/null @@ -1,84 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -(use-package counsel - :ensure t - :bind - (("M-x" . counsel-M-x) - ("C-s" . counsel-grep-or-swiper) - ("C-x C-f" . counsel-find-file) - ("C-x C-r" . counsel-recentf) - ("C-c f" . counsel-git) - ("C-c s" . counsel-git-grep) - ("C-c /" . counsel-ag)) - :custom - (counsel-find-file-at-point t) - :config - (use-package swiper :ensure t) - (use-package counsel-projectile :ensure t)) - -(use-package ivy - :ensure t - :diminish (ivy-mode . "") - :bind ("C-c m" . ivy-switch-project) - :config - (ivy-mode 1) - (setq ivy-use-virtual-buffers t - ivy-height 10 - ivy-count-format "(%d/%d) " - ivy-initial-inputs-alist nil - ivy-use-ignore-default 'always - ivy-ignore-buffers '("company-statistics-cache.el" "company-statistics-autoload.el") - ivy-re-builders-alist '((swiper . ivy--regex-ignore-order) - (t . ivy--regex-fuzzy) - (t . ivy--regex-ignore-order))) - - (defun ivy-switch-project () - (interactive) - (ivy-read - "Switch to project: " - (if (projectile-project-p) - (cons (abbreviate-file-name (projectile-project-root)) - (projectile-relevant-known-projects)) - projectile-known-projects) - :action #'projectile-switch-project-by-name)) - - (ivy-set-actions - 'ivy-switch-project - '(("d" dired "Open Dired in project's directory") - ("v" counsel-projectile "Open project root in vc-dir or magit") - ("c" projectile-compile-project "Compile project") - ("r" projectile-remove-known-project "Remove project(s)")))) - -(use-package projectile - :ensure t - :diminish projectile-mode - :bind-keymap ("C-c p" . projectile-command-map) - - :init - (add-hook 'after-init-hook #'projectile-mode) - - :config - (setq projectile-switch-project-action 'projectile-dired - projectile-enable-caching t - projectile-completion-system 'ivy - projectile-known-projects-file (expand-file-name "var/projectile-bookmarks.eld" user-emacs-directory) - projectile-cache-file (expand-file-name "var/projectile.cache" user-emacs-directory) - projectile-globally-ignored-directories (append fcuny-projects-ignored-dirs - projectile-globally-ignored-directories) - projectile-globally-ignored-files (append - projectile-globally-ignored-files))) - -(use-package ag - :ensure t - :bind (:map ag-mode-map - ("p" . compilation-previous-error) - ("n" . compilation-next-error) - ("N" . compilation-next-file) - ("P" . compilation-previous-file)) - :custom - (ag-highlight-search t) - (ag-reuse-buffers t) - (ag-reuse-window t)) - -(provide 'fcuny-project) diff --git a/emacs.d/config/fcuny-puppet.el b/emacs.d/config/fcuny-puppet.el deleted file mode 100644 index 4a7eb10..0000000 --- a/emacs.d/config/fcuny-puppet.el +++ /dev/null @@ -1,12 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -(use-package puppet-mode - :ensure t - :mode ("\\.pp\\'" . puppet-mode) - ;:hook (flycheck-mode) - :config - (if (fc/check-work-machine-p) - (setq flycheck-puppet-lint-rc fcuny-path-puppet-linter-svn))) - -(provide 'fcuny-puppet) diff --git a/emacs.d/config/fcuny-python.el b/emacs.d/config/fcuny-python.el deleted file mode 100644 index fd96157..0000000 --- a/emacs.d/config/fcuny-python.el +++ /dev/null @@ -1,23 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -(use-package python - :mode (("\\.py$" . python-mode)) - :ensure t - :commands python-mode - :custom (python-indent-offset 2)) - -(use-package anaconda-mode - :ensure t - :after python - :hook ((python-mode . anaconda-mode) - (python-mode . eldoc-mode)) - :custom (anaconda-mode-eldoc-as-single-line t)) - -(use-package company-anaconda - :ensure t - :after anaconda-mode - :init - (add-to-list 'company-backends 'company-anaconda)) - -(provide 'fcuny-python) diff --git a/emacs.d/config/fcuny-scala.el b/emacs.d/config/fcuny-scala.el deleted file mode 100644 index cfadbd6..0000000 --- a/emacs.d/config/fcuny-scala.el +++ /dev/null @@ -1,6 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -(use-package scala-mode :ensure t) - -(provide 'fcuny-scala) diff --git a/emacs.d/config/fcuny-serializers.el b/emacs.d/config/fcuny-serializers.el index 64ebb10..76fa6c2 100644 --- a/emacs.d/config/fcuny-serializers.el +++ b/emacs.d/config/fcuny-serializers.el @@ -14,9 +14,10 @@ :after (flycheck flyspell) :custom (json-reformat:indent-width 2) + (js-indent-level 2) :hook ((json-mode . flyspell-prog-mode) (json-mode . flycheck-mode)) - :config + :init (if (fc/check-work-machine-p) (add-to-list 'auto-mode-alist '("\\.workflow$" . json-mode)))) diff --git a/emacs.d/config/fcuny-shell.el b/emacs.d/config/fcuny-shell.el deleted file mode 100644 index 01fb075..0000000 --- a/emacs.d/config/fcuny-shell.el +++ /dev/null @@ -1,13 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -(use-package sh-script - :mode ("bashrc" . sh-mode) - :config - (defun set-sh-mode-indent () - (setq sh-basic-offset 2 - sh-indentation 2)) - (add-hook 'sh-mode-hook 'set-sh-mode-indent) - (add-hook 'after-save-hook 'executable-make-buffer-file-executable-if-script-p)) - -(provide 'fcuny-shell) diff --git a/emacs.d/config/fcuny-spell.el b/emacs.d/config/fcuny-spell.el deleted file mode 100644 index a6c2980..0000000 --- a/emacs.d/config/fcuny-spell.el +++ /dev/null @@ -1,19 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -(use-package ispell - :ensure t - :config - (when (executable-find "aspell") - (setq ispell-program-name "aspell" - ispell-list-command "--list"))) - -(use-package flyspell-correct - :ensure t) - -(use-package flyspell - :ensure t - :hook ((text-mode-hook . flyspell-mode) - (prog-mode-hook . flyspell-prog-mode))) - -(provide 'fcuny-spell) diff --git a/emacs.d/config/fcuny-text.el b/emacs.d/config/fcuny-text.el new file mode 100644 index 0000000..3bcd17c --- /dev/null +++ b/emacs.d/config/fcuny-text.el @@ -0,0 +1,30 @@ +(eval-when-compile + (require 'use-package)) + +(use-package ispell + :ensure t + :config + (when (executable-find "aspell") + (setq ispell-program-name "aspell" + ispell-list-command "--list"))) + +(use-package flyspell-correct + :ensure t) + +(use-package flyspell + :ensure t + :hook ((text-mode-hook . flyspell-mode) + (prog-mode-hook . flyspell-prog-mode))) + +(use-package markdown-mode + :ensure t + :after (flyspell) + :mode (("\\.md\\'" . gfm-mode) + ("\\.markdown\\'" . gfm-mode)) + :hook (markdown-mode . flyspell-mode) + :init (setq markdown-command "pandoc -f markdown_github -c https://goo.gl/OVmlwT --self-contained" + markdown-header-scaling 't) + :config + (add-hook 'gfm-mode-hook 'visual-line-mode)) + +(provide 'fcuny-text) -- cgit 1.4.1