[emacs] cleanup

1 files changed, 27 insertions, 34 deletions

diff --git a/emacs/inits/20-programming.el b/emacs/inits/20-programming.el
index 01d3c18..02f95ed 100644
--- a/emacs/inits/20-programming.el
+++ b/emacs/inits/20-programming.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2024-07-07 13h51 BST (0fb87241)>
+;; Time-stamp: <2024-07-13 15h00 CEST (471b3659)>
 
 ;; -----------------------------------------------------------------------------
 ;; General setup
@@ -21,18 +21,22 @@
   (align-regexp begin end "\\(\\s-*\\)=" 1 1 ))
 
 (use-package eglot
+  :defer
   :config
   (add-to-list 'eglot-server-programs
                '(bqn-mode . ("bqnlsp"))))
 
 (use-package centered-window
-  :ensure t)
+  :defer
+  :ensure)
 
 (use-package hideshow
+  :defer
   :bind (("C-c C-f C-f" . hs-toggle-hiding)))
 
 (use-package dtrt-indent
-  :ensure t
+  :ensure
+  :defer
   :config
   (dtrt-indent-global-mode t))
 
@@ -48,7 +52,7 @@
   (setq auto-hscroll-mode t)
   (when (not (eq major-mode 'python-mode))
     (keymap-set (current-local-map) "M-/" 'completion-at-point))
-  (yas-minor-mode-on))
+  )
 
 (add-hook 'prog-mode-hook #'programming-setup)
 
@@ -56,24 +60,20 @@
 ;; Specific packages
 
 (use-package comment-dwim-2
-  :ensure t
+  :ensure
+  :defer
   :bind (("M-;" . comment-dwim-2))
   :config (setq comment-multi-line t
                 comment-style 'extra-line))
 
 (use-package aggressive-indent
-  :ensure t
-  :defer t
+  :ensure
+  :defer
   :config
   (setq aggressive-indent-sit-for-time 1))
 
-(use-package yasnippet
-  :ensure t
-  :defer t
-  :commands yas-minor-mode-on)
-
 (use-package elec-pair
-  :defer t
+  :defer
   :config
   (setq electric-pair-delete-adjacent-pairs t
         electric-pair-skip-self 'electric-pair-default-skip-self
@@ -85,13 +85,13 @@
 ;; C
 
 (use-package clang-format
-  :ensure t
+  :ensure
   :defer
   :config
   (setq clang-format-style "file"))
 
 (use-package cc-mode
-  :defer t
+  :defer
   :bind (:map c-mode-map
               ("M-m" . lh-matching-delim))
   :hook ((c-mode c++-mode) . (lambda ()
@@ -189,7 +189,7 @@
 ;; Python
 
 (use-package python-black
-  :ensure t
+  :defer
   :after python
   :config
   (setq python-black-extra-args '("-l120"))
@@ -197,8 +197,8 @@
   )
 
 (use-package highlight-indent-guides
-  :ensure t
-  :defer t
+  :ensure
+  :defer
   :config
   (setq highlight-indent-guides-auto-odd-face-perc 3
         highlight-indent-guides-auto-even-face-perc 5))
@@ -215,12 +215,12 @@
 ;; Rust
 
 (use-package cargo
-  :ensure t
-  :defer t)
+  :ensure
+  :defer)
 
 (use-package rust-mode
-  :ensure t
-  :defer t
+  :ensure
+  :defer
   :bind (:map rust-mode-map
               ("M-," . lh-backward-delim)
               ("M-." . lh-forward-delim)
@@ -245,16 +245,9 @@
 ;; -------------------------------------------------------------------
 ;; Misc languages
 
-(add-to-list 'auto-mode-alist
-             '("\\.jinja\\'" . (lambda ()
-                                 (text-mode)
-                                 (auto-fill-mode -1)
-                                 (programming-setup))))
-
 (use-package json-mode
-  :ensure t
-  :defer t
-  :mode (("\\.json\\.jinja\\'" . json-mode))
+  :ensure
+  :defer
   :hook (json-mode . (lambda ()
                        (programming-setup)
                        (setq standard-indent 2)
@@ -266,7 +259,7 @@
 
 (use-package zig-mode
   :ensure t
-  :defer t
+  :defer
   :hook (zig-mode . (lambda () (eglot-ensure)))
   :init
   (defun my-zig-run ()
@@ -283,11 +276,11 @@
               ("C-c C-r" . my-zig-run)))
 
 (use-package uiua-ts-mode
-  :ensure t
+  :ensure
   :defer)
 
 (use-package bqn-mode
-  :ensure t
+  :ensure
   :defer
   :bind (:map bqn-mode-map
               ("M-TAB" . expand-abbrev)