Home

helix.drv @main - refs - log -
-
https://git.jolheiser.com/helix.drv.git
My Helix configuration as a Nix derivation
tree log patch
helix: disable grammar generation and update Grammar generation was done differently in newer versions in nixpkgs. Since I currently don't have any custom grammars, disable it for now. Signed-off-by: jolheiser <git@jolheiser.com>
Signature
-----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgBTEvCQk6VqUAdN2RuH6bj1dNkY oOpbPWj+jw4ua1B1cAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5 AAAAQDG2gpg+F9Wsx2S/2YaoCdMWTn3NPoC5Sq7XSW+5H1kjaMAra85EK8wLcH9TnJNRAJ FQwBNeo2RczVQBs+RE+g4= -----END SSH SIGNATURE-----
jolheiser <git@jolheiser.com>
17 hours ago
3 changed files, 16 additions(+), 16 deletions(-)
config/languages.nixdefault.nixflake.lock
M config/languages.nix -> config/languages.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
diff --git a/config/languages.nix b/config/languages.nix
index f1e6505cbf6a03c156336ed5005b90059e8f996b..78200efb2469237fd985878a5291523e7b2866cc 100644
--- a/config/languages.nix
+++ b/config/languages.nix
@@ -16,7 +16,7 @@     {
       name = "nix";
       auto-format = true;
       formatter = {
-        command = "${lib.getExe nixfmt-rfc-style}";
+        command = "${lib.getExe nixfmt}";
         args = [ "-q" ];
       };
     }
M default.nix -> default.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
diff --git a/default.nix b/default.nix
index 5cf7c3e3ba3b08587430f4f0680a8779dd681c0b..03a5d0a985579cb4d413bee904afef638fd14166 100644
--- a/default.nix
+++ b/default.nix
@@ -84,19 +84,19 @@         mkdir $out
         ln -s ${pkgs.helix}/* $out
         rm $out/bin
 
-        rm $out/lib
-        mkdir -p $out/lib/runtime
-        ln -s ${pkgs.helix}/lib/runtime/* $out/lib/runtime
+        #rm $out/lib
+        #mkdir -p $out/lib/runtime
+        #ln -s ${pkgs.helix}/lib/runtime/* $out/lib/runtime
 
-        rm $out/lib/runtime/grammars
-        mkdir $out/lib/runtime/grammars
-        ln -s ${pkgs.helix}/lib/runtime/grammars/* $out/lib/runtime/grammars
-        ${builtins.concatStringsSep "\n" grammarLinks}
+        #rm $out/lib/runtime/grammars
+        #mkdir $out/lib/runtime/grammars
+        #ln -s ${pkgs.helix}/lib/runtime/grammars/* $out/lib/runtime/grammars
+        #${builtins.concatStringsSep "\n" grammarLinks}
 
-        rm $out/lib/runtime/queries
-        mkdir $out/lib/runtime/queries
-        ln -s ${pkgs.helix}/lib/runtime/queries/* $out/lib/runtime/queries
-        ${builtins.concatStringsSep "\n" queryLinks}
+        #rm $out/lib/runtime/queries
+        #mkdir $out/lib/runtime/queries
+        #ln -s ${pkgs.helix}/lib/runtime/queries/* $out/lib/runtime/queries
+        #${builtins.concatStringsSep "\n" queryLinks}
 
         mkdir -p $out/home/helix/themes
         ln -s ${configFile} $out/home/helix/config.toml
@@ -107,8 +107,8 @@         mkdir -p $out/home/git
         ln -s ${ignoreFile} $out/home/git/ignore
 
         makeWrapper ${pkgs.helix}/bin/hx $out/bin/hx \
-          --set HELIX_RUNTIME $out/lib/runtime \
           --set XDG_CONFIG_HOME $out/home \
+          #--set HELIX_RUNTIME $out/lib/runtime \
       '';
 in
 {
M flake.lock -> flake.lock
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
diff --git a/flake.lock b/flake.lock
index d98c04e60def10190d8d5fc1632ac402882ab57e..98276f8b06c40243e04b8609ece2a3025974d33c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@ {
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1766025857,
-        "narHash": "sha256-Lav5jJazCW4mdg1iHcROpuXqmM94BWJvabLFWaJVJp0=",
+        "lastModified": 1787111413,
+        "narHash": "sha256-sFosWtq21eHGJRnTc/hvf4M1obRgLEUMNm/IzllkHMA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "def3da69945bbe338c373fddad5a1bb49cf199ce",
+        "rev": "afe3d8ac4395617bdcdac9f188ac8717a062e014",
         "type": "github"
       },
       "original": {