3 files changed, 57 insertions, 3 deletions

diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index 5740b26..bfa7ccb 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -142,7 +142,7 @@
                                                     "signal-desktop"
                                                     "sc-im"
                                                     "git-lfs"))
-                    (list my-neovim calcurse-fixed )))
+                    (list calcurse-fixed )))
 
   ;; Below is the list of Home services.  To search for available
   ;; services, run 'guix home search KEYWORD' in a terminal.
diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm
index 99bf597..402dc82 100644
--- a/modules/ryan-config/base-system.scm
+++ b/modules/ryan-config/base-system.scm
@@ -166,7 +166,7 @@
                                                           "openconnect-sso"
                                                           "webkitgtk-with-libsoup2" ; Needed for Go wails development
                                                           "zsh"))
-                      (list my-ca-certs virt-manager-ovmf bluez-ryan blueman-ryan)
+                      (list my-ca-certs virt-manager-ovmf bluez-ryan blueman-ryan neovim-ryan)
                       %my-base-packages ))
 
     ;; Below is the list of system services.  To search for available
diff --git a/modules/ryan-packages/linux.scm b/modules/ryan-packages/linux.scm
index 7ccfc2d..d5b215c 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,53 @@
                   (("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-2.10.0) (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")))))))
+
+(define-public utf8proc-2.10.0
+  (package
+    (inherit utf8proc-2.7.0)
+    (version "2.10.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/JuliaStrings/utf8proc")
+                     (commit (string-append "v" version))))
+              (file-name (git-file-name "utf8proc" version))
+              (sha256
+                (base32
+                  "1n1k67x39sk8xnza4w1xkbgbvgb1g7w2a7j2qrqzqaw1lyilqsy2"))))
+    (native-inputs (modify-inputs (package-native-inputs utf8proc-2.7.0) (prepend julia)))
+    (arguments (append (package-arguments utf8proc-2.7.0) (list #:tests? #f)))))
+
+neovim-ryan