fix magit

1 files changed, 238 insertions, 234 deletions

diff --git a/emacs.org b/emacs.org
index d6d3584..d4d8944 100644
--- a/emacs.org
+++ b/emacs.org
@@ -59,16 +59,20 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto
     Simple. Nice. default config. (almost)
     #+begin_src emacs-lisp :tangle emacsconfig/extras.el
       (use-package magit
-	:defer t
-	:config
-	(magit-add-section-hook 'magit-status-sections-hook
-				'magit-insert-modules
-				'magit-insert-stashes
-				'append)
-	:bind
-	("C-x g" . magit-status))
+        :init
+        ;; import missing function
+        (defun seq-keep (function sequence)
+          "Apply FUNCTION to SEQUENCE and return the list of all the non-nil results"
+          (delq nil (seq-map function sequence)))
+        :config
+        (magit-add-section-hook 'magit-status-sections-hook
+                                'magit-insert-modules
+                                'magit-insert-stashes
+                                'append)
+        :bind
+        ("C-x g" . magit-status))
       (use-package forge
-	:after magit)
+        :after magit)
     #+end_src
 *** IRC
     I use IRC in emacs, with ERC. There is even a small macro so that I can easily join new servers
@@ -104,7 +108,7 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto
     Gives me access to the most recent files I edited, and some other stuff that I don't really care about
     #+begin_src emacs-lisp :tangle emacsconfig/extras.el
       (use-package dashboard
-	:config (dashboard-setup-startup-hook))
+        :config (dashboard-setup-startup-hook))
     #+end_src
 *** Elfeed
     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.
@@ -112,42 +116,42 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto
     =:custom= option
     #+begin_src emacs-lisp :tangle emacsconfig/extras.el
       (use-package elfeed
-	:bind
-	("C-x w" . elfeed)
-	(:map elfeed-search-mode-map
-	      ("C-c a" . elfeed-add-feed)
-	      ("C-c u" . elfeed-update)
-	      ("C-c f" . elfeed-update-feed)
-	      ("C-c r" . elfeed-mark-all-as-read))
-	:config
-	(defun elfeed-mark-all-as-read ()
-	  (interactive)
-	  (mark-whole-buffer)
-	  (elfeed-search-untag-all-unread))
-	:custom
-	(elfeed-search-filter  "@6-months-ago +quality")
-	(elfeed-feeds  '(("http://feeds.feedburner.com/tweakers/nieuws" NL tech exportable)
-			 ("https://discourse.nixos.org/c/announcements/8.rss" nixos programming quality)
-			 ("http://www.dnbradio.com/feeds" music podcasts)
-			 ("https://codepen.io/spark/feed/" programming quality)
-			 ("https://envs.net/~lucidiot/rsrsss/feed.xml" RSS quality)
-			 ("https://falseknees.tumblr.com/rss" comics quality)
-			 ("https://hackspace.raspberrypi.org/feed" tech programming)
-			 ("https://lobste.rs/rss" programming)
-			 ("https://news.rickcarlino.com/rss.rss" tech)
-			 ("https://nu.nl/rss" NL news exportable)
-			 ("https://planet.haskell.org/atom.xml" haskell programming)
-			 ("https://planet.nixos.org/atom.xml" nixos programming quality)
-			 ("https://reddit.com/r/dnb/.rss" reddit music)
-			 ("https://reddit.com/r/programming/.rss" reddit programming)
-			 ("https://reddit.com/r/realdubstep/.rss" reddit music)
-			 ("https://reddit.com/r/thenetherlands/.rss" NL reddit)
-			 ("https://sachachua.com/blog/category/emacs-news/feed" emacs quality programming)
-			 ("https://webzine.puffy.cafe/atom.xml" openbsd tech quality programming)
-			 ("https://www.fosskers.ca/en/rss" programming quality exportable)
-			 ("https://xkcd.com/atom.xml" comics)))
-	(elfeed-feeds nil)
-	(elfeed-search-filter  ""))
+        :bind
+        ("C-x w" . elfeed)
+        (:map elfeed-search-mode-map
+              ("C-c a" . elfeed-add-feed)
+              ("C-c u" . elfeed-update)
+              ("C-c f" . elfeed-update-feed)
+              ("C-c r" . elfeed-mark-all-as-read))
+        :config
+        (defun elfeed-mark-all-as-read ()
+          (interactive)
+          (mark-whole-buffer)
+          (elfeed-search-untag-all-unread))
+        :custom
+        (elfeed-search-filter  "@6-months-ago +quality")
+        (elfeed-feeds  '(("http://feeds.feedburner.com/tweakers/nieuws" NL tech exportable)
+                         ("https://discourse.nixos.org/c/announcements/8.rss" nixos programming quality)
+                         ("http://www.dnbradio.com/feeds" music podcasts)
+                         ("https://codepen.io/spark/feed/" programming quality)
+                         ("https://envs.net/~lucidiot/rsrsss/feed.xml" RSS quality)
+                         ("https://falseknees.tumblr.com/rss" comics quality)
+                         ("https://hackspace.raspberrypi.org/feed" tech programming)
+                         ("https://lobste.rs/rss" programming)
+                         ("https://news.rickcarlino.com/rss.rss" tech)
+                         ("https://nu.nl/rss" NL news exportable)
+                         ("https://planet.haskell.org/atom.xml" haskell programming)
+                         ("https://planet.nixos.org/atom.xml" nixos programming quality)
+                         ("https://reddit.com/r/dnb/.rss" reddit music)
+                         ("https://reddit.com/r/programming/.rss" reddit programming)
+                         ("https://reddit.com/r/realdubstep/.rss" reddit music)
+                         ("https://reddit.com/r/thenetherlands/.rss" NL reddit)
+                         ("https://sachachua.com/blog/category/emacs-news/feed" emacs quality programming)
+                         ("https://webzine.puffy.cafe/atom.xml" openbsd tech quality programming)
+                         ("https://www.fosskers.ca/en/rss" programming quality exportable)
+                         ("https://xkcd.com/atom.xml" comics)))
+        (elfeed-feeds nil)
+        (elfeed-search-filter  ""))
     #+end_src
 *** Org mode
     While the brunt of this file is relatively vanilla, There are still some things that I want to customize about the org-mode experience
@@ -174,124 +178,124 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto
      stuff that I'd want for my note taking setup
      #+begin_src emacs-lisp :tangle no
        (use-package org-roam
-	 :ensure t
-	 :demand t  ;; Ensure org-roam is loaded by default
-	 :init
-	 (setq org-roam-v2-ack t)
-	 :custom
-	 (org-roam-directory "~/Documents/notes")
-	 (org-roam-completion-everywhere t)
-	 :bind (("C-c n l" . org-roam-buffer-toggle)
-		("C-c n f" . org-roam-node-find)
-		("C-c n i" . org-roam-node-insert)
-		("C-c n I" . org-roam-node-insert-immediate)
-		("C-c n p" . my/org-roam-find-project)
-		("C-c n t" . my/org-roam-capture-task)
-		("C-c n b" . my/org-roam-capture-inbox)
-		:map org-mode-map
-		("C-M-i" . completion-at-point)
-		:map org-roam-dailies-map
-		("Y" . org-roam-dailies-capture-yesterday)
-		("T" . org-roam-dailies-capture-tomorrow))
-	 :bind-keymap
-	 ("C-c n d" . org-roam-dailies-map)
-	 :config
-	 (require 'org-roam-dailies) ;; Ensure the keymap is available
-	 (org-roam-db-autosync-mode))
+         :ensure t
+         :demand t  ;; Ensure org-roam is loaded by default
+         :init
+         (setq org-roam-v2-ack t)
+         :custom
+         (org-roam-directory "~/Documents/notes")
+         (org-roam-completion-everywhere t)
+         :bind (("C-c n l" . org-roam-buffer-toggle)
+                ("C-c n f" . org-roam-node-find)
+                ("C-c n i" . org-roam-node-insert)
+                ("C-c n I" . org-roam-node-insert-immediate)
+                ("C-c n p" . my/org-roam-find-project)
+                ("C-c n t" . my/org-roam-capture-task)
+                ("C-c n b" . my/org-roam-capture-inbox)
+                :map org-mode-map
+                ("C-M-i" . completion-at-point)
+                :map org-roam-dailies-map
+                ("Y" . org-roam-dailies-capture-yesterday)
+                ("T" . org-roam-dailies-capture-tomorrow))
+         :bind-keymap
+         ("C-c n d" . org-roam-dailies-map)
+         :config
+         (require 'org-roam-dailies) ;; Ensure the keymap is available
+         (org-roam-db-autosync-mode))
 
        (defun org-roam-node-insert-immediate (arg &rest args)
-	 (interactive "P")
-	 (let ((args (push arg args))
-	       (org-roam-capture-templates (list (append (car org-roam-capture-templates)
-							 '(:immediate-finish t)))))
-	   (apply #'org-roam-node-insert args)))
+         (interactive "P")
+         (let ((args (push arg args))
+               (org-roam-capture-templates (list (append (car org-roam-capture-templates)
+                                                         '(:immediate-finish t)))))
+           (apply #'org-roam-node-insert args)))
 
        (defun my/org-roam-filter-by-tag (tag-name)
-	 (lambda (node)
-	   (member tag-name (org-roam-node-tags node))))
+         (lambda (node)
+           (member tag-name (org-roam-node-tags node))))
 
        (defun my/org-roam-list-notes-by-tag (tag-name)
-	 (mapcar #'org-roam-node-file
-		 (seq-filter
-		  (my/org-roam-filter-by-tag tag-name)
-		  (org-roam-node-list))))
+         (mapcar #'org-roam-node-file
+                 (seq-filter
+                  (my/org-roam-filter-by-tag tag-name)
+                  (org-roam-node-list))))
 
        (defun my/org-roam-refresh-agenda-list ()
-	 (interactive)
-	 (setq org-agenda-files (my/org-roam-list-notes-by-tag "Project")))
+         (interactive)
+         (setq org-agenda-files (my/org-roam-list-notes-by-tag "Project")))
 
        ;; Build the agenda list the first time for the session
        (my/org-roam-refresh-agenda-list)
 
        (defun my/org-roam-project-finalize-hook ()
-	 "Adds the captured project file to `org-agenda-files' if the
+         "Adds the captured project file to `org-agenda-files' if the
        capture was not aborted."
-	 ;; Remove the hook since it was added temporarily
-	 (remove-hook 'org-capture-after-finalize-hook #'my/org-roam-project-finalize-hook)
+         ;; Remove the hook since it was added temporarily
+         (remove-hook 'org-capture-after-finalize-hook #'my/org-roam-project-finalize-hook)
 
-	 ;; Add project file to the agenda list if the capture was confirmed
-	 (unless org-note-abort
-	   (with-current-buffer (org-capture-get :buffer)
-	     (add-to-list 'org-agenda-files (buffer-file-name)))))
+         ;; Add project file to the agenda list if the capture was confirmed
+         (unless org-note-abort
+           (with-current-buffer (org-capture-get :buffer)
+             (add-to-list 'org-agenda-files (buffer-file-name)))))
 
        (defun my/org-roam-find-project ()
-	 (interactive)
-	 ;; Add the project file to the agenda after capture is finished
-	 (add-hook 'org-capture-after-finalize-hook #'my/org-roam-project-finalize-hook)
+         (interactive)
+         ;; Add the project file to the agenda after capture is finished
+         (add-hook 'org-capture-after-finalize-hook #'my/org-roam-project-finalize-hook)
 
-	 ;; Select a project file to open, creating it if necessary
-	 (org-roam-node-find
-	  nil
-	  nil
-	  (my/org-roam-filter-by-tag "Project")
-	  :templates
-	  '(("p" "project" plain "* Goals\n\n%?\n\n* Tasks\n\n** TODO Add initial tasks\n\n* Dates\n\n"
-	     :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+category: ${title}\n#+filetags: Project")
-	     :unnarrowed t))))
+         ;; Select a project file to open, creating it if necessary
+         (org-roam-node-find
+          nil
+          nil
+          (my/org-roam-filter-by-tag "Project")
+          :templates
+          '(("p" "project" plain "* Goals\n\n%?\n\n* Tasks\n\n** TODO Add initial tasks\n\n* Dates\n\n"
+             :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+category: ${title}\n#+filetags: Project")
+             :unnarrowed t))))
 
        (defun my/org-roam-capture-inbox ()
-	 (interactive)
-	 (org-roam-capture- :node (org-roam-node-create)
-			    :templates '(("i" "inbox" plain "* %?"
-					  :if-new (file+head "Inbox.org" "#+title: Inbox\n")))))
+         (interactive)
+         (org-roam-capture- :node (org-roam-node-create)
+                            :templates '(("i" "inbox" plain "* %?"
+                                          :if-new (file+head "Inbox.org" "#+title: Inbox\n")))))
 
        (defun my/org-roam-capture-task ()
-	 (interactive)
-	 ;; Add the project file to the agenda after capture is finished
-	 (add-hook 'org-capture-after-finalize-hook #'my/org-roam-project-finalize-hook)
+         (interactive)
+         ;; Add the project file to the agenda after capture is finished
+         (add-hook 'org-capture-after-finalize-hook #'my/org-roam-project-finalize-hook)
 
-	 ;; Capture the new task, creating the project file if necessary
-	 (org-roam-capture- :node (org-roam-node-read
-				   nil
-				   (my/org-roam-filter-by-tag "Project"))
-			    :templates '(("p" "project" plain "** TODO %?"
-					  :if-new (file+head+olp "%<%Y%m%d%H%M%S>-${slug}.org"
-								 "#+title: ${title}\n#+category: ${title}\n#+filetags: Project"
-								 ("Tasks"))))))
+         ;; Capture the new task, creating the project file if necessary
+         (org-roam-capture- :node (org-roam-node-read
+                                   nil
+                                   (my/org-roam-filter-by-tag "Project"))
+                            :templates '(("p" "project" plain "** TODO %?"
+                                          :if-new (file+head+olp "%<%Y%m%d%H%M%S>-${slug}.org"
+                                                                 "#+title: ${title}\n#+category: ${title}\n#+filetags: Project"
+                                                                 ("Tasks"))))))
 
        (defun my/org-roam-copy-todo-to-today ()
-	 (interactive)
-	 (let ((org-refile-keep t) ;; Set this to nil to delete the original!
-	       (org-roam-dailies-capture-templates
-		'(("t" "tasks" entry "%?"
-		   :if-new (file+head+olp "%<%Y-%m-%d>.org" "#+title: %<%Y-%m-%d>\n" ("Tasks")))))
-	       (org-after-refile-insert-hook #'save-buffer)
-	       today-file
-	       pos)
-	   (save-window-excursion
-	     (org-roam-dailies--capture (current-time) t)
-	     (setq today-file (buffer-file-name))
-	     (setq pos (point)))
+         (interactive)
+         (let ((org-refile-keep t) ;; Set this to nil to delete the original!
+               (org-roam-dailies-capture-templates
+                '(("t" "tasks" entry "%?"
+                   :if-new (file+head+olp "%<%Y-%m-%d>.org" "#+title: %<%Y-%m-%d>\n" ("Tasks")))))
+               (org-after-refile-insert-hook #'save-buffer)
+               today-file
+               pos)
+           (save-window-excursion
+             (org-roam-dailies--capture (current-time) t)
+             (setq today-file (buffer-file-name))
+             (setq pos (point)))
 
-	   ;; Only refile if the target file is different than the current file
-	   (unless (equal (file-truename today-file)
-			  (file-truename (buffer-file-name)))
-	     (org-refile nil nil (list "Tasks" today-file nil pos)))))
+           ;; Only refile if the target file is different than the current file
+           (unless (equal (file-truename today-file)
+                          (file-truename (buffer-file-name)))
+             (org-refile nil nil (list "Tasks" today-file nil pos)))))
 
        (add-to-list 'org-after-todo-state-change-hook
-		    (lambda ()
-		      (when (equal org-state "DONE")
-			(my/org-roam-copy-todo-to-today))))
+                    (lambda ()
+                      (when (equal org-state "DONE")
+                        (my/org-roam-copy-todo-to-today))))
 
      #+end_src
 **** Denote
@@ -324,17 +328,17 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto
     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 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.
-	(setq evil-want-keybinding nil)
-	:config
-	(evil-define-key 'normal global-map "," 'evil-execute-in-god-state)
-	(evil-mode 1))
+        :init
+        (setq evil-want-integration t) ;; This is optional since it's already set to t by default.
+        (setq evil-want-keybinding nil)
+        :config
+        (evil-define-key 'normal global-map "," 'evil-execute-in-god-state)
+        (evil-mode 1))
 
       (use-package evil-collection
-	:after evil
-	:config
-	(evil-collection-init))
+        :after evil
+        :config
+        (evil-collection-init))
     #+end_src
 **** God-mode
      To further prove that I have no intentions at all to be busy with making evil bindings for eveything I find
@@ -342,8 +346,8 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto
      support
      #+begin_src emacs-lisp :tangle emacsconfig/evil.el
        (use-package evil-god-state
-	 :bind
-	 ("M-," . evil-god-state-bail))
+         :bind
+         ("M-," . evil-god-state-bail))
 
        (use-package god-mode)
      #+end_src
@@ -352,18 +356,18 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto
      is surprisingly painless, so I figured I'd just add it
      #+begin_src emacs-lisp :tangle emacsconfig/evil.el
        (use-package evil-tree-edit
-	 :hook
-	 (java-mode . evil-tree-edit-mode)
-	 (python-mode . evil-tree-edit-mode))
+         :hook
+         (java-mode . evil-tree-edit-mode)
+         (python-mode . evil-tree-edit-mode))
      #+end_src
 *** Which-key
     Has god-mode support
     #+begin_src emacs-lisp :tangle emacsconfig/extras.el
       (use-package which-key
-	:after god-mode
-	:config
-	(which-key-enable-god-mode-support)
-	(which-key-mode))
+        :after god-mode
+        :config
+        (which-key-enable-god-mode-support)
+        (which-key-mode))
     #+end_src
 *** PDF-tools
     I don't want to be at the mercy of my browser to figure out how to read a PDF
@@ -380,8 +384,8 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto
     of language-servers, as I've had bad experiences with them when I was still using vim
     #+begin_src emacs-lisp :tangle emacsconfig/extras.el
       (use-package company
-	:bind
-	("C-SPC" . company-complete))
+        :bind
+        ("C-SPC" . company-complete))
     #+end_src
 *** Matching of parentheses and other stuff
     "ERROR: Unmatched parenteses/braces/whatever" is really a thing I would prefer to never see again
@@ -414,20 +418,20 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto
       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 emacs-lisp :tangle emacsconfig/nix.el
-	(use-package nix-mode
-	  :mode "\\.nix\\'"
-	  :hook
-	  (nix-mode . company-mode)
-	  :config
-	  ;; the company-nix backend is not available in melpa, but has no new dependencies
-	  (unless (package-installed-p 'company-nix)
-	    (with-temp-buffer
-	      (url-insert-file-contents "https://github.com/NixOS/nix-mode/raw/master/nix-company.el")
-	      (eval-buffer)))
-	  (add-hook 'nix-mode-hook (lambda ()
-				     (set (make-local-variable 'company-backends)
-					  '((company-nix)))))
-	  (add-hook 'nix-mode-hook 'company-mode))
+        (use-package nix-mode
+          :mode "\\.nix\\'"
+          :hook
+          (nix-mode . company-mode)
+          :config
+          ;; the company-nix backend is not available in melpa, but has no new dependencies
+          (unless (package-installed-p 'company-nix)
+            (with-temp-buffer
+              (url-insert-file-contents "https://github.com/NixOS/nix-mode/raw/master/nix-company.el")
+              (eval-buffer)))
+          (add-hook 'nix-mode-hook (lambda ()
+                                     (set (make-local-variable 'company-backends)
+                                          '((company-nix)))))
+          (add-hook 'nix-mode-hook 'company-mode))
       #+end_src
 ***** Nix package management
       I use nix-sandbox for managing nix package for other languages.
@@ -467,23 +471,23 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto
      use-package, so I had to find a weird work-arounds with add-hook and all that stuff
      #+begin_src emacs-lisp :tangle emacsconfig/python.el :padline no :noweb no-export
        (add-hook 'python-mode-hook (lambda ()
-				     <<el-python-config>>))
+                                     <<el-python-config>>))
 
      #+end_src
      First we set an interpreter with nix, it comes with all the python autocompletion tools we need
      #+begin_src emacs-lisp :noweb-ref el-python-config :tangle no
        (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]))")
-	      "python"))
+             (nix-executable-find
+              (nix-env-from-packages "python" "(python3.withPackages (p: with p; [pygame virtualenvwrapper pip sqlite jedi flake8 yapf autopep8 black]))")
+              "python"))
 
      #+end_src
      Then we introduce elpy with so that it can use all the tools immidiately without downloading them
      #+begin_src emacs-lisp :noweb-ref el-python-config :tangle no
        (use-package elpy
-	 :config
-	 (elpy-enable)
-	 (setq elpy-rpc-python-command python-shell-interpreter))
+         :config
+         (elpy-enable)
+         (setq elpy-rpc-python-command python-shell-interpreter))
 
      #+end_src
 **** Haskell
@@ -544,39 +548,39 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto
 ***** Web mode
       General xml stuff editing. Fairly standard
       #+begin_src emacs-lisp :tangle emacsconfig/web.el
-	(use-package web-mode
-	  :mode (("\\.x?html?\\'" . web-mode)
-		 ("\\.x[sm]l\\'"  . web-mode)
-		 ("\\.css\\'"     . web-mode)
-		 ("\\.jsx?\\'"    . web-mode)
-		 ("\\.tsx?\\'"    . web-mode)
-		 ("\\.json\\'"    . web-mode))
-	  :custom
-	  (web-mode-markup-indent-offset 2) ; HTML
-	  (web-mode-css-indent-offset 2)    ; CSS
-	  (web-mode-code-indent-offset 2)   ; JS/JSX/TS/TSX
-	  (web-mode-content-types-alist '(("jsx" . "\\.js[x]?\\'"))))
-	(use-package elnode)
+        (use-package web-mode
+          :mode (("\\.x?html?\\'" . web-mode)
+                 ("\\.x[sm]l\\'"  . web-mode)
+                 ("\\.css\\'"     . web-mode)
+                 ("\\.jsx?\\'"    . web-mode)
+                 ("\\.tsx?\\'"    . web-mode)
+                 ("\\.json\\'"    . web-mode))
+          :custom
+          (web-mode-markup-indent-offset 2) ; HTML
+          (web-mode-css-indent-offset 2)    ; CSS
+          (web-mode-code-indent-offset 2)   ; JS/JSX/TS/TSX
+          (web-mode-content-types-alist '(("jsx" . "\\.js[x]?\\'"))))
+        (use-package elnode)
 
       #+end_src
 ***** Emmet mode
       for quickly inserting a whole XML tree
       #+begin_src emacs-lisp :tangle emacsconfig/web.el
-	(use-package emmet-mode
-	  :hook
-	  (sgml-mode . emmet-mode)
-	  (web-mode . emmet-mode)
-	  (css-mode . emmet-mode)
-	  :bind
-	  (:map emmet-mode-keymap
-		("TAB" . emmet-dwim))
-	  :config
-	  (defun emmet-dwim (prefix)
-	    (interactive "p")
-	    (or
-	     (emmet-go-to-edit-point prefix)
-	     (emmet-expand-line prefix)
-	     (evil-jump-forward prefix))))
+        (use-package emmet-mode
+          :hook
+          (sgml-mode . emmet-mode)
+          (web-mode . emmet-mode)
+          (css-mode . emmet-mode)
+          :bind
+          (:map emmet-mode-keymap
+                ("TAB" . emmet-dwim))
+          :config
+          (defun emmet-dwim (prefix)
+            (interactive "p")
+            (or
+             (emmet-go-to-edit-point prefix)
+             (emmet-expand-line prefix)
+             (evil-jump-forward prefix))))
       #+end_src
 ** Other, less useful stuff
 *** Themes
@@ -592,40 +596,40 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto
     My discord buddies /have/ to know I'm using emacs whenever I have my computer running
     #+begin_src emacs-lisp :tangle emacsconfig/misc.el
       (use-package elcord
-	:config
-	(elcord-mode))
+        :config
+        (elcord-mode))
     #+end_src
 *** Emenu
     Since I'm using emacs as a daemon, it can also be benefical to make an application launcer
     #+begin_src emacs-lisp :tangle emacsconfig/misc.el
       (defun all-commands ()
-	"does a completing read of all the programs accessible to you in $PATH"
-	(let ((ls-output (mapcan (lambda (path)
-				   (when (file-readable-p path)
-				     (cl-remove-if (lambda (file)
-						     (let ((fullpath (concat path "/" file)))
-						       (or (file-directory-p fullpath)
-							   (not (file-executable-p fullpath)))))
-						   (directory-files path nil directory-files-no-dot-files-regexp nil))))
-				 (split-string (getenv "PATH") ":" t)))
-	      (alias-output (split-string (shell-command-to-string "alias -p | sed -E 's/^alias ([^=]*)=.*$/\\1/'") "\n")))
-	  (append ls-output alias-output)))
+        "does a completing read of all the programs accessible to you in $PATH"
+        (let ((ls-output (mapcan (lambda (path)
+                                   (when (file-readable-p path)
+                                     (cl-remove-if (lambda (file)
+                                                     (let ((fullpath (concat path "/" file)))
+                                                       (or (file-directory-p fullpath)
+                                                           (not (file-executable-p fullpath)))))
+                                                   (directory-files path nil directory-files-no-dot-files-regexp nil))))
+                                 (split-string (getenv "PATH") ":" t)))
+              (alias-output (split-string (shell-command-to-string "alias -p | sed -E 's/^alias ([^=]*)=.*$/\\1/'") "\n")))
+          (append ls-output alias-output)))
 
       (defun emenu (&optional command-list)
-	"A dmenu-inspired application launcher using a separate emacs frame"
-	(interactive)
-	(with-selected-frame (make-frame '((name . "emenu")
-					   (minibuffer . only)
-					   (width . 151)
-					   (height . 1)))
-	  (unwind-protect
-	      (progn
-		(call-process
-		 (ido-completing-read "Command: " (or
-						   command-list
-						   (all-commands)))
-		 nil
-		 0)
-		(keyboard-quit))
-	    (delete-frame))))
+        "A dmenu-inspired application launcher using a separate emacs frame"
+        (interactive)
+        (with-selected-frame (make-frame '((name . "emenu")
+                                           (minibuffer . only)
+                                           (width . 151)
+                                           (height . 1)))
+          (unwind-protect
+              (progn
+                (call-process
+                 (ido-completing-read "Command: " (or
+                                                   command-list
+                                                   (all-commands)))
+                 nil
+                 0)
+                (keyboard-quit))
+            (delete-frame))))
     #+end_src