summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emacs/.config/emacs-kj/init.el29
-rwxr-xr-xsetup.sh29
2 files changed, 41 insertions, 17 deletions
diff --git a/emacs/.config/emacs-kj/init.el b/emacs/.config/emacs-kj/init.el
index bc40e6c..f696efe 100644
--- a/emacs/.config/emacs-kj/init.el
+++ b/emacs/.config/emacs-kj/init.el
@@ -27,9 +27,9 @@
(use-package straight
:custom (straight-use-package-by-default t))
-(let ((my-font "Iosevka-18"))
- (set-face-attribute 'default t :font my-font)
- (set-frame-font my-font))
+;; (let ((my-font "Iosevka-18"))
+;; (set-face-attribute 'default t :font my-font)
+;; (set-frame-font my-font))
(set-default-coding-systems 'utf-8)
;; Backup file settings.
@@ -317,6 +317,29 @@
(setq org-confirm-babel-evaluate nil)
(require 'org-tempo))
+(use-package mixed-pitch
+ ;; :hook
+ ;;(text-mode . mixed-pitch-mode)
+ ;;(org-mode . mixed-pitch-mode)
+ )
+
+(set-face-attribute 'default nil :font "Noto Serif" :height 150)
+(set-face-attribute 'fixed-pitch nil :font "Iosevka" :height 180)
+(set-face-attribute 'variable-pitch nil :font "Noto Serif")
+
+(defun kj/set-fixed-pitch ()
+ (interactive)
+ (setq buffer-face-mode-face 'fixed-pitch)
+ (buffer-face-mode +1))
+
+(defun kj/org-pitch ()
+ (interactive)
+ (kj/set-fixed-pitch)
+ (mixed-pitch-mode +1))
+
+(add-hook 'eshell-mode-hook #'kj/set-fixed-pitch)
+(add-hook 'org-mode-hook #'kj/org-pitch)
+
(use-package ob-async)
(use-package direnv
diff --git a/setup.sh b/setup.sh
index 21c7385..5d0f3ad 100755
--- a/setup.sh
+++ b/setup.sh
@@ -9,6 +9,21 @@ git submodule update --init --recursive --depth 1
touch ~/.zshrc.local
touch ~/.zshenv.local
+echo "Cloning Chemacs2"
+if [[ ! -e ~/.config/emacs ]]; then
+ git clone https://github.com/plexus/chemacs2.git ~/.config/emacs
+fi
+
+echo "Cloning doom"
+doom_path=~/build/doom-emacs
+if which emacs >/dev/null && [[ ! -e $doom_path ]]; then
+ unset DOOMDIR
+ unset EMACSDIR
+ git clone --depth 1 https://github.com/hlissner/doom-emacs $doom_path
+ $doom_path/bin/doom install
+ $doom_path/bin/doom sync # Too slow!
+fi
+echo "Stow"
$STOW common
$STOW zsh
$STOW direnv
@@ -29,20 +44,6 @@ if [[ $# -ge 1 && $1 == "fast" ]]; then
exit
fi
-if [[ ! -e ~/.config/emacs ]]; then
- git clone https://github.com/plexus/chemacs2.git ~/.config/emacs
-fi
-
-doom_path=~/build/doom-emacs
-if which emacs >/dev/null && [[ ! -e $doom_path ]]; then
- git clone https://github.com/plexus/chemacs2.git ~/.config/emacs
- unset DOOMDIR
- unset EMACSDIR
- git clone --depth 1 https://github.com/hlissner/doom-emacs $doom_path
- $doom_path/bin/doom install
- $doom_path/bin/doom sync # Too slow!
-fi
-
fc-cache || true
tools=(