feat: eglot-booster, update packages, typst mode

7 files changed, 40 insertions, 55 deletions

diff --git a/flake.lock b/flake.lock
index 36f1dd3..c007df0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -109,11 +109,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1747834438,
-        "narHash": "sha256-AHJt79W8wADzur2htCx1U8FtEk4XjvrHb9/3iDfNedI=",
+        "lastModified": 1753180535,
+        "narHash": "sha256-KEtlzMs2O7FDvciFtjk9W4hyau013Pj9qZNK9a0PxEc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6c2eb1e24cd0e76d88bdd633ef4c50d6286586e0",
+        "rev": "847711c7ffa9944b0c5c39a8342ac8eb6a9f9abc",
         "type": "github"
       },
       "original": {
@@ -171,11 +171,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1747744144,
-        "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
+        "lastModified": 1752687322,
+        "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
+        "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
         "type": "github"
       },
       "original": {
@@ -187,17 +187,17 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1750602587,
-        "narHash": "sha256-LzkDG8KQVakkF4fgZLG7D34y7mw4WhhtfabYSz7ZMyY=",
+        "lastModified": 1752950548,
+        "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e752bd719cf334c45127ec06f700eac81154b011",
+        "rev": "c87b95e25065c028d31a94f06a62927d18763fdf",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
-        "rev": "e752bd719cf334c45127ec06f700eac81154b011",
         "type": "github"
       }
     },
@@ -270,11 +270,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749511163,
-        "narHash": "sha256-0NpDb30Wf1wBeMHQP4N6mUVIq+tNujNX9hplZSvXWKE=",
+        "lastModified": 1753069499,
+        "narHash": "sha256-YtgY0ueqKNrBma4Euu8WH23BhUkBujirJDMDE1KujnU=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "4cbc88072f1597e1757ec82fefaacc02f49c6c98",
+        "rev": "c64b94235ae24e3b9e01a08f0331d8bb0e5b037a",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 38bd59c..5c5b9a2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "My personal devices' flake modules";
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/e752bd719cf334c45127ec06f700eac81154b011";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     home-manager.url = "github:nix-community/home-manager";
     agenix = {
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 = {