diff options
Diffstat (limited to 'emacs.org')
| -rw-r--r-- | emacs.org | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/emacs.org b/emacs.org index a1234eb..bd3ac65 100644 --- a/emacs.org +++ b/emacs.org @@ -22,13 +22,13 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto ** The bases This is only better-defaults. It comes with ido-mode and some other defaults that I forgot to set in my init file that I stole from [[https://github.com/editor-bootstrap/emacs-bootstrap][emacs-bootstrap]] months ago - #+begin_src elisp :mkdirp yes :tangle emacsconfig/base.el + #+begin_src emacs-lisp :mkdirp yes :tangle emacsconfig/base.el (use-package better-defaults) #+end_src ** Generally nice emacs tools *** Magit Simple. Nice. default config. (almost) - #+begin_src elisp :tangle emacsconfig/extras.el + #+begin_src emacs-lisp :tangle emacsconfig/extras.el (use-package magit :defer t :config @@ -44,7 +44,7 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto *** IRC I use IRC in emacs, with ERC. There is even a small macro so that I can easily join new servers with my preferred nickname - #+begin_src elisp :tangle emacsconfig/extras.el + #+begin_src emacs-lisp :tangle emacsconfig/extras.el (use-package erc :custom (erc-server-reconnect-attempts 10) @@ -66,7 +66,7 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto #+end_src *** Dashboard Gives me access to the most recent files I edited, and some other stuff that I don't really care about - #+begin_src elisp :tangle emacsconfig/extras.el + #+begin_src emacs-lisp :tangle emacsconfig/extras.el (use-package dashboard :config (dashboard-setup-startup-hook)) #+end_src @@ -74,7 +74,7 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto I don't use elfeed in emacs that much anymore, as I have switched to [[https://www.seamonkey-project.org/][seamonkey]] for my RSS needs. Here is my old config anyways. If you want to browse through some default news feel free to remove the last =:custom= option - #+begin_src elisp :tangle emacsconfig/extras.el + #+begin_src emacs-lisp :tangle emacsconfig/extras.el (use-package elfeed :bind ("C-x w" . elfeed) @@ -115,7 +115,7 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto *** Evil mode I am originally a vim user, and the standard vim bindings have not left my hands yet, I am not a big configurer, so this is mostly just the standard configuration that [[https://github.com/emacs-evil/evil-collection#installation][evil-mode]] advices you to do - #+begin_src elisp :tangle emacsconfig/evil.el + #+begin_src emacs-lisp :tangle emacsconfig/evil.el (use-package evil :init (setq evil-want-integration t) ;; This is optional since it's already set to t by default. @@ -133,7 +133,7 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto To further prove that I have no intentions at all to be busy with making evil bindings for eveything I find I have also installed god-mode to help me do effortless keybinding for those programs that don't have evil support - #+begin_src elisp :tangle emacsconfig/evil.el + #+begin_src emacs-lisp :tangle emacsconfig/evil.el (use-package evil-god-state :bind ("M-," . evil-god-state-bail)) @@ -143,7 +143,7 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto **** Tree-sitter There is a pre-configured package that allows for easy tree-sitter support for a few languages. Nixos + tree-sitter is surprisingly painless, so I figured I'd just add it - #+begin_src elisp :tangle emacsconfig/evil.el + #+begin_src emacs-lisp :tangle emacsconfig/evil.el (use-package evil-tree-edit :hook (java-mode . evil-tree-edit-mode) @@ -151,7 +151,7 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto #+end_src *** Which-key Has god-mode support - #+begin_src elisp :tangle emacsconfig/extras.el + #+begin_src emacs-lisp :tangle emacsconfig/extras.el (use-package which-key :after god-mode :config @@ -164,7 +164,7 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto *** Company Generally nice for auto-completion anywhere. I think here is also the place to note that I am not a huge fan of language-servers, as I've had bad experiences with them when I was still using vim - #+begin_src elisp :tangle emacsconfig/extras.el + #+begin_src emacs-lisp :tangle emacsconfig/extras.el (use-package company :bind ("C-SPC" . company-complete)) @@ -172,7 +172,7 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto *** Matching of parentheses and other stuff "ERROR: Unmatched parenteses/braces/whatever" is really a thing I would prefer to never see again It has nix and lisp support, but other langages are fairly standards so not much configuration needed there - #+begin_src elisp :tangle emacsconfig/extras.el + #+begin_src emacs-lisp :tangle emacsconfig/extras.el (use-package smartparens :hook (emacs-lisp-mode . smartparens-mode) @@ -196,7 +196,7 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto ***** Nix mode This config is just part of editing nix config. It is supposed to come with company support, but the auto-completion backend turns out to not be that great. We'll see what I do with it - #+begin_src elisp :tangle emacsconfig/nix.el + #+begin_src emacs-lisp :tangle emacsconfig/nix.el (use-package nix-mode :mode "\\.nix\\'" :hook @@ -215,7 +215,7 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto ***** Nix package management I use nix-sandbox for managing nix package for other languages. One of the functions doesn't work that well for me so I replaced it with something that does - #+begin_src elisp :tangle emacsconfig/nix.el + #+begin_src emacs-lisp :tangle emacsconfig/nix.el (use-package nix-sandbox :config (defun nix-executable-find (sandbox executable) @@ -225,7 +225,7 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto #+end_src Beyond that, there is a helper function that makes it easy to quickly define environments with the required packages for a programming language - #+begin_src elisp :tangle emacsconfig/nix.el + #+begin_src emacs-lisp :tangle emacsconfig/nix.el (defun nix-env-from-packages (name &rest packages) "create a nix environment from nix packages. returns the location of the environment" (interactive (append @@ -246,13 +246,13 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto **** Python Python is a bit weird. It had no intentions at all to do things the way I wanted it to do things with use-package, so I had to find a weird work-arounds with add-hook and all that stuff - #+begin_src elisp :tangle emacsconfig/python.el :padline no :noweb no-export + #+begin_src emacs-lisp :tangle emacsconfig/python.el :padline no :noweb no-export (add-hook 'python-mode-hook (lambda () <<el-python-config>>)) #+end_src First we set an interpreter with nix, it comes with all the python autocompletion tools we need - #+begin_src elisp :noweb-ref el-python-config + #+begin_src emacs-lisp :noweb-ref el-python-config (setq python-shell-interpreter (nix-executable-find (nix-env-from-packages "python" "(python3.withPackages (p: with p; [pygame virtualenvwrapper pip sqlite jedi flake8 yapf autopep8 black]))") @@ -260,7 +260,7 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto #+end_src Then we introduce elpy with so that it can use all the tools immidiately without downloading them - #+begin_src elisp :noweb-ref el-python-config + #+begin_src emacs-lisp :noweb-ref el-python-config (use-package elpy :config (elpy-enable) @@ -272,7 +272,7 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto might expand later, but so far this is what I have ***** Web mode General xml stuff editing. Fairly standard - #+begin_src elisp :tangle emacsconfig/web.el + #+begin_src emacs-lisp :tangle emacsconfig/web.el (use-package web-mode :mode (("\\.x?html?\\'" . web-mode) ("\\.x[sm]l\\'" . web-mode) @@ -290,7 +290,7 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto #+end_src ***** Emmet mode for quickly inserting a whole XML tree - #+begin_src elisp :tangle emacsconfig/web.el + #+begin_src emacs-lisp :tangle emacsconfig/web.el (use-package emmet-mode :hook (sgml-mode . emmet-mode) |