From 575fed844375b40d7aa9344743d747c14e737e87 Mon Sep 17 00:00:00 2001 From: dadada Date: Sun, 25 Jun 2023 22:17:50 +0200 Subject: [PATCH] Use helix from nixpkgs --- flake.lock | 278 +-------------------------------------- flake.nix | 7 +- nixos/configurations.nix | 6 +- outputs.nix | 1 - 4 files changed, 11 insertions(+), 281 deletions(-) diff --git a/flake.lock b/flake.lock index 2c4daed..760f79d 100644 --- a/flake.lock +++ b/flake.lock @@ -21,22 +21,6 @@ "type": "github" } }, - "crane": { - "flake": false, - "locked": { - "lastModified": 1670900067, - "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=", - "owner": "ipetkov", - "repo": "crane", - "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "devshell": { "inputs": { "nixpkgs": [ @@ -58,78 +42,6 @@ "type": "github" } }, - "dream2nix": { - "inputs": { - "alejandra": [ - "helix", - "nci" - ], - "all-cabal-json": [ - "helix", - "nci" - ], - "crane": "crane", - "devshell": [ - "helix", - "nci" - ], - "flake-parts": [ - "helix", - "nci", - "parts" - ], - "flake-utils-pre-commit": [ - "helix", - "nci" - ], - "ghc-utils": [ - "helix", - "nci" - ], - "gomod2nix": [ - "helix", - "nci" - ], - "mach-nix": [ - "helix", - "nci" - ], - "nix-pypi-fetcher": [ - "helix", - "nci" - ], - "nixpkgs": [ - "helix", - "nci", - "nixpkgs" - ], - "poetry2nix": [ - "helix", - "nci" - ], - "pre-commit-hooks": [ - "helix", - "nci" - ], - "pruned-racket-catalog": [ - "helix", - "nci" - ] - }, - "locked": { - "lastModified": 1677289985, - "narHash": "sha256-lUp06cTTlWubeBGMZqPl9jODM99LpWMcwxRiscFAUJg=", - "owner": "nix-community", - "repo": "dream2nix", - "rev": "28b973a8d4c30cc1cbb3377ea2023a76bc3fb889", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "dream2nix", - "type": "github" - } - }, "flake-registry": { "flake": false, "locked": { @@ -165,21 +77,6 @@ } }, "flake-utils_2": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "locked": { "lastModified": 1623875721, "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", @@ -194,28 +91,6 @@ "type": "github" } }, - "helix": { - "inputs": { - "nci": "nci", - "nixpkgs": "nixpkgs", - "parts": "parts_2", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1684393286, - "narHash": "sha256-Ws9uWtZLvTwL5HNonFr4YwyPoTU8QlCvhs6IJ92aLDw=", - "owner": "helix-editor", - "repo": "helix", - "rev": "7f5940be80eaa3aec7903903072b7108f41dd97b", - "type": "github" - }, - "original": { - "owner": "helix-editor", - "ref": "23.05", - "repo": "helix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -240,7 +115,7 @@ "homePage": { "inputs": { "hugo-theme-anubis": "hugo-theme-anubis", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1655227494, @@ -272,50 +147,6 @@ "type": "github" } }, - "mk-naked-shell": { - "flake": false, - "locked": { - "lastModified": 1676572903, - "narHash": "sha256-oQoDHHUTxNVSURfkFcYLuAK+btjs30T4rbEUtCUyKy8=", - "owner": "yusdacra", - "repo": "mk-naked-shell", - "rev": "aeca9f8aa592f5e8f71f407d081cb26fd30c5a57", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "mk-naked-shell", - "type": "github" - } - }, - "nci": { - "inputs": { - "dream2nix": "dream2nix", - "mk-naked-shell": "mk-naked-shell", - "nixpkgs": [ - "helix", - "nixpkgs" - ], - "parts": "parts", - "rust-overlay": [ - "helix", - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1677297103, - "narHash": "sha256-ArlJIbp9NGV9yvhZdV0SOUFfRlI/kHeKoCk30NbSiLc=", - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "rev": "a79272a2cb0942392bb3a5bf9a3ec6bc568795b2", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1685840432, @@ -369,40 +200,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1677063315, - "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "988cc958c57ce4350ec248d2d53087777f9e1949", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1675183161, - "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1629226339, "narHash": "sha256-szvgmQcUJM3Kv/wNyIn+wtMrrvsks0bk9JOqI2Ij8Ao=", @@ -415,7 +212,7 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { "lastModified": 1686921029, "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", @@ -431,7 +228,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", "path": "/nix/store/n04lw5nrskzmz7rv17p09qrnjanfkg5d-source", @@ -442,50 +239,10 @@ "type": "indirect" } }, - "parts": { - "inputs": { - "nixpkgs-lib": [ - "helix", - "nci", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1675933616, - "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1675933616, - "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "recipemd": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1647022391, @@ -508,37 +265,14 @@ "devshell": "devshell", "flake-registry": "flake-registry", "flake-utils": "flake-utils", - "helix": "helix", "home-manager": "home-manager", "homePage": "homePage", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "recipemd": "recipemd" } }, - "rust-overlay": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "helix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1677292251, - "narHash": "sha256-D+6q5Z2MQn3UFJtqsM5/AvVHi3NXKZTIMZt1JGq/spA=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "34cdbf6ad480ce13a6a526f57d8b9e609f3d65dc", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 12b866e..3016008 100644 --- a/flake.nix +++ b/flake.nix @@ -31,14 +31,13 @@ url = "github:NixOS/flake-registry"; flake = false; }; - helix.url = "github:helix-editor/helix/23.05"; }; outputs = { ... } @ args: import ./outputs.nix args; nixConfig = { - extra-trusted-public-keys = "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="; - extra-substituters = "https://nix-community.cachix.org/ https://helix.cachix.org/"; - extra-trusted-substituters = "https://nix-community.cachix.org/ https://helix.cachix.org/"; + extra-trusted-public-keys = "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="; + extra-substituters = "https://nix-community.cachix.org/"; + extra-trusted-substituters = "https://nix-community.cachix.org/"; }; } diff --git a/nixos/configurations.nix b/nixos/configurations.nix index 7c61ccd..821ad22 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -6,8 +6,6 @@ , nixos-hardware , recipemd , nixos-generators -, flake-registry -, helix , ... }@inputs: let @@ -42,7 +40,7 @@ in home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.sharedModules = (nixpkgs.lib.attrValues self.hmModules) ++ [ - { dadada.home.helix.package = helix.packages.${system}.helix; } + { dadada.home.helix.package = pkgs.helix; } { manual.manpages.enable = false; } ]; home-manager.users.dadada = import ../home/home; @@ -83,7 +81,7 @@ in ]; }; - installer = nixpkgs.lib.nixosSystem rec { + installer = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ nixos-generators.nixosModules.install-iso diff --git a/outputs.nix b/outputs.nix index 6f2a1a2..ca14c83 100644 --- a/outputs.nix +++ b/outputs.nix @@ -9,7 +9,6 @@ , recipemd , agenix , devshell -, helix , ... } @ inputs: (flake-utils.lib.eachDefaultSystem (system: