3 files changed, 50 insertions, 8 deletions

diff --git a/modules/ryan-packages/bootloaders.scm b/modules/ryan-packages/bootloaders.scm
index 10f38d1..4cbb8da 100644
--- a/modules/ryan-packages/bootloaders.scm
+++ b/modules/ryan-packages/bootloaders.scm
@@ -18,7 +18,7 @@
   #:use-module (guix build-system meson)
   #:use-module (guix build-system python))
 
-(define systemd-version "255")
+(define systemd-version "258")
 (define systemd-source
   (origin
     (method git-fetch)
@@ -28,7 +28,7 @@
     (file-name (git-file-name "systemd" systemd-version))
     (sha256
       (base32
-        "1qdyw9g3jgvsbc1aryr11gpc3075w5pg00mqv4pyf3hwixxkwaq6"))))
+        "18gnp45gl1154jra6qv95k8y7ny6phdm87yqi5jdq13cadlrklf6"))))
 
 (define-public (systemd-stub-name)
   (let ((arch (cond ((target-x86-32?) "ia32")
@@ -54,7 +54,7 @@
                ,(string-append "-Dsbat-distro-pkgname=" name)
                ,(string-append "-Dsbat-distro-version=" version))
         #:phases
-        #~(let ((stub #$(string-append "src/boot/efi/" (systemd-stub-name))))
+        #~(let ((stub #$(string-append "src/boot/" (systemd-stub-name))))
             (modify-phases %standard-phases
               (replace 'build
                 (lambda* (#:key parallel-build? #:allow-other-keys)
diff --git a/modules/ryan-packages/linux.scm b/modules/ryan-packages/linux.scm
index 7ccfc2d..272280c 100644
--- a/modules/ryan-packages/linux.scm
+++ b/modules/ryan-packages/linux.scm
@@ -5,6 +5,11 @@
                #:use-module (guix build utils)
                #:use-module (gnu packages)
                #:use-module (gnu packages linux)
+               #:use-module (gnu packages vim)
+               #:use-module (gnu packages gcc)
+               #:use-module (gnu packages textutils)
+               #:use-module (gnu packages tree-sitter)
+               #:use-module (gnu packages julia)
                #:use-module (gnu packages python-xyz)
                #:use-module (guix git-download)
                #:use-module (guix utils))
@@ -35,4 +40,37 @@
                   (("bluetoothd-fix-permissions:") "install-IGNORED2:")
                   (("bluetoothd-fix-permissions") ""))))))))))
 
-bluez-ryan
+(define-public neovim-ryan
+  (package
+    (inherit neovim)
+    (version "0.11.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/neovim/neovim")
+                     (commit (string-append "v" version))))
+              (file-name (git-file-name "neovim" version))
+              (sha256
+                (base32
+                  "0arypdiycmss5g9wav21hfdc384v1ly82jnsc32zincl2y3f628q"))))
+    (native-inputs (modify-inputs (package-native-inputs neovim) (prepend gcc-14)))
+    (inputs (modify-inputs (package-inputs neovim) (append utf8proc) (replace "tree-sitter" treesitter-ryan)))))
+
+(define-public treesitter-ryan
+  (package
+    (inherit tree-sitter)
+    (version "0.25.4")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/tree-sitter/tree-sitter")
+                     (commit (string-append "v" version))))
+              (file-name (git-file-name "tree-sitter" version))
+              (sha256
+                (base32
+                  "0d4ca0ikpmkqg9xlbx45c7mafr5yz0g99y3s3jy5xk86f0nkz8ga"))
+              (modules '((guix build utils)))
+              (snippet #~(begin
+                           (delete-file-recursively "lib/src/unicode")))))))
+
+neovim-ryan
diff --git a/modules/ryan-packages/package-management.scm b/modules/ryan-packages/package-management.scm
index 9629168..18c7be4 100644
--- a/modules/ryan-packages/package-management.scm
+++ b/modules/ryan-packages/package-management.scm
@@ -36,7 +36,7 @@
 (define-public nix-ryan
   (package
     (name "nix")
-    (version "2.26.3")
+    (version "2.29.0")
     (source
       (origin
         (method git-fetch)
@@ -45,7 +45,7 @@
                (commit version)))
         (file-name (git-file-name "nix" version))
         (sha256
-          (base32 "1rh9k0cdixahqzziylgg7p8j9p58h55m08h3l1kg369wlmi7r5g5"))))
+          (base32 "19cd94xpjzwmclscpw9x3gfic0vf160llfnh9diz2l4823fw8iky"))))
     (build-system meson-build-system)
     (arguments
       (list
@@ -94,7 +94,7 @@
 (define libbl3
   (package
     (name "blake3")
-    (version "1.7.0")
+    (version "1.8.2")
     (source
       (origin
         (method git-fetch)
@@ -103,11 +103,12 @@
                (commit version)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "1dsx5jmr8csgzdvfxf4byc1086rg6vclqgqkz54la8rpfn3gkh6k"))))
+          (base32 "1pm7285insrmpfwwal8rnp3yhvc6s2ki8b6ccmbh2qfnnl95a010"))))
     (build-system cmake-build-system)
     (arguments
       (list
         #:configure-flags #~(list "-DCMAKE_POSITION_INDEPENDENT_CODE=on")
+        #:tests? #f
         #:phases
         #~(modify-phases %standard-phases
             (add-after 'unpack 'enter-build-directory
@@ -135,6 +136,9 @@
         (sha256
           (base32 "0d15b50cf9jgvh3w99xh6crh03bn2dmv9bdyvzq6knsk2diql1dj"))))
     (build-system cmake-build-system)
+    (arguments
+      (list
+        #:tests? #f))
     (home-page "https://github.com/ToruNiina/toml11")
     (synopsis "TODO")
     (description "TODO")