From 520aebd55edb4f467b4d86228ecf8cd640525c78 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 24 Dec 2018 15:33:17 -0500 Subject: [PATCH] [emacs][wip] enable some programming modes and update versions --- init.org | 38 ++++++++++++++++++------------------ straight/versions/default.el | 17 +++++++++++++++- 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/init.org b/init.org index 1d6b1f9..d3f3a64 100644 --- a/init.org +++ b/init.org @@ -1303,18 +1303,6 @@ Automatically save place in each file. (text-mode . abbrev-mode))) #+end_src -** =lisp-mode= - -#+begin_src emacs-lisp -(use-feature lisp-mode - :config - (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode) - (add-hook 'emacs-lisp-mode-hook 'reveal-mode) - (defun indent-spaces-mode () - (setq indent-tabs-mode nil)) - (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode)) -#+end_src - ** Company #+begin_src emacs-lisp @@ -1378,15 +1366,28 @@ Automatically save place in each file. #'endless/replace-quote)) #+end_src -* COMMENT Programming modes +* Programming modes :PROPERTIES: :CUSTOM_ID: programming-modes :END: +** Lisp + +#+begin_src emacs-lisp +(use-feature lisp-mode + :config + (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode) + (add-hook 'emacs-lisp-mode-hook 'reveal-mode) + (defun indent-spaces-mode () + (setq indent-tabs-mode nil)) + (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode)) +#+end_src + ** [[http://alloytools.org][Alloy]] (with [[https://github.com/dwwmmn/alloy-mode][alloy-mode]]) #+begin_src emacs-lisp (use-package alloy-mode + :straight (:host github :repo "dwwmmn/alloy-mode") :defer t :config (setq alloy-basic-offset 2)) #+end_src @@ -1394,9 +1395,8 @@ Automatically save place in each file. ** [[https://coq.inria.fr][Coq]] (with [[https://github.com/ProofGeneral/PG][Proof General]]) #+begin_src emacs-lisp -(use-package proof-site ; Proof General - :defer t - :load-path "lib/proof-site/generic/") +(use-package proof-general + :defer t) #+end_src ** [[https://leanprover.github.io][Lean]] (with [[https://github.com/leanprover/lean-mode][lean-mode]]) @@ -1606,7 +1606,7 @@ instead. ("C-c l l" . hs-lint))) #+end_src -** Web dev +** COMMENT Web dev *** SGML and HTML @@ -1733,7 +1733,7 @@ treemacs :after (treemacs)) #+end_src -** geiser +** COMMENT geiser #+begin_src emacs-lisp (use-package geiser) @@ -1743,7 +1743,7 @@ treemacs (setq geiser-guile-load-path "~/src/git/guix")) #+end_src -** guix +** COMMENT guix #+begin_src emacs-lisp (use-package guix diff --git a/straight/versions/default.el b/straight/versions/default.el index 2df0a79..33d04d1 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -1,14 +1,26 @@ -(("auto-compile" . "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f") +(("PG" . "f7cc8f1f76baf5e517e51f1db47510ed605064e8") + ("alloy-mode" . "0d05bdd10c77ec04c3d61eccf67e68c08284951f") + ("auto-compile" . "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f") ("cl-lib" . "deb92588d9d83d46c4698936ea31c5f58d244f04") + ("company-mode" . "b696b3943d2a55aed937cb0ba971d6e29b2e3a8b") + ("dante" . "8d5e00d268aa37d91baaa675cead953e58f19c6d") ("dash.el" . "6514359b8606a6a9a94068ccd601fcd6379d6584") + ("diff-hl" . "2cddce48d472111f178da84d44656f92012aa64b") ("emacs-async" . "81dc034572e963550c5403a2b3c28047e46b4029") ("epkgs" . "3e2b3cbada81bdb5e9b3f4bf185c7258f656b021") + ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6") ("exec-path-from-shell" . "9bc0f4a762f16d488376fb52409c58239a86d75d") ("f.el" . "de6d4d40ddc844eee643e92d47b9d6a63fbebb48") + ("flycheck" . "baf96df4d1c3e61bf62f15fbea05a880d1e49e45") + ("flycheck-haskell" . "32ddff87165a7d3a35e7318bee997b5b4bd41278") ("ghub" . "db15d00d01b8bd9187079a0b538d878d241743a8") ("git.el" . "a3396a7027a7d986598c6a2d6d5599bac918f3da") ("gnu-elpa-mirror" . "db6dd0677f0adac536ec6c575865770aa902c0a1") ("graphql.el" . "e2b309689f4faf9225f290080f836e988c5a576d") + ("haskell-mode" . "4aa88752ab23bca3ded36a9c9fd9c34cffbb129b") + ("hlint-refactor-mode" . "92c69aa01c65968e86c15db087bb1ea785e4736c") + ("lcr" . "c14f40692292d59156c7632dbdd2867c086aa75f") + ("lean-mode" . "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499") ("let-alist" . "4a7693b678c59a148660c736cc0bb26a5032ee9a") ("magit" . "d866fb3624bdeb87f0c56e359239e4474362d0af") ("magit-popup" . "8eaa0becc2370484a432a8a19f40ce5e8d0f1642") @@ -16,8 +28,11 @@ ("no-littering" . "4e7ecf017140bc522629cd2c977160f7cc2b8020") ("org" . "495c7c6a5774a4d3035c582a3b4c95eb04e83dd5") ("packed" . "c41c3dfda86ae33832ffc146923e2a4675cbacfa") + ("pkg-info.el" . "76ba7415480687d05a4353b27fea2ae02b8d9d61") ("s.el" . "03410e6a7a2b11e47e1fea3b7d9899c7df26435e") + ("seq" . "095fb15a3baa082079799dd36b6caccdb062cb90") ("straight.el" . "13d019dfc72e69cce58b510766e197b044ea823b") + ("swiper" . "201c5d78c4985fb803eb681cca0ccc5a4f90b717") ("treepy.el" . "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d") ("use-package" . "39a8b8812c2c9f6f0b299e6a04e504ef393694ce") ("with-editor" . "9dd9f176d96abc60365369de6d08c26c414ef1f3")) -- 2.20.1