diff --git a/etc/elpaca-lock.el b/etc/elpaca-lock.el index 3e1c071..412473a 100644 --- a/etc/elpaca-lock.el +++ b/etc/elpaca-lock.el @@ -373,9 +373,9 @@ :inherit t :depth treeless :ref "492ef97c3f06232121139534aca3e6dc7f1d3a89")) (majutsu :source "elpaca-menu-lock-file" :recipe - (:source nil :protocol https :inherit t :depth treeless :type git - :host github :repo "0WD0/majutsu" :package "majutsu" :ref - "6cc6a9e458ac06f18f80cc29906ed499356c4b21")) + (:source "elpaca-menu-lock-file" :protocol https :inherit t :depth + treeless :type git :host github :repo "0WD0/majutsu" :package + "majutsu" :ref "6cc6a9e458ac06f18f80cc29906ed499356c4b21")) (marginalia :source "elpaca-menu-lock-file" :recipe (:package "marginalia" :repo "minad/marginalia" :fetcher github :files diff --git a/init.el b/init.el index a3a75ee..4baf74c 100644 --- a/init.el +++ b/init.el @@ -314,7 +314,8 @@ :defer t :init (setq ediff-window-setup-function 'ediff-setup-windows-plain - ediff-split-window-function 'split-window-horizontally) + ediff-split-window-function 'split-window-horizontally + ediff-recurse-to-subdirectories t) (add-hook 'ediff-after-quit-hook-internal 'winner-undo)) ;;; Smartparens @@ -1032,6 +1033,11 @@ current project." (use-package terraform-mode :mode ("\\.tf\\'" . terraform-mode)) +(use-package dockerfile-mode + :defer t + :ensure t) + + (use-package typst-ts-mode) ;;; init.el ends here