feat: eglot-booster, update packages, typst mode

5 files changed, 26 insertions, 41 deletions

diff --git a/modules/emacs/README.org b/modules/emacs/README.org
index da6c4e3..2427636 100644
--- a/modules/emacs/README.org
+++ b/modules/emacs/README.org
@@ -47,7 +47,7 @@ I'm currently testing both ~modus-themes~ and ~ef-themes~, and I love DejaVu San
 (use-package modus-themes)
 (use-package ef-themes)
 ;; (use-package kanagawa-theme)
-(load-theme 'ef-dream t)
+(load-theme 'tango-dark t)
 
 (add-hook 'after-make-frame-functions
           (lambda (frame)
@@ -229,10 +229,9 @@ Language server support. Already comes installed but used to configure additiona
   :config
   (add-to-list 'eglot-server-programs '(nix-mode . ("nil"))))
 
-;; (use-package eglot-booster
-;;   :after eglot
-  
-;;   :config (eglot-booster-mode))
+(use-package eglot-booster
+  :after eglot
+  :config (eglot-booster-mode))
 #+end_src
 
 ** LSP bridge
@@ -366,9 +365,13 @@ Try to use the package.
 #+end_src
 
 ** Typst
-
 #+begin_src emacs-lisp :tangle yes
-(use-package typst-ts-mode)
+(use-package typst-ts-mode
+  :hook (typst-ts-mode . eglot-ensure)
+  :config
+  (with-eval-after-load 'eglot
+    (add-to-list 'eglot-server-programs '(typst-ts-mode . ("tinymist"))))
+  (setq-default eglot-workspace-configuration '(:tinymist (:lint (:enabled t)))))
 #+end_src
 
 * Personal
diff --git a/modules/emacs/eglot-booster.nix b/modules/emacs/eglot-booster.nix
new file mode 100644
index 0000000..d5f07e4
--- /dev/null
+++ b/modules/emacs/eglot-booster.nix
@@ -0,0 +1,13 @@
+{ trivialBuild,
+  fetchFromGitHub,
+}:
+trivialBuild {
+  pname = "eglot-booster";
+  version = "0.1.0";
+  src = fetchFromGitHub {
+    owner = "jdtsmith";
+    repo = "eglot-booster";
+    rev = "cab7803c4f0adc7fff9da6680f90110674bb7a22";
+    hash = "sha256-xUBQrQpw+JZxcqT1fy/8C2tjKwa7sLFHXamBm45Fa4Y=";
+  };
+}
diff --git a/modules/emacs/package.nix b/modules/emacs/package.nix
index 9241887..97e940b 100644
--- a/modules/emacs/package.nix
+++ b/modules/emacs/package.nix
@@ -3,8 +3,9 @@
     git
     nil
     ripgrep
-    emacs-lsp-booster
+    tinymist
     delta
+    emacs-lsp-booster
   ];
 in 
   pkgs.emacsWithPackagesFromUsePackage {
diff --git a/modules/home/beeper.nix b/modules/home/beeper.nix
deleted file mode 100644
index 8dd91cb..0000000
--- a/modules/home/beeper.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ pkgs, ... }:
-
-let
-  pname = "beeper";
-  version = "4.1.1";
-  src = pkgs.fetchurl {
-    url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage";
-    hash = "sha256-uTPprGSOi2LlxzrHRtL2KSMPR4bOmQbV8g0Fm19T0n0=";
-  };
-  appimageContents = pkgs.appimageTools.extract {
-    inherit pname version src;
-
-    postExtract = ''
-      # disable creating a desktop file and icon in the home folder during runtime
-      linuxConfigFilename=$out/resources/app/build/main/linux-*.mjs
-      echo "export function registerLinuxConfig() {}" > $linuxConfigFilename
-
-      # disable auto update
-      sed -i 's/[^=]*\.auto_update_disabled/true/' $out/resources/app/build/main/main-entry-*.mjs
-
-      # prevent updates
-      sed -i -E 's/executeDownload\([^)]+\)\{/executeDownload(){return;/g' $out/resources/app/build/main/main-entry-*.mjs
-
-      # hide version status element on about page otherwise a error message is shown
-      sed -i '$ a\.subview-prefs-about > div:nth-child(2) {display: none;}' $out/resources/app/build/renderer/PrefsPanes-*.css
-    '';
-  };
-in
-  pkgs.beeper.overrideAttrs {
-    inherit version;
-    src = appimageContents;
-  }
diff --git a/modules/home/default.nix b/modules/home/default.nix
index ddc72a7..b032d0d 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -22,7 +22,7 @@ in {
             slack
             whatsapp-for-linux
             telegram-desktop
-            (callPackage ./beeper.nix {})
+            beeper
           ]);
         };
         programs = {