Commit 11ef490807df

@@ -7,10 +7,10 @@
   "Where all my sources are.")
 (set-register ?s `(file . ,src-dir))
 
-(use-package yaml-mode
+(use-package yaml-ts-mode
   :mode "\\.ya?ml\\'"
-  :hook ((yaml-mode . highlight-indentation-mode)
-         (yaml-mode . highlight-indentation-current-column-mode)))
+  :hook ((yaml-ts-mode . highlight-indentation-mode)
+         (yaml-ts-mode . highlight-indentation-current-column-mode)))
 
 (use-package conf-mode
   :mode ("\\.to?ml\\'" . conf-toml-mode))

@@ -30,9 +30,10 @@
                                                (replace-regexp-in-string " " "_" testrunname)))))
       (go-test--go-test (concat "-run " gotest "\\$ .")))))
 
-(use-package go-mode
-  :hook
-  (go-mode . go-ts-mode-hook))
+(use-package go-ts-mode
+  :mode (("\\.go$" . go-ts-mode)
+         ("\\.go" . go-ts-mode)
+         ("\\.go\\'" . go-ts-mode)))
 
 (provide 'programming-go)
 ;;; programming-go.el ends here

@@ -4,7 +4,6 @@
 ;;; Code:
 (use-package nix-ts-mode
   :if *nix*
-  :after (lsp)
   :mode ("\\.nix\\'" "\\.nix.in\\'"))
 
 (use-package nix-drv-mode

@@ -8,31 +8,31 @@
   (setq treesit-auto-install 'prompt)
   (global-treesit-auto-mode))
 
-(use-package treesit
-  :config
-  (use-package combobulate
-    :preface
-    (unless (package-installed-p 'combobulate)
-      (package-vc-install '(combobulate :url "https://github.com/mickeynp/combobulate"
-					:branch "development")))
-    ;; You can customize Combobulate's key prefix here.
-    ;; Note that you may have to restart Emacs for this to take effect!
-    (setq combobulate-key-prefix "C-c o")
+(unless (package-installed-p 'combobulate)
+  (package-vc-install '(combobulate :url "https://github.com/mickeynp/combobulate"
+				    :branch "development")))
 
-    ;; Optional, but recommended.
-    ;;
-    ;; You can manually enable Combobulate with `M-x
-    ;; combobulate-mode'.
-    :hook
-      ((python-ts-mode . combobulate-mode)
-       (js-ts-mode . combobulate-mode)
-       (html-ts-mode . combobulate-mode)
-       (css-ts-mode . combobulate-mode)
-       (yaml-ts-mode . combobulate-mode)
-       (typescript-ts-mode . combobulate-mode)
-       (json-ts-mode . combobulate-mode)
-       (tsx-ts-mode . combobulate-mode)
-       (go-ts-mode . combobulate-mode))))
+(use-package combobulate
+  :load-path "~/.config/emacs/elpa/combobulate"
+  :config
+  ;; You can customize Combobulate's key prefix here.
+  ;; Note that you may have to restart Emacs for this to take effect!
+  (setq combobulate-key-prefix "C-c o")
+
+  ;; Optional, but recommended.
+  ;;
+  ;; You can manually enable Combobulate with `M-x
+  ;; combobulate-mode'.
+  :hook
+  (python-ts-mode . combobulate-mode)
+  (js-ts-mode . combobulate-mode)
+  (html-ts-mode . combobulate-mode)
+  (css-ts-mode . combobulate-mode)
+  (yaml-ts-mode . combobulate-mode)
+  (typescript-ts-mode . combobulate-mode)
+  (json-ts-mode . combobulate-mode)
+  (tsx-ts-mode . combobulate-mode)
+  (go-ts-mode . combobulate-mode))
 
 (provide 'programming-treesitter)
 ;;; programming-treesitter.el ends here