From 0a546f625df3d48058d2e5be581009f1eb20fd3c Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Tue, 28 Jan 2025 17:54:51 -0800 Subject: [PATCH] scheme helix --- flake.lock | 94 ++++++++++++++++++++++++++++++++++++++ flake.nix | 8 ++-- users/tao/helix.nix | 2 +- users/tao/nushell/stuff.nu | 2 +- 4 files changed, 100 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 36a03ba..6da535d 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,21 @@ "type": "github" } }, + "crane": { + "locked": { + "lastModified": 1727974419, + "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", + "owner": "ipetkov", + "repo": "crane", + "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "determinate": { "inputs": { "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", @@ -157,6 +172,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "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": 1736619243, + "narHash": "sha256-o+LmzQToDudSGrB1U7MaYrwt7soc+TLNV7rKtlitgN4=", + "owner": "mattwparas", + "repo": "helix", + "rev": "a9d5557a3b3c11767432bdacd36ccb3bea02bfa5", + "type": "github" + }, + "original": { + "owner": "mattwparas", + "ref": "steel-event-system", + "repo": "helix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -532,6 +589,7 @@ "agenix": "agenix", "determinate": "determinate", "disko": "disko", + "helix": "helix", "home-manager": "home-manager_2", "nixos": "nixos", "nixos-cosmic": "nixos-cosmic", @@ -542,6 +600,27 @@ "zen-browser": "zen-browser" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "helix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728268235, + "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -557,6 +636,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": [ diff --git a/flake.nix b/flake.nix index 4c48531..e57d32d 100644 --- a/flake.nix +++ b/flake.nix @@ -21,10 +21,10 @@ url = "github:pjones/plasma-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - # helix = { - # url = "github:the-mikedavis/helix"; - # 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 79b0677..22e8404 100644 --- a/users/tao/helix.nix +++ b/users/tao/helix.nix @@ -227,6 +227,6 @@ }; enable = true; defaultEditor = true; - # package = inputs.helix.packages.${pkgs.system}.default; + package = inputs.helix.packages.${pkgs.system}.default; }; } diff --git a/users/tao/nushell/stuff.nu b/users/tao/nushell/stuff.nu index 4567ac0..7e5e5a8 100644 --- a/users/tao/nushell/stuff.nu +++ b/users/tao/nushell/stuff.nu @@ -74,7 +74,7 @@ def rebuild --wrapped [subcommand, ...rest] { if ((open /etc/hostname --raw) == "NOlaptop\n" and not (try {$rest | first | str starts-with "--builders"} catch {true})) { sudo nix store info --store ssh://nocomputer } - sudo nice -n19 nixos-rebuild $subcommand --flake /home/tao/projects/NOflake/ --impure --verbose ...$rest + sudo systemd-inhibit nice -n19 nixos-rebuild $subcommand --flake /home/tao/projects/NOflake/ --impure --verbose ...$rest toastify send rebuild done! } # def post-rebuild [] {