diff options
Diffstat (limited to 'emacs/.config/emacs-kj/init.el')
| -rw-r--r-- | emacs/.config/emacs-kj/init.el | 46 |
1 files changed, 32 insertions, 14 deletions
diff --git a/emacs/.config/emacs-kj/init.el b/emacs/.config/emacs-kj/init.el index 3e10e47..b771a0c 100644 --- a/emacs/.config/emacs-kj/init.el +++ b/emacs/.config/emacs-kj/init.el @@ -14,6 +14,8 @@ (eval-print-last-sexp))) (load bootstrap-file nil 'nomessage)) +(push (expand-file-name "lisp" user-emacs-directory) load-path) + (setq user-full-name "KJ Orbekk" user-mail-address "kj@orbekk.com") @@ -23,8 +25,6 @@ (format-time-string "%F %T %z" startup-time))) (setq inhibit-startup-message t) -(server-start) - (setq custom-file (expand-file-name "emacs-custom.el" user-emacs-directory)) (load custom-file :noerror t) @@ -75,10 +75,6 @@ (setq alert-default-style 'libnotify) (when window-system - (tool-bar-mode -1) - (scroll-bar-mode -1) - (tooltip-mode -1) - (menu-bar-mode -1) (use-package all-the-icons :if (display-graphic-p))) (setq inhibit-compacting-font-caches t) @@ -382,10 +378,13 @@ (org-mode . mixed-pitch-mode) ) -(set-face-attribute 'default nil :font "Iosevka" :height 150) -(unless (equal system-name "minideck") - (set-face-attribute 'fixed-pitch nil :font "Iosevka" :height 150) - (set-face-attribute 'variable-pitch nil :font "Noto Serif")) +(custom-set-faces + `(variable-pitch ((t (:family "Noto Serif" :height 150)))) + `(default ((t (:family "Iosevka" :height 150))))) + +;; (unless (equal system-name "minideck") +;; (set-face-attribute 'fixed-pitch nil :font "Iosevka" :height 150) +;; (set-face-attribute 'variable-pitch nil :font "Noto Serif")) (setq compilation-ask-about-save nil) (use-package ob-async) @@ -551,8 +550,17 @@ ;; Org (add-to-list 'org-export-backends 'md) -(load-file (locate-user-emacs-file "development.el")) -(load-file (locate-user-emacs-file "eshell.el")) +(require 'kj-development) +(require 'kj-eshell) + +(defun kj/modules (module-directory) + (cl-loop for path in (f-files module-directory) + if (string-match "\\([^/]*\\).el" path) + collect (intern (match-string 1 path)))) + +(dolist (module (kj/modules + (expand-file-name "lisp" user-emacs-directory))) + (require module)) (setq math-additional-units '((ZiB "1024 * EiB" "Zebibyte") @@ -697,9 +705,15 @@ (unbind-key "M-r" paredit-mode-map) (unbind-key "M-s" paredit-mode-map)))) +(defun kj/kill-word-or-region (arg) + (interactive "p") + (if (region-active-p) + (kill-region (region-beginning) (region-end)) + (backward-kill-word (or arg 1)))) + (use-package emacs :bind - (("C-w" . backward-kill-word) + (("C-w" . kj/kill-word-or-region) ("C-c d" . kill-region) ("C-c m" . smerge-ediff) ("C-c b r" . revert-buffer) @@ -900,7 +914,7 @@ buffer (append (if (> (frame-width) 160) '((side . right) - (window-width . 80)) + (window-width . 85)) '((side . bottom) (window-height . 0.5))) alist))) @@ -930,3 +944,7 @@ ;; Enabled commands (put 'narrow-to-region 'disabled nil) +(put 'downcase-region 'disabled nil) + +;; Restore gc. +(setq gc-cons-threshold (* 16 1024 1024)) |