Auto commit by The Sugar System.

diff --git a/dot-files/_config/tridactyl/tridactylrc b/dot-files/_config/tridactyl/tridactylrc
index 203920c9f327ee74aec5d9b0ea0a9f4c0033a39a..37a69ab07bd1b61a2f9eb48fab69a978156bd52c 100644 (file)
--- a/dot-files/_config/tridactyl/tridactylrc
+++ b/dot-files/_config/tridactyl/tridactylrc
@@ -87,6 +87,10 @@ quickmark a https://console.aws.amazon.com/
 quickmark b http://direct.bk.mufg.jp/
 quickmark B http://www.mizuhobank.co.jp/direct/start.html
 "
+" - Credit cards
+quickmark c https://bkweb.dccard.co.jp/service_icc/visitors/htmls/prp/login.htm
+quickmark C https://www.saisoncard.co.jp/
+"
 " - Securities
 quickmark s https://online.sc.mufg.jp/its/dfw/UTBSITS/user_p/Login#
 

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 8bc9e204a81daecf00d95be115c053ac3b12adc2..6cc8fb65d204dadd6b853d25c050ebadcad16a13 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -157,8 +157,8 @@
 
 ;; flycheck
 (require-if-present 'flycheck)
-(if (featurep 'flycheck)
-    (global-flycheck-mode))
+;(if (featurep 'flycheck)
+;    (global-flycheck-mode))
 
 (require-if-present 'flycheck-inline)
 (if (featurep 'flycheck-inline)
@@ -282,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))
@@ -407,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")))
 
@@ -717,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
-    (flycheck-inline flycheck-rust 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