Merge branch 'emacs' into system/darwin

doom/config.org

@@ -283,6 +283,7 @@ numbers are disabled. For relative line numbers, set this to ~relative~.
 	tex-indent-arg 3
 	tex-indent-item 3
 	tex-indent-basic 3
+	typst-ts-mode-indent-offset 2
 )
 #+end_src
 
@@ -683,6 +684,12 @@ Add the necessary hooks for LilyPond mode.
 	:desc "Compile & Preview"  "P" #'typst-ts-compile-and-preview
 	:desc "Watch start"        "w" #'typst-ts-watch-start
 	:desc "Watch stop"         "W" #'typst-ts-watch-stop
+	(:prefix ("h" . "Heading")
+	 :desc "Left"  "h" #'typst-ts-mode-heading-left
+	 :desc "Right" "l" #'typst-ts-mode-heading-right
+	 :desc "Up"    "k" #'typst-ts-mode-heading-up
+	 :desc "Down"  "j" #'typst-ts-mode-heading-down
+	)
 	)
 #+end_src
 

doom/init.el

@@ -143,7 +143,7 @@
        json              ; At least it ain't XML
        ;;(java +lsp)       ; the poster child for carpal tunnel syndrome
        javascript        ; all(hope(abandon(ye(who(enter(here))))))
-       (julia +lsp)        ; a better, faster MATLAB
+       (julia +tree-sitter +snail) ; a better, faster MATLAB
        ;;kotlin            ; a better, slicker Java(Script)
        (latex +latexmk +lsp) ; writing papers in Emacs has never been so fun
        ;lean              ; for folks with too much to prove

flake.lock

@@ -7,26 +7,27 @@
         ]
       },
       "locked": {
-        "lastModified": 1731642829,
+        "lastModified": 1741126078,
-        "narHash": "sha256-vG+O2RZRzYZ8BUMNNJ+BLSj6PUoGW7taDQbp6QNJ3Xo=",
+        "narHash": "sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "f86f158efd4bab8dce3e207e4621f1df3a760b7a",
+        "rev": "c172f50b55b087f8e7801631de977461603bb976",
         "type": "github"
       },
       "original": {
         "owner": "LnL7",
+        "ref": "nix-darwin-24.11",
         "repo": "nix-darwin",
         "type": "github"
       }
     },
     "nixpkgs-darwin": {
       "locked": {
-        "lastModified": 1733326450,
+        "lastModified": 1741029734,
-        "narHash": "sha256-hBG6Ix5ZzXCJoanrPOLtQRalYv6nnDu9AZeamRfjKJ8=",
+        "narHash": "sha256-0+dlOH+9mut5mtw8iUukJ3Q9cx/DXgBarK05W7MKggA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f9ef77eb704d063bfbff7f04531a0b325cc1a18f",
+        "rev": "c3d6c20a6a16cbfdc11405c4dd0fdf64ec3a3899",
         "type": "github"
       },
       "original": {

flake.nix

@@ -4,7 +4,7 @@
   inputs = {
     nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-24.11-darwin";
     nix-darwin = {
-      url = "github:LnL7/nix-darwin";
+      url = "github:LnL7/nix-darwin/nix-darwin-24.11";
       inputs.nixpkgs.follows = "nixpkgs-darwin";
     };
   };

nix-darwin/configuration.nix

@@ -13,6 +13,7 @@
       fd
       gnupg
 
+      git
       direnv
       nix-direnv
       rustup

nix-darwin/homebrew.nix

@@ -16,6 +16,8 @@
       "autoconf"
       "poppler"
       "automake"
+
+      "emacs-plus"
     ];
     casks = [
       # System monitoring
@@ -35,6 +37,7 @@
       "vlc"
       "darktable"
       "adobe-dng-converter"
+      "adobe-acrobat-reader"
 
       # Communications
       "signal"
@@ -51,7 +54,7 @@
       "skim"
 
       # Editors
-      "emacs-mac"
+      #"emacs-mac"
       "arduino-ide"
       "blender"
       "inkscape"
@@ -65,7 +68,8 @@
     ];
     taps = [
       "koekeishiya/formulae"
-      "railwaycat/emacsmacport"
+      #"railwaycat/emacsmacport"
+      "d12frosted/emacs-plus"
     ];
   };
 }