.

1 files changed, 21 insertions, 21 deletions

diff --git a/home/dots/.emacs b/home/dots/.emacs
index 9e59413..75637de 100644
--- a/home/dots/.emacs
+++ b/home/dots/.emacs
@@ -127,6 +127,7 @@
     				     (concat (substring exwm-title 0 49) "..."))))))))
 
 (use-package diminish :ensure t)
+
 (use-package ediff
   :custom
   (ediff-window-setup-function #'ediff-setup-windows-plain)
@@ -227,7 +228,7 @@
   (("C-x 5 t" . 'transpose-frame)))
 
 (use-package ffap
-  :demand t
+  :defer t
   :bind
   (("C-x C-f" . find-file-at-point))
   :init
@@ -235,20 +236,26 @@
   :config
   (setq ffap-require-prefix nil))
 
+(use-package tldr
+  :ensure t
+  :defer t)
+
 (use-package time
   :init
   (display-time-mode)
   :config
-  (setq display-time-format "%a, %d/%m/%Y %H:%M"))
+  (setq display-time-format "%a, %F %R"))
 
 (use-package geiser
   :ensure t
+  :defer t
   :init
   (with-eval-after-load 'geiser-guile
     (add-to-list 'geiser-guile-load-path "~/dev/nonguix")
     (keymap-set geiser-mode-map "C-." nil)))
 
 (use-package corfu
+  :defer t
   ;; Optional customizations
   :custom
   (corfu-cycle t)                ;; Enable cycling for `corfu-next/previous'
@@ -288,7 +295,7 @@
 (use-package frame
   :custom
   (window-divider-default-right-width 2)
-  :config
+  :init
   (window-divider-mode))
 
 (use-package window
@@ -393,16 +400,12 @@
   :custom
   (imenu-auto-rescan t))
 
-
-
 (defun sudo-shell-command (command)
   (interactive "MShell command (root): ")
   (with-temp-buffer
     (cd "/sudo::/")
     (async-shell-command command)))
 
-
-
 (use-package nov
   :defer t
   :ensure t
@@ -486,6 +489,7 @@
 	 ("+" . image-increase-size))))
 
 (use-package enwc
+  :demand t
   :ensure t
   :custom
   (enwc-default-backend 'nm)
@@ -660,6 +664,7 @@
 		   (define-key flymake-mode-map (kbd "C-c [") 'flymake-goto-prev-error)))))
 
 (use-package expand-region
+  :defer t
   :ensure t
   :bind
   ("C-." . er/expand-region)
@@ -667,17 +672,10 @@
 
 (use-package devdocs
   :ensure t
+  :defer t
   :bind
   ("C-h D" . devdocs-lookup))
 
-(use-package custom-keymaps
-  :load-path "elisp"
-  :config
-  (keymaps-mode)
-  :bind
-  (:map keymaps-mode-map
-	("C-." . er/expand-region)))
-
 (use-package guix
   :ensure t
   :bind
@@ -703,10 +701,15 @@
   (add-to-list 'auto-mode-alist '("\\.njk\\'" . html-mode))
   (add-to-list 'auto-mode-alist '("\\.tmpl\\'" . html-mode))
   (add-to-list 'auto-mode-alist '("\\.js.tmpl\\'" . javascript-mode))
-  :config
-  (define-key html-mode-map (kbd "M-<TAB>") nil)
-  (define-key html-mode-map (kbd "M-o") nil)	      
+  :bind
+  (:map html-mode-map
+	("M-<TAB>" . nil)
+	("M-<TAB>" . nil))
   :hook
+  (javascript-mode . (lambda ((interactive)
+		       (setq-local tab-width 2)
+		       (setq sgml-basic-offset 2
+			     indent-tabs-mode t))))
   (css-mode . (lambda ((interactive)
 		       (setq-local tab-width 2)
 		       (setq sgml-basic-offset 2
@@ -900,9 +903,6 @@
       :nick "mccd"
       :password libera-chat-pass))))
 
-(use-package ob-rec
-  :ensure nil)
-
 ;; Org
 (use-package org
   :ensure t