diff --git a/custom.el b/custom.el index 4484fbb..e5a9cea 100644 --- a/custom.el +++ b/custom.el @@ -4,7 +4,9 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(custom-safe-themes - '("5f79df6b4c56021d173c178d90b5a600c678a192d78cc639553915985b67c4ea" "8cda1cfae8e393bfb23f1d448d4be10720835d086f7db080908a7c8d01566516" "a27f7b52fe66bacaec9059f8afd04d055a4ac3c2fba9eb9128c81e10152fc566" "1ba7196d8e7b883272ea8818a5163aec21b57023368febf55255816226f7b370" "8256e7e03444834d34915a226dc24933b0d680a0a1da568ec03f852be776f168" "4ac2f45e6b46e5bb50826d4250df71a57124169b82cc0ad75e436de6e70a9690" "29addd67feb95ca1179e60d476bb92c1f11835548e2efaec15c9ac6af2a8e6a8" "9b7a425c38c4894e161887c26381c2a6fc1de3c1407158507caaf469d76eb27b" "bce055e1681dd343659957710af77f7a6ad106677d42c61f86ebeedf637c4493" "f62c69472d3f506179d797131c014fe4095d9609dddf14542c50e0388f1e8d6d" "cf143bf23fa8160f87331893cdadc40b876556634621dfa373fcf93c4c97c444" "f459dfd377e9cb98d90e53383dcca7d73396cc0a22b31d39af24fb1cf3548fb5" "fcc14e1a22c99d77f7b1455b0c8a320f8afd0c1f4a9c5c50b45f676eb0c54ba2" "a6bae299481c3c0058e611d2c32ca169fa27203345a880806a5a8554cdd2e588" "feb9556e03558588e29e6659c8e01ea3d2a17a1e7a13e9bf9fc9e59cacba4b72" default))) + '("5f79df6b4c56021d173c178d90b5a600c678a192d78cc639553915985b67c4ea" "8cda1cfae8e393bfb23f1d448d4be10720835d086f7db080908a7c8d01566516" "a27f7b52fe66bacaec9059f8afd04d055a4ac3c2fba9eb9128c81e10152fc566" "1ba7196d8e7b883272ea8818a5163aec21b57023368febf55255816226f7b370" "8256e7e03444834d34915a226dc24933b0d680a0a1da568ec03f852be776f168" "4ac2f45e6b46e5bb50826d4250df71a57124169b82cc0ad75e436de6e70a9690" "29addd67feb95ca1179e60d476bb92c1f11835548e2efaec15c9ac6af2a8e6a8" "9b7a425c38c4894e161887c26381c2a6fc1de3c1407158507caaf469d76eb27b" "bce055e1681dd343659957710af77f7a6ad106677d42c61f86ebeedf637c4493" "f62c69472d3f506179d797131c014fe4095d9609dddf14542c50e0388f1e8d6d" "cf143bf23fa8160f87331893cdadc40b876556634621dfa373fcf93c4c97c444" "f459dfd377e9cb98d90e53383dcca7d73396cc0a22b31d39af24fb1cf3548fb5" "fcc14e1a22c99d77f7b1455b0c8a320f8afd0c1f4a9c5c50b45f676eb0c54ba2" "a6bae299481c3c0058e611d2c32ca169fa27203345a880806a5a8554cdd2e588" "feb9556e03558588e29e6659c8e01ea3d2a17a1e7a13e9bf9fc9e59cacba4b72" default)) + '(package-selected-packages + '(sage-shell-mode ess lsp-dart dart-mode org-roam-bibtex org-roam-ui org-roam gnuplot auctex ox-reveal ox-pandoc pdf-tools helm-bibtex org-ref org geiser-racket rainbow-delimiters slint-mode rust-mode company-ghci lsp-haskell haskell-mode poetry python-mode yaml-mode d2-mode php-mode web-mode dap-mode flycheck lsp-ui lsp-mode company which-key nix-mode direnv magit exec-path-from-shell esup gcmh transient-dwim leaf-convert leaf-tree blackout hydra el-get leaf-keywords))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/flake.nix b/flake.nix index 9da48fe..f6551bb 100644 --- a/flake.nix +++ b/flake.nix @@ -25,13 +25,13 @@ }; in { packages = { - me-emacs = mkEmacs pkgs "emacs29" false; - me-emacs-wayland = mkEmacs pkgs "emacs29" true; + me-emacs = mkEmacs pkgs "emacs" false; + me-emacs-wayland = mkEmacs pkgs "emacs" true; }; })) // { overlays.default = final: prev: (emacs-overlay.overlays.default final prev) // { - me-emacs = mkEmacs final "emacs29" false; - me-emacs-wayland = mkEmacs final "emacs29" true; + me-emacs = mkEmacs final "emacs" false; + me-emacs-wayland = mkEmacs final "emacs" true; }; }; } diff --git a/main.org b/main.org index b243efb..0b6244c 100644 --- a/main.org +++ b/main.org @@ -362,6 +362,14 @@ Makes using racket so much nicer (leaf geiser-racket :ensure t) #+end_src +** Clojure + +For using clojure, we use both [[https://github.com/clojure-emacs/clojure-mode][clojure-mode]] and for REPL we use [[https://github.com/clojure-emacs/cider][CIDER]]. + +#+begin_src elisp :tangle yes :exports code +(leaf clojure-mode :ensure t cider) +#+end_src + * Org We ensure that org is available (though it is builtin)