Auto commit by The Sugar System.

[sugar.git] / dot-files / _emacs_el

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 0e2ec904e0a2b42e69b8c673c35dc239cdc1b8d0..6cc8fb65d204dadd6b853d25c050ebadcad16a13 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -155,6 +155,16 @@
 ;; ditz
 (require-if-present 'ditz)
 
+;; flycheck
+(require-if-present 'flycheck)
+;(if (featurep 'flycheck)
+;    (global-flycheck-mode))
+
+(require-if-present 'flycheck-inline)
+(if (featurep 'flycheck-inline)
+    (with-eval-after-load 'flycheck
+      (add-hook 'flycheck-mode-hook #'flycheck-inline-mode)))
+
 ;; flyspell
 (require-if-present 'flyspell)
 
@@ -177,6 +187,11 @@
 (autoload 'rust-mode "rust-mode" nil t)
 (add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode))
 
+(require-if-present 'flycheck-rust)
+(if (featurep 'flycheck-rust)
+    (with-eval-after-load 'rust-mode
+      (add-hook 'flycheck-mode-hook #'flycheck-rust-setup)))
+
 ;; session
 (require-if-present 'session)
 (if (featurep 'session)
@@ -267,6 +282,13 @@ Will prompt you shell name when you type `C-u' before this command." t)
 (autoload 'lua-mode "lua-mode" "Lua editing mode." t)
 (add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode))
 
+;; projectile-mode
+(require-if-present 'projectile)
+(if (featurep 'projectile)
+    (progn
+      (projectile-mode +1)
+      (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)))
+
 ;; protobuf-mode
 (autoload 'protobuf-mode "protobuf-mode")
 (add-to-list 'auto-mode-alist '("\\.proto\\'" . protobuf-mode))
@@ -392,7 +414,9 @@ Will prompt you shell name when you type `C-u' before this command." t)
 (add-hook 'haskell-mode-hook 'turn-on-haskell-indent)
 (add-hook 'haskell-mode-hook 'turn-on-haskell-ghci)
 
-(load-if-present "~/sandbox/_input-method/haskell-unicode-input-method/haskell-unicode-input-method")
+;(add-hook 'haskell-mode-hook #'flycheck-haskell-setup)
+
+(load-if-present "~/sandbox/_input-method/emacs-haskell-unicode-input-method/haskell-unicode-input-method")
  (add-hook 'haskell-mode-hook
    (lambda () (set-input-method "haskell-unicode")))
 
@@ -702,7 +726,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
      ("melpa" . "https://melpa.org/packages/"))))
  '(package-selected-packages
    (quote
-    (undo-tree auto-complete typescript-mode cargo toml-mode rust-mode)))
+    (projectile elixir-mode flycheck-haskell flycheck-inline flycheck-rust undo-tree auto-complete typescript-mode cargo toml-mode rust-mode)))
  '(rcirc-server-alist (quote (("irc1.ymir.jp" :nick "PHO`cons" nil nil))))
  '(riece-layout "default")
  '(riece-layout-alist