From fa12655fb4a391e9a1ab62f05d7271c45e853ef4 Mon Sep 17 00:00:00 2001 From: "DavidCrompton1192@gmail.com" Date: Wed, 16 Aug 2023 20:26:46 -0400 Subject: [PATCH] Tangle & Cleanup --- .gitignore | 1 + flake.nix | 7 ------ main.org | 64 +++++++++++++++++++++++++++--------------------------- 3 files changed, 33 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 1b31600..9dab4e3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ tramp /main.el /result /transient/ +/BROWSE diff --git a/flake.nix b/flake.nix index 41d074b..429e5bd 100644 --- a/flake.nix +++ b/flake.nix @@ -19,12 +19,5 @@ package = pkgs.emacs29; }; }; - devShells = { - default = pkgs.mkShell { - packages = with pkgs; [ - - ]; - }; - }; }); } diff --git a/main.org b/main.org index bbcd786..e0843f4 100644 --- a/main.org +++ b/main.org @@ -12,7 +12,7 @@ We must initialize =leaf.el=, which we use as a use-package replacement for defining configs for different things. -#+begin_src elisp +#+begin_src elisp :tangle yes ;; (eval-and-compile (customize-set-variable @@ -43,7 +43,7 @@ replacement for defining configs for different things. :bind (("M-=" . transient-dwim-dispatch))) #+end_src -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf custom-el :config ;; Ensure custom writes to specific file @@ -51,7 +51,7 @@ replacement for defining configs for different things. (load custom-file 'noerror 'nomessage)) #+end_src -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf backup :config ;; Change the location of file backups/locks into the emacs.d/backups/ @@ -61,7 +61,7 @@ replacement for defining configs for different things. * Visual Customization -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf visual :doc "Visual Changes to Emacs" :tag "builtin" "internal" @@ -84,7 +84,7 @@ replacement for defining configs for different things. Exec-path-from-shell ensures that path variable is preserved from shell. -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf exec-path-from-shell :ensure t :config (exec-path-from-shell-initialize)) @@ -96,7 +96,7 @@ shell. Font related ligatures, combining multiple characters into "one". -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf ligature :ensure t :config @@ -125,12 +125,12 @@ Font related ligatures, combining multiple characters into "one". #+end_src ** Profiling -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf esup :disabled nil :ensure t) #+end_src ** Version Control -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf magit :ensure t :require t) #+end_src @@ -139,7 +139,7 @@ Font related ligatures, combining multiple characters into "one". *** Direnv In order to support direnv (loading =nix-shell= / =nix develop=) -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf direnv :ensure t :hook @@ -149,7 +149,7 @@ In order to support direnv (loading =nix-shell= / =nix develop=) *** Nix-mode =.nix= file mode -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf nix-mode :ensure t) #+end_src @@ -157,7 +157,7 @@ In order to support direnv (loading =nix-shell= / =nix develop=) We all know the web is the future, obviously, of course. -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf web-mode :ensure t :mode @@ -171,13 +171,13 @@ We all know the web is the future, obviously, of course. ** D2 -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf d2-mode :ensure t) #+end_src ** YAML -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf yaml-mode :ensure t) #+end_src @@ -186,7 +186,7 @@ We all know the web is the future, obviously, of course. We like autocomplete, it... is nice, okay? -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf company :ensure t :bind (("C-" . company-complete)) @@ -197,7 +197,7 @@ We like autocomplete, it... is nice, okay? We love language features that make languages nice -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf lsp-mode :ensure t :init @@ -226,7 +226,7 @@ We love language features that make languages nice :config (which-key-mode))) #+end_src **** Projectile (Projects) -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf projectile :commands projectile-mode :config @@ -238,7 +238,7 @@ We love language features that make languages nice Using python-mode is to have more up to date features (and highlighting) compared to builtin python-mode. -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf python-mode :ensure t :config (setq python-shell-interpreter "ipython" @@ -248,46 +248,46 @@ highlighting) compared to builtin python-mode. For when we aren't nix'ing things, and want some nice poetry. -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf poetry :ensure t) #+end_src ** Java LSP for java is /nice/. -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf lsp-java :hook (java-mode-hook . lsp)) #+end_src ** C Who even needs C++, not me, no way, no how. -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf company-ctags :ensure t) (leaf company-c-headers :ensure t) (leaf meson-mode :ensure t) #+end_src ** Haskell -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf haskell-mode :ensure t :config (leaf lsp-haskell :ensure t) (leaf company-ghci :ensure t)) #+end_src ** Rust -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf rust-mode :ensure t) #+end_src ** Minecraft?? Minecraft =mcfunction= support, because, it can be annoying to type this stuff otherwise. -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf mcf-mode :el-get rasensuihei/mcf) #+end_src ** Lisps Gonna need to have pretty brackets -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf rainbow-delimiters :ensure t :commands rainbow-delimiters-mode @@ -299,7 +299,7 @@ Gonna need to have pretty brackets *** Racket Makes using racket so much nicer -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf geiser-racket :ensure t) #+end_src ** Org @@ -307,7 +307,7 @@ Makes using racket so much nicer We use org-ref because it provides some niceties, like doi-utils for updating our bibliography. -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf ivy-bibtex :ensure t) (leaf helm-bibtex :ensure t) (leaf org-ref :ensure t @@ -319,14 +319,14 @@ updating our bibliography. #+end_src For more export formats we use pandoc: -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf ox-pandoc :ensure t :after org) #+end_src Nicer LaTeX editing (AuCTeX): -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf auctex :ensure t :after org) #+end_src @@ -334,7 +334,7 @@ Nicer LaTeX editing (AuCTeX): We also ma(k|d)e use of org-tempo for templating things, which can be nice. Should use the export based templating probably. Eventually. -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf org-cfg :after org :require org-ref oc-csl org-tempo ox-latex ox-pandoc @@ -410,17 +410,17 @@ nice. Should use the export based templating probably. Eventually. And in case we want to make some (GNU)?plots? -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf gnuplot :ensure t) #+end_src ** Flutter -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf dart-mode :ensure t) (leaf lsp-dart :ensure t) #+end_src ** BQN -#+begin_src elisp +#+begin_src elisp :tangle yes (leaf bqn-mode :el-get "museoa/bqn-mode" :config