From 6cc0c0f094451905fc57c0e1d454271ca679ad1a Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Mon, 16 Sep 2024 09:47:49 +0200
Subject: [PATCH] Things

---
 flake.nix             |  4 ++++
 init.el               | 28 ++++++++++++++++++----------
 packages/packages.nix |  1 +
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index f48cc79..e7136c0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,6 +22,10 @@
       url = "git+https://codeberg.org/pranshu/haskell-ts-mode.git";
       flake = false;
     };
+    extra-package-typst-ts-mode = {
+      url = "git+https://codeberg.org/meow_king/typst-ts-mode.git";
+      flake = false;
+    };
   };
 
   outputs = inputs @ {flake-parts, ...}:
diff --git a/init.el b/init.el
index 255151a..d8bd5ed 100644
--- a/init.el
+++ b/init.el
@@ -31,6 +31,13 @@
   (eglot-connect-timeout nil) ; never timeout
   )
 
+(use-package consult-eglot
+  :after (consult eglot embark)
+  :config
+    (require 'consult-eglot-embark)
+    (consult-eglot-embark-mode)
+  )
+
 (use-package emacs
   :bind (("<mouse-4>" . scroll-down-line)
 	 ("<mouse-5>" . scroll-up-line)
@@ -420,10 +427,11 @@
 (use-package magit-delta
   :hook (magit-mode . magit-delta-mode))
 
-(use-package magit-todos
-  :after magit
-  :custom (magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?")
-  :config (magit-todos-mode 1))
+;; FIXME
+;; (use-package magit-todos
+;;   :after magit
+;;   :custom (magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?")
+;;   :config (magit-todos-mode 1))
 
 (use-package difftastic
   :demand t
@@ -453,10 +461,6 @@
 			  (require 'eglot)
 			  (add-to-list 'eglot-server-programs
 				       '(nix-ts-mode . ("nixd")))
-			  ;; FIXME `nixd' completion not working, will give it a second try in the future
-			  ;; '(nix-ts-mode . ("nixd" :initializationOptions (:eval (:depth 10 :workers 4)
-			  ;; 						      :formatting (:command "alejandra")
-			  ;; 						      :options (:enable t :target (:installable "" :args ["--epxr" "(import \"${(builtins.getFlake \"n\")}/nixos\" {}).options" "--json"]))))))
 			  (eglot-ensure)))
 	 (nix-ts-mode . electric-pair-mode)
 	 (nix-ts-mode . (lambda () (setq indent-bars-spacing-override 2) (indent-bars-mode)))
@@ -481,10 +485,14 @@
 			  (eglot-ensure))))
   :mode "\\.ts\\'")
 
-(use-package haskell-mode
-  :hook ((haskell-mode . eglot-ensure))
+(use-package haskell-ts-mode
+  :hook ((haskell--ts-mode . eglot-ensure)
   :mode "\\.hs\\'")
 
+(use-package typst-ts-mode
+  :hook ((typst--ts-mode . eglot-ensure)
+  :mode "\\.typ\\'")
+
 (use-package purescript-mode
   :custom ((project-vc-extra-root-markers '("spago.dhall")))
   :hook ((purescript-mode . eglot-ensure)
diff --git a/packages/packages.nix b/packages/packages.nix
index 99105b9..a31c59d 100644
--- a/packages/packages.nix
+++ b/packages/packages.nix
@@ -78,6 +78,7 @@ pkgs: epkgs: let
       nix-mode
       nix-ts-mode
       agenix
+      zig-mode
       unisonlang-mode
       purescript-mode
       dhall-mode