From 83621c55db8caad040be4b32a8ebd85a56e71aef Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Fri, 28 Feb 2025 17:31:28 -0800 Subject: [PATCH] bump, helix --- flake.lock | 174 ++++++++++++++++++++++++++++++++++---------- flake.nix | 8 +- users/tao/helix.nix | 2 +- 3 files changed, 139 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 58cd507..cf3d68a 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,21 @@ "type": "github" } }, + "crane": { + "locked": { + "lastModified": 1737563566, + "narHash": "sha256-GLJvkOG29XCynQm8XWPyykMRqIhxKcBARVu7Ydrz02M=", + "owner": "ipetkov", + "repo": "crane", + "rev": "849376434956794ebc7a6b487d31aace395392ba", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "determinate": { "inputs": { "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", @@ -34,12 +49,12 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1740247206, - "narHash": "sha256-GVqcZH99f2vk+aXZae4iAtAZV/yktOULX8Pe/AuUGSA=", - "rev": "53799545fe86caccb3a9000d9a3b4ffcf974d869", - "revCount": 202, + "lastModified": 1740621356, + "narHash": "sha256-siZ2A2wrWff4hEdk8GoGYNzS2v8A6Sq1w9jUfO6PF34=", + "rev": "8181ddb0f1574484bad4f0ef737f47492518b54d", + "revCount": 204, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.202%2Brev-53799545fe86caccb3a9000d9a3b4ffcf974d869/01952ed3-ab93-7455-beda-23d7e193240a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.204%2Brev-8181ddb0f1574484bad4f0ef737f47492518b54d/01954520-9fe5-73c6-85c5-ba0c7316d622/source.tar.gz" }, "original": { "type": "tarball", @@ -49,37 +64,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-schScrGg7X4ggshUYZmzQwk8tchW5OpR3PY9xxtAeco=", + "narHash": "sha256-BWgJNJvsFnIL8PPJ0FQBsTphGJBeWPH5pip30/GCfxo=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.37.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.38.1/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.37.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.38.1/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-0iZSTDb2u3s5HycSnw4z8YNfvXRTWWxhhvCaDqbTiRk=", + "narHash": "sha256-qgwh45CQMQF2UbEqtt4bOFF+jRZuXF0ww+Qj2bQuWW8=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.37.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.38.1/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.37.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.38.1/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-fJTQkK9msoN02ria44WwXHi05fsJT9Rny69ENGmbOUc=", + "narHash": "sha256-cmddLhfYZOwB7u4Y4JuFOCAY5i/ENMG6HNnJAR2WLec=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.37.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.38.1/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.37.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.38.1/x86_64-linux" } }, "disko": { @@ -89,11 +104,11 @@ ] }, "locked": { - "lastModified": 1739841949, - "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", + "lastModified": 1740485968, + "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", "owner": "nix-community", "repo": "disko", - "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", + "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", "type": "github" }, "original": { @@ -157,6 +172,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "git-hooks-nix": { "inputs": { "flake-compat": [ @@ -196,6 +229,30 @@ "type": "github" } }, + "helix": { + "inputs": { + "crane": "crane", + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1740691503, + "narHash": "sha256-llpFPiWwR1wMxWTs4DRgeGBaLAc+FflxtHKhP3CC+tg=", + "owner": "mattwparas", + "repo": "helix", + "rev": "21f7a7b6fc73822758822037c12bce018f751952", + "type": "github" + }, + "original": { + "owner": "mattwparas", + "ref": "steel-event-system", + "repo": "helix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -224,11 +281,11 @@ ] }, "locked": { - "lastModified": 1740347597, - "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=", + "lastModified": 1740699498, + "narHash": "sha256-r9hkKzX99CGiP1ZqH0e+SWKK4CMsRNRLyotuwrUjhTI=", "owner": "nix-community", "repo": "home-manager", - "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449", + "rev": "b71edac7a3167026aabea82a54d08b1794088c21", "type": "github" }, "original": { @@ -301,11 +358,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1740308987, - "narHash": "sha256-/D6L1nqcf+GOO0Kr0tppkYVfRiU3Iy9auBQNhuBBkrA=", + "lastModified": 1740709758, + "narHash": "sha256-GjeruX5MrdVwpyaUZvSiRVOQjqkHcRunlOYtX0PReV8=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "42f72583bc88c8409894f52516adf29139d0d171", + "rev": "7e02381dc8a7702481c5bcbb18d2759211a80de4", "type": "github" }, "original": { @@ -331,11 +388,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740089251, - "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=", + "lastModified": 1740646007, + "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30", + "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", "type": "github" }, "original": { @@ -394,11 +451,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1740162160, - "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", + "lastModified": 1740463929, + "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", + "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b", "type": "github" }, "original": { @@ -440,12 +497,12 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1739742245, - "narHash": "sha256-oAgAV4fLWMIPqsEyZVVdk7c0SUdDOV1E7Epq0EIUQs4=", - "rev": "f0204ef4baa3b6317dee1c84ddeffbd293638836", - "revCount": 754508, + "lastModified": 1740396192, + "narHash": "sha256-ATMHHrg3sG1KgpQA5x8I+zcYpp5Sf17FaFj/fN+8OoQ=", + "rev": "d9b69c3ec2a2e2e971c534065bdd53374bd68b97", + "revCount": 758283, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.754508%2Brev-f0204ef4baa3b6317dee1c84ddeffbd293638836/0195178e-fb6b-77a3-b898-98672929c7b5/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.758283%2Brev-d9b69c3ec2a2e2e971c534065bdd53374bd68b97/01953b9b-6f3b-763c-a995-a868de575ca7/source.tar.gz" }, "original": { "type": "tarball", @@ -454,11 +511,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1740126099, - "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32fb99ba93fea2798be0e997ea331dd78167f814", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", "type": "github" }, "original": { @@ -472,6 +529,7 @@ "agenix": "agenix", "determinate": "determinate", "disko": "disko", + "helix": "helix", "home-manager": "home-manager_2", "nixos": "nixos", "nixos-cosmic": "nixos-cosmic", @@ -481,6 +539,27 @@ "zen-browser": "zen-browser" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "helix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737599167, + "narHash": "sha256-S2rHCrQWCDVp63XxL/AQbGr1g5M8Zx14C7Jooa4oM8o=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "38374302ae9edf819eac666d1f276d62c712dd06", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -496,6 +575,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "zen-browser": { "inputs": { "nixpkgs": [ @@ -503,11 +597,11 @@ ] }, "locked": { - "lastModified": 1739667343, - "narHash": "sha256-fNEz+Yd0t9jXz27qKRMAEBradTwYBeBLOECx+ydG25s=", + "lastModified": 1740554227, + "narHash": "sha256-xpwZeMw2gGenixGQDyVv+ja+epcR+EJ1BPuGFdgFS18=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8c7f6ca49f87b4e114f775a4dad956ceb6df4220", + "rev": "7de16ae319e6f6852274fa90b0d41c00049767c9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ea5473c..bc8f6f9 100644 --- a/flake.nix +++ b/flake.nix @@ -21,10 +21,10 @@ # url = "github:pjones/plasma-manager"; # inputs.nixpkgs.follows = "nixpkgs"; # }; - # helix = { - # url = "github:mattwparas/helix/steel-event-system"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + helix = { + url = "github:mattwparas/helix/steel-event-system"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixos-cosmic = { url = "github:lilyinstarlight/nixos-cosmic"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/users/tao/helix.nix b/users/tao/helix.nix index f75b0fa..baa51f0 100644 --- a/users/tao/helix.nix +++ b/users/tao/helix.nix @@ -256,6 +256,6 @@ }; enable = true; defaultEditor = true; - # package = inputs.helix.packages.${pkgs.system}.default; + package = inputs.helix.packages.${pkgs.system}.default; }; }