Skip to content

Commit

Permalink
Revert "Use aggressive-indent-mode with clojure-mode"
Browse files Browse the repository at this point in the history
because it is a little too aggressive. I can't add extra newlines
between expressions if I need to! Apparently, it also clashes with
lsp-mode, as per Practicalli's comment here, under "CIDER format
tools": https://practical.li/spacemacs/improving-code/formatting/

This reverts commit a746980.
  • Loading branch information
adityaathalye committed May 3, 2024
1 parent a746980 commit f1d3e7d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion custom.el
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(package-selected-packages
'(aggressive-indent gnu-elpa-keyring-update edit-indirect treemacs typescript-mode elfeed crux treemacs-projectile separedit lsp-treemacs sqlformat zeal-at-point clj-deps-new org-tree-slide ox-asciidoc ob-kotlin ob-clojurescript ob-sql-mode ob-http adoc-mode js2-mode json-mode web-mode clj-refactor cider clojure-mode lsp-ivy lsp-ui lsp-mode flycheck yasnippet-snippets yasnippet projectile magit smartparens wgrep multiple-cursors expand-region company rotate golden-ratio key-chord ace-window which-key ivy-rich counsel amx super-save esup command-log-mode helpful blackout use-package exec-path-from-shell)))
'(gnu-elpa-keyring-update edit-indirect treemacs typescript-mode elfeed crux treemacs-projectile separedit lsp-treemacs sqlformat zeal-at-point clj-deps-new org-tree-slide ox-asciidoc ob-kotlin ob-clojurescript ob-sql-mode ob-http adoc-mode js2-mode json-mode web-mode clj-refactor cider clojure-mode lsp-ivy lsp-ui lsp-mode flycheck yasnippet-snippets yasnippet projectile magit smartparens wgrep multiple-cursors expand-region company rotate golden-ratio key-chord ace-window which-key ivy-rich counsel amx super-save esup command-log-mode helpful blackout use-package exec-path-from-shell)))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
Expand Down
8 changes: 1 addition & 7 deletions init.el
Original file line number Diff line number Diff line change
Expand Up @@ -747,11 +747,6 @@ and for auto-saves we can restore from.")
:bind (:map global-map
("\C-c z" . 'zeal-at-point)))

(use-package aggressive-indent-mode
;; https://github.com/Malabarba/aggressive-indent-mode
;; cf. additional packages recommended by clojure-mode
)

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Programming languages
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Expand Down Expand Up @@ -876,8 +871,7 @@ and for auto-saves we can restore from.")
;; Hook into subword-mode to work with CamelCase tokens like Java classes
;; h/t suvratapte/dot-emacs-dot-d
:hook ((clojure-mode . subword-mode)
(clojure-mode . yas-minor-mode)
(clojure-mode . aggressive-indent-mode))
(clojure-mode . yas-minor-mode))

:config
(setq clojure-indent-style 'always-align)
Expand Down

0 comments on commit f1d3e7d

Please sign in to comment.