Configure Org and kinda set up emacs-mozc

2 files changed, 49 insertions, 39 deletions

diff --git a/.config/doom/config.el b/.config/doom/config.el
index 2a15960..4327252 100644
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@@ -22,7 +22,7 @@
 ;; accept. For example:
 ;;
 (setq doom-font (font-spec :family "Hack Nerd Font" :size 12)) ;:weight 'normal))
-(setq doom-variable-pitch-font (font-spec :family "VL ゴシック" :size 12))
+(setq doom-variable-pitch-font (font-spec :family "DejaVu Sans" :size 13))
 ;(add-to-list 'default-frame-alist '(alpha-background . 100))
 ;(add-to-list 'default-frame-alist '(font . "Hack"))
 ;(set-frame-parameter (selected-frame) 'font "Hack")
@@ -45,7 +45,6 @@
 
 ;; If you use `org' and don't want your org files in the default location below,
 ;; change `org-directory'. It must be set before org loads!
-(setq org-directory "~/org/")
 
 ;; put autosaves in their place
 (setq backup-directory "~/.config/emacs/.local/cache/autosave/")
@@ -87,47 +86,56 @@
 ;;
 ;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
 ;; they are implemented.
-(keymap-global-set "C-c C-c" 'treemacs-select-window)
+
+;; START horrible org config
+(setq org-directory "~/Org/")
 (after! org
-  (setq org-hide-emphasis-markers t))
+  (setq org-hide-emphasis-markers t)
+  (setq org-hidden-keywords '(title)))
 
-(require 'org-bullets)
-(use-package org-bullets
-  :config
-  (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))
+(let* ((variable-tuple '(:family "Sans Serif"))
+       (base-font-color (face-foreground 'default nil 'default))
+       (headline '(:inherit default :weight bold :foreground ,base-font-color)))
+
+(custom-theme-set-faces
+ 'user
+
+ '(org-document-title ((t (,@headline ,@variable-tuple :height 2.0 :underline nil))))
+ '(org-level-1 ((t (,@headline ,@variable-tuple :height 1.75))))
+ '(org-level-2 ((t (,@headline ,@variable-tuple :height 1.5))))
+ '(org-level-3 ((t (,@headline ,@variable-tuple :height 1.25))))
+ '(org-level-4 ((t (,@headline ,@variable-tuple :height 1.1))))
+ '(org-level-5 ((t (,@headline ,@variable-tuple))))
+ '(org-level-6 ((t (,@headline ,@variable-tuple))))
+ '(org-level-7 ((t (,@headline ,@variable-tuple))))
+ '(org-level-8 ((t (,@headline ,@variable-tuple))))
+ '(org-block ((t (:inherit fixed-pitch))))
+ '(org-code ((t (:inherit (shadow fixed-pitch) :foreground "black"))))
+ '(org-document-info ((t (:foreground "dark orange"))))
+ '(org-document-info-keyword ((t (:inherit (shadow fixed-pitch)))))
+ '(org-indent ((t (:inherit (org-hide fixed-pitch)))))
+ '(org-link ((t (:foreground "royal blue" :underline t))))
+ '(org-meta-line ((t (:inherit (font-lock-comment-face fixed-pitch)))))
+ '(org-property-value ((t (:inherit fixed-pitch))) t)
+ '(org-special-keyword ((t (:inherit (font-lock-comment-face fixed-pitch)))))
+ '(org-table ((t (:inherit fixed-pitch :foreground "#83a598"))))
+ '(org-tag ((t (:inherit (shadow fixed-pitch) :weight bold :height 0.8))))
+ '(org-verbatim ((t (:inherit (shadow fixed-pitch)))))))
 
 (font-lock-add-keywords 'org-mode
                         '(("^ *\\([-]\\) "
                            (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))
 
-;(let* (variable-tuple (:font "DejaVu Sans")))
-;(let* 'base-font-color (face-foreground 'default nil 'default))
-;(let* 'headline (font-spec :inherit default :weight bold :foreground ,base-font-color))
-;;
-;(custom-theme-set-faces
-; 'doom-one-light
-; '(org-level-8 ((t (,@headline ,(:font "DejaVu Sans")))))
-; '(org-level-7 ((t (,@headline ,(:font "DejaVu Sans")))))
-; '(org-level-6 ((t (,@headline ,(:font "DejaVu Sans")))))
-; '(org-level-5 ((t (,@headline ,(:font "DejaVu Sans")))))
-; '(org-level-4 ((t (,@headline ,(:font "DejaVu Sans") :height 1.1))))
-; '(org-level-3 ((t (,@headline ,(:font "DejaVu Sans") :height 1.25))))
-; '(org-level-2 ((t (,@headline ,(:font "DejaVu Sans") :height 1.5))))
-; '(org-level-1 ((t (,@headline ,(:font "DejaVu Sans") :height 1.75))))
-; '(org-document-title ((t (,@headline ,@variable-tuple :height 2.0 :underline nil)))))
+(require 'org-bullets)
+(use-package org-bullets
+  :config
+  (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))
+(add-hook 'org-mode-hook 'variable-pitch-mode)
+(add-hook 'org-mode-hook 'visual-line-mode)
+;; END horrible org config
 
-(let* ((variable-tuple '(:family "Sans Serif"))
-       (base-font-color (face-foreground 'default nil 'default))
-       (headline `(:inherit default :weight bold :foreground ,base-font-color)))
-
-  (custom-theme-set-faces
-   'user
-   `(org-level-8 ((t (,@headline ,@variable-tuple))))
-   `(org-level-7 ((t (,@headline ,@variable-tuple))))
-   `(org-level-6 ((t (,@headline ,@variable-tuple))))
-   `(org-level-5 ((t (,@headline ,@variable-tuple))))
-   `(org-level-4 ((t (,@headline ,@variable-tuple :height 1.1))))
-   `(org-level-3 ((t (,@headline ,@variable-tuple :height 1.25))))
-   `(org-level-2 ((t (,@headline ,@variable-tuple :height 1.5))))
-   `(org-level-1 ((t (,@headline ,@variable-tuple :height 1.75))))
-   `(org-document-title ((t (,@headline ,@variable-tuple :height 2.0 :underline nil))))))
+(require 'mozc)
+(setq default-input-method 'japanese-mozc)
+(setq mozc-candidate-style 'echo-area)
+
+(keymap-global-set "C-c C-c" 'treemacs-select-window)
diff --git a/.config/doom/packages.el b/.config/doom/packages.el
index a4c8b61..fcffea5 100644
--- a/.config/doom/packages.el
+++ b/.config/doom/packages.el
@@ -8,7 +8,6 @@
 
 ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
 ;; (package! some-package)
-(package! org-bullets)
 
 ;; To install a package directly from a remote git repo, you must specify a
 ;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
@@ -49,3 +48,6 @@
 ;; (unpin! pinned-package another-pinned-package)
 ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
 ;; (unpin! t)
+
+(package! org-bullets)
+;(package! mozc) ;; I have no idea if this is busted or not