Merge branch 'master' of git.greyserv.net:marrub/scripts

emacs/early-init.el

@@ -5,15 +5,22 @@
         backup-directory-alist         `((".*" . ,usr-backup))
         create-lockfiles               nil
         custom-file                    usr-custom
-        gc-cons-threshold              64000000
+        file-name-handler-alist        nil
+        gc-cons-threshold              (* 200 1000 1000)
         global-mark-ring-max           1024
         inhibit-compacting-font-caches t
         inhibit-startup-screen         t
         initial-scratch-message        nil
         mark-ring-max                  1024))
 
-(when (string-equal system-type "windows-nt")
+(if (eq system-type 'windows-nt)
-  (setenv "PATH" (concat "C:/emacs/bin;" (getenv "PATH"))))
+    (progn
+      (setenv "PATH" (concat "C:/emacs/bin;" (getenv "PATH")))
+      (defalias 'agw-flyspell-mode      #'ignore)
+      (defalias 'agw-flyspell-prog-mode #'ignore))
+  (progn
+    (defalias 'agw-flyspell-mode      #'flyspell-mode)
+    (defalias 'agw-flyspell-prog-mode #'flyspell-prog-mode)))
 
 ;; important ergonomics
 (setq fill-column 80
@@ -45,7 +52,7 @@
 (set-fontset-font t '(#x2e80 . #x9fff) "Noto Sans CJK JP")
 
 (setq agw-mode-line-family
-      (if (string-equal system-type "windows-nt")
+      (if (eq system-type 'windows-nt)
           "Noto Mono"
         "Iosevka"))
 

emacs/init.el

@@ -21,13 +21,13 @@
 (set-scroll-bar-mode nil)
 
 ;; `prog-mode'
-(add-hook 'prog-mode-hook #'flyspell-prog-mode)
+(add-hook 'prog-mode-hook #'agw-flyspell-prog-mode)
 (add-hook 'prog-mode-hook #'prettify-symbols-mode)
 (add-hook 'prog-mode-hook #'subword-mode)
 (add-hook 'prog-mode-hook #'agw-prog-mode)
 
 ;; `text-mode'
-(add-hook 'text-mode-hook #'flyspell-prog-mode)
+(add-hook 'text-mode-hook #'agw-flyspell-prog-mode)
 (add-hook 'text-mode-hook #'subword-mode)
 (add-hook 'text-mode-hook #'agw-prog-mode)
 
@@ -152,7 +152,7 @@
 
 (use-package markdown-mode
   :ensure t
-  :hook ((markdown-mode . flyspell-mode))
+  :hook ((markdown-mode . agw-flyspell-mode))
   :mode (("\\.mdwn\\'" . markdown-mode)))
 
 (use-package ninja-mode
@@ -171,7 +171,7 @@
 
 ;; org-mode
 (use-package org
-  :hook ((org-mode . flyspell-mode)
+  :hook ((org-mode . agw-flyspell-mode)
          (org-mode . agw-org-mode))
   :init
   (setq org-fontify-whole-heading-line t
@@ -333,16 +333,17 @@
   :ensure t)
 
 ;; input
-(use-package mule
+(unless (eq system-type 'windows-nt)
-  :init
+  (use-package mule
-  (setq current-language-environment "UTF-8"
+    :init
-        keyboard-coding-system 'utf-8-unix))
+    (setq current-language-environment "UTF-8"
+          keyboard-coding-system 'utf-8-unix))
 
-(use-package mozc
+  (use-package mozc
-  :ensure t
+    :ensure t
-  :after mule
+    :after mule
-  :config
+    :config
-  (setq default-input-method "japanese-mozc"))
+    (setq default-input-method "japanese-mozc")))
 
 (use-package evil
   :ensure t
@@ -400,4 +401,7 @@
   :config
   (fringe-mode 0))
 
+;; end of init
+(setq gc-cons-threshold (* 1 1000 1000))
+
 ;; EOF