From cea45e9515083116048c917233460f78bee22303 Mon Sep 17 00:00:00 2001 From: Miran Bastaja Date: Sat, 25 Nov 2023 19:56:35 +0100 Subject: Stop using helix flake Revert to using helix as packaged in nixpkgs because I can't seem to get the flake to substitute the outputs. Even when I don't override its nixpkgs and pin it to a release tag it still builds from source. --- flake.lock | 148 +++---------------------------------- flake.nix | 6 -- share/nixos-modules/nix-config.nix | 7 +- 3 files changed, 12 insertions(+), 149 deletions(-) diff --git a/flake.lock b/flake.lock index 0e5247c..1135458 100644 --- a/flake.lock +++ b/flake.lock @@ -50,36 +50,6 @@ "type": "github" } }, - "crane_2": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": [ - "helix", - "flake-utils" - ], - "nixpkgs": [ - "helix", - "nixpkgs" - ], - "rust-overlay": [ - "helix", - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1688772518, - "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", - "owner": "ipetkov", - "repo": "crane", - "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "devshell": { "inputs": { "nixpkgs": [ @@ -171,22 +141,6 @@ "type": "github" } }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -225,25 +179,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1685518550, @@ -259,9 +195,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1685518550, @@ -320,29 +256,6 @@ "type": "github" } }, - "helix": { - "inputs": { - "crane": "crane_2", - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1700676250, - "narHash": "sha256-08aSqFjN/TR82M6dkRPYMwemRHzvZ5qShTam8ltpfQE=", - "owner": "helix-editor", - "repo": "helix", - "rev": "090ed97e0045bfad1e5bff8b96c61707b996b85a", - "type": "github" - }, - "original": { - "owner": "helix-editor", - "repo": "helix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -369,7 +282,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4", + "systems": "systems_3", "wlroots": "wlroots", "xdph": "xdph" }, @@ -496,8 +409,8 @@ }, "pre-commit-hooks-nix": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -520,8 +433,8 @@ }, "pre-commit-hooks-nix_2": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_3", "gitignore": "gitignore_2", "nixpkgs": [ "sorre-website", @@ -548,7 +461,6 @@ "conduit": "conduit", "devshell": "devshell", "flake-parts": "flake-parts", - "helix": "helix", "home-manager": "home-manager", "hyprland": "hyprland", "nixpkgs": "nixpkgs", @@ -603,31 +515,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "flake-utils": [ - "helix", - "flake-utils" - ], - "nixpkgs": [ - "helix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1690424156, - "narHash": "sha256-Bpml+L280tHTQpwpC5/BJbU4HSvEzMvW8IZ4gAXimhE=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "f335a0213504c7e6481c359dc1009be9cf34432c", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "scripts": { "inputs": { "devshell": [ @@ -736,21 +623,6 @@ } }, "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -765,7 +637,7 @@ "type": "github" } }, - "systems_5": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -780,7 +652,7 @@ "type": "github" } }, - "systems_6": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index a23f224..e1e1d92 100644 --- a/flake.nix +++ b/flake.nix @@ -32,10 +32,6 @@ url = "github:cachix/pre-commit-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - helix = { - url = "github:helix-editor/helix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; scripts = { url = "git+https://codeberg.org/miranb/scripts.git"; inputs.nixpkgs.follows = "nixpkgs"; @@ -123,6 +119,4 @@ }; # end of pre-commit }; # end of perSystem }; # end of inputs.flake-parts.lib.mkFlake - - nixConfig = { }; } diff --git a/share/nixos-modules/nix-config.nix b/share/nixos-modules/nix-config.nix index 9634bcf..2b190cf 100644 --- a/share/nixos-modules/nix-config.nix +++ b/share/nixos-modules/nix-config.nix @@ -3,13 +3,10 @@ experimental-features = [ "nix-command" "flakes" ]; auto-optimise-store = true; - extra-substituters = - [ "https://helix.cachix.org" "https://hyprland.cachix.org" ]; + extra-substituters = [ "https://hyprland.cachix.org" ]; extra-trusted-public-keys = [ - "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; }; - nixpkgs.overlays = - [ inputs.helix.overlays.default inputs.hyprland.overlays.default ]; + nixpkgs.overlays = [ inputs.hyprland.overlays.default ]; } -- cgit v1.3.1