diff --git a/common/helix.nix b/common/helix.nix index 873e007..6cfd9fa 100644 --- a/common/helix.nix +++ b/common/helix.nix @@ -1,10 +1,9 @@ { - inputs, lib, pkgs, ... }: let - package = inputs.hxwrap.packages.${pkgs.system}.default; + package = pkgs.helix; in { environment.systemPackages = [package]; diff --git a/flake.lock b/flake.lock index f66be91..4fbe8a3 100644 --- a/flake.lock +++ b/flake.lock @@ -49,37 +49,6 @@ "type": "github" } }, - "cachix_2": { - "inputs": { - "devenv": [ - "hxwrap", - "devenv" - ], - "flake-compat": [ - "hxwrap", - "devenv" - ], - "git-hooks": [ - "hxwrap", - "devenv" - ], - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1728672398, - "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", - "owner": "cachix", - "repo": "cachix", - "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "latest", - "repo": "cachix", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -136,40 +105,6 @@ "url": "file:///dev/null" } }, - "devenv-root_2": { - "flake": false, - "locked": { - "narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=", - "type": "file", - "url": "file:///dev/null" - }, - "original": { - "type": "file", - "url": "file:///dev/null" - } - }, - "devenv_2": { - "inputs": { - "cachix": "cachix_2", - "flake-compat": "flake-compat_2", - "git-hooks": "git-hooks_2", - "nix": "nix_2", - "nixpkgs": "nixpkgs_7" - }, - "locked": { - "lastModified": 1734605856, - "narHash": "sha256-RfNqLS5f9s3aiRZIOjSbM8Vz7x2dT/7zwJhyt9TLEmE=", - "owner": "cachix", - "repo": "devenv", - "rev": "f81cf7dc4cbfa46de11618af94e5983c5e600d8c", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -187,22 +122,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1717312683, @@ -258,47 +177,6 @@ "type": "github" } }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "hxwrap", - "devenv", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": [ @@ -327,37 +205,6 @@ "type": "github" } }, - "git-hooks_2": { - "inputs": { - "flake-compat": [ - "hxwrap", - "devenv" - ], - "gitignore": "gitignore_2", - "nixpkgs": [ - "hxwrap", - "devenv", - "nixpkgs" - ], - "nixpkgs-stable": [ - "hxwrap", - "devenv" - ] - }, - "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -380,29 +227,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "hxwrap", - "devenv", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "hardware": { "locked": { "lastModified": 1735388221, @@ -439,27 +263,6 @@ "type": "github" } }, - "hxwrap": { - "inputs": { - "devenv": "devenv_2", - "devenv-root": "devenv-root_2", - "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1734816808, - "narHash": "sha256-m26BfEc0gQxH0cJ55RThpdmWIHBi1PGrFlUkpXHFx0s=", - "ref": "refs/heads/main", - "rev": "2d348d78cc12247a405f6f9914b08e82579fd167", - "revCount": 12, - "type": "git", - "url": "https://forgejo@tea.wrz.one/lukas/hxwrap.git" - }, - "original": { - "type": "git", - "url": "https://forgejo@tea.wrz.one/lukas/hxwrap.git" - } - }, "libgit2": { "flake": false, "locked": { @@ -476,22 +279,6 @@ "type": "github" } }, - "libgit2_2": { - "flake": false, - "locked": { - "lastModified": 1697646580, - "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", - "type": "github" - }, - "original": { - "owner": "libgit2", - "repo": "libgit2", - "type": "github" - } - }, "nix": { "inputs": { "flake-compat": [ @@ -525,56 +312,19 @@ "type": "github" } }, - "nix_2": { - "inputs": { - "flake-compat": [ - "hxwrap", - "devenv" - ], - "flake-parts": "flake-parts_3", - "libgit2": "libgit2_2", - "nixpkgs": "nixpkgs_6", - "nixpkgs-23-11": [ - "hxwrap", - "devenv" - ], - "nixpkgs-regression": [ - "hxwrap", - "devenv" - ], - "pre-commit-hooks": [ - "hxwrap", - "devenv" - ] - }, - "locked": { - "lastModified": 1727438425, - "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", - "owner": "domenkozar", - "repo": "nix", - "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.24", - "repo": "nix", - "type": "github" - } - }, "nixos-cosmic": { "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_9", + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1735362320, - "narHash": "sha256-nNPTwaTLwMFX4Y0ugxwubIw2LJ+qt2g2FrwBVjRr1zI=", + "lastModified": 1735430720, + "narHash": "sha256-WZDkLAgqUiLCWfcDBFbHDUBylSZ+eV1LRPsCUTGvVa4=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "7da43ac24467b538ae5f07117709665b189887fd", + "rev": "14ab32fdd713a199b904f8bc7df76d435b873205", "type": "github" }, "original": { @@ -611,18 +361,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1733096140, - "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1735141468, @@ -688,70 +426,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1717432640, - "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1716977621, - "narHash": "sha256-Q1UQzYcMJH4RscmpTkjlgqQDX5yi1tZL0O345Ri6vXQ=", - "owner": "cachix", - "repo": "devenv-nixpkgs", - "rev": "4267e705586473d3e5c8d50299e71503f16a6fb6", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "rolling", - "repo": "devenv-nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { "locked": { "lastModified": 1735291276, "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", @@ -774,7 +448,6 @@ "devenv-root": "devenv-root", "flake-parts": "flake-parts_2", "hardware": "hardware", - "hxwrap": "hxwrap", "nixos-cosmic": "nixos-cosmic", "nixpkgs": [ "nixos-cosmic", diff --git a/flake.nix b/flake.nix index 620dea3..97f69ce 100644 --- a/flake.nix +++ b/flake.nix @@ -6,20 +6,13 @@ flake-parts.url = "github:hercules-ci/flake-parts"; - # Hardware support hardware.url = "github:NixOS/nixos-hardware"; - # Agenix agenix.url = "github:ryantm/agenix"; - # Helix - hxwrap.url = "git+https://forgejo@tea.wrz.one/lukas/hxwrap.git"; - - # COSMIC nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; nixpkgs.follows = "nixos-cosmic/nixpkgs"; - # Devenv devenv-root = { url = "file+file:///dev/null"; flake = false;