Merge branch 'master' of dragon.orbekk.com:/storage/projects/dotfiles

2 files changed, 36 insertions, 10 deletions

diff --git a/emacs/.config/emacs-kj/development.el b/emacs/.config/emacs-kj/development.el
index 81a94c9..5d7ea7c 100644
--- a/emacs/.config/emacs-kj/development.el
+++ b/emacs/.config/emacs-kj/development.el
@@ -11,6 +11,8 @@
    ;; Prevent automatic syntax checking, which was causing lags and stutters.
    ;; eglot-send-changes-idle-time (* 60 60)
    )
+  :hook
+  (rustic-mode . eglot-ensure)
   ;; Disable the annoying doc popups in the minibuffer.
   ;; (add-hook 'eglot-managed-mode-hook (lambda () (eldoc-mode -1)))
   )
diff --git a/emacs/.config/emacs-kj/init.el b/emacs/.config/emacs-kj/init.el
index 4a74a97..46956af 100644
--- a/emacs/.config/emacs-kj/init.el
+++ b/emacs/.config/emacs-kj/init.el
@@ -19,6 +19,9 @@
 
 (server-start)
 
+(setq custom-file (expand-file-name "emacs-custom.el" user-emacs-directory))
+(load custom-file)
+
 (defalias 'yes-or-no-p 'y-or-n-p)
 
 (straight-use-package 'use-package)
@@ -52,10 +55,20 @@
   (tool-bar-mode -1)
   (scroll-bar-mode -1)
   (tooltip-mode -1)
-  (menu-bar-mode -1))
+  (menu-bar-mode -1)
+  (use-package all-the-icons
+    :if (display-graphic-p)))
+(setq inhibit-compacting-font-caches t)
 (setq use-dialog-box nil)
-;; (global-whitespace-mode)
-;; (setq whitespace-style '(face trailing))
+
+(use-package doom-modeline
+  :ensure t
+  :init (doom-modeline-mode 1))
+
+(use-package emojify
+  :bind
+  (("C-c C-i C-e" . emojify-insert-emoji))
+  :hook (after-init . global-emojify-mode))
 
 (setq show-trailing-whitespace t)
 
@@ -112,6 +125,7 @@
   :bind (:map company-active-map
               ("C-n" . company-select-next)
               ("C-p" . company-select-previous))
+  :hook (eglot-managed-mode . company-mode)
   :config
   (setq company-idle-delay nil)
   (global-company-mode t))
@@ -126,7 +140,7 @@
 (use-package marginalia
   :bind
   (:map minibuffer-local-map
-   ("M-n" . marginalia-cycle))
+	("M-n" . marginalia-cycle))
   :init
   (marginalia-mode))
 
@@ -161,6 +175,7 @@
 ;; For recent files.
 (recentf-mode 1)
 (run-at-time nil (* 5 60) 'recentf-save-list)
+(setq recentf-max-saved-items 1000)
 
 ;; Example configuration for Consult
 (use-package consult
@@ -279,7 +294,7 @@
   ;; (setq consult-project-function (lambda (_) (vc-root-dir)))
   ;;;; 4. locate-dominating-file
   ;; (setq consult-project-function (lambda (_) (locate-dominating-file "." ".git")))
-)
+  )
 
 (use-package orderless
   :ensure t
@@ -292,7 +307,15 @@
   (which-key-mode))
 
 (use-package magit)
-(use-package org)
+(use-package org
+  :config
+  (org-babel-do-load-languages 'org-babel-load-languages
+			       '((emacs-lisp . t)
+				 (shell . t)))
+  (setq org-confirm-babel-evaluate nil)
+  (require 'org-tempo))
+
+(use-package ob-async)
 
 (use-package direnv
   :config
@@ -486,9 +509,9 @@
 (defvar kj/publish-directory "/ssh:orbekk@dragon.orbekk.com:/storage/srv/kj.orbekk.com")
 (add-to-list 'org-modules 'org-habit)
 
-; (setq org-appear-autolinks t)
-; (use-package! org-appear
-;   :hook (org-mode . org-appear-mode))
+					; (setq org-appear-autolinks t)
+					; (use-package! org-appear
+					;   :hook (org-mode . org-appear-mode))
 
 (setq org-log-done 'time)
 (setq org-todo-keywords
@@ -565,7 +588,8 @@
    ("C-c C-r C-e" . consult-flymake)
    ("C-c C-r C-f" . eglot-format)
    ("C-c C-r C-a" . eglot-code-actions)
-   ("C-<tab>" . company-complete)))
+   ("C-c C-i C-c" . insert-char)
+   ("C-<tab>" . company-mode)))
 
 (let ((google-config-file
        (expand-file-name "google.el" user-emacs-directory)))