From 1febc53be28e36acde7bab4d70c372c4349d0150 Mon Sep 17 00:00:00 2001 From: dadada Date: Fri, 14 Apr 2023 19:00:10 +0200 Subject: [PATCH] update helix --- flake.lock | 219 +-------------------------------------- flake.nix | 4 - nixos/configurations.nix | 21 ++-- outputs.nix | 1 - 4 files changed, 11 insertions(+), 234 deletions(-) diff --git a/flake.lock b/flake.lock index 82e29fc..3ec58e7 100644 --- a/flake.lock +++ b/flake.lock @@ -21,22 +21,6 @@ "type": "github" } }, - "crane": { - "flake": false, - "locked": { - "lastModified": 1661875961, - "narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=", - "owner": "ipetkov", - "repo": "crane", - "rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "devshell": { "inputs": { "flake-utils": "flake-utils", @@ -58,82 +42,6 @@ "type": "github" } }, - "devshell_2": { - "flake": false, - "locked": { - "lastModified": 1667210711, - "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=", - "owner": "numtide", - "repo": "devshell", - "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "dream2nix": { - "inputs": { - "alejandra": [ - "helix", - "nci" - ], - "all-cabal-json": [ - "helix", - "nci" - ], - "crane": "crane", - "devshell": [ - "helix", - "nci", - "devshell" - ], - "flake-utils-pre-commit": [ - "helix", - "nci" - ], - "ghc-utils": [ - "helix", - "nci" - ], - "gomod2nix": [ - "helix", - "nci" - ], - "mach-nix": [ - "helix", - "nci" - ], - "nixpkgs": [ - "helix", - "nci", - "nixpkgs" - ], - "poetry2nix": [ - "helix", - "nci" - ], - "pre-commit-hooks": [ - "helix", - "nci" - ] - }, - "locked": { - "lastModified": 1668851003, - "narHash": "sha256-X7RCQQynbxStZR2m7HW38r/msMQwVl3afD6UXOCtvx4=", - "owner": "nix-community", - "repo": "dream2nix", - "rev": "c77e8379d8fe01213ba072e40946cbfb7b58e628", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "dream2nix", - "type": "github" - } - }, "flake-registry": { "flake": false, "locked": { @@ -184,21 +92,6 @@ } }, "flake-utils_3": { - "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_4": { "locked": { "lastModified": 1623875721, "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", @@ -213,30 +106,6 @@ "type": "github" } }, - "helix": { - "inputs": { - "nci": "nci", - "nixpkgs": [ - "nixpkgs" - ], - "parts": "parts", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1680250441, - "narHash": "sha256-Qrn3mB6bb1DSvKxOJ9oAlxuMk64Fzg2W4BVmk6y3deA=", - "owner": "helix-editor", - "repo": "helix", - "rev": "3cf037237f1d080fdcb7990250955701389ae072", - "type": "github" - }, - "original": { - "owner": "helix-editor", - "ref": "23.03", - "repo": "helix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -294,33 +163,6 @@ "type": "github" } }, - "nci": { - "inputs": { - "devshell": "devshell_2", - "dream2nix": "dream2nix", - "nixpkgs": [ - "helix", - "nixpkgs" - ], - "rust-overlay": [ - "helix", - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1669011203, - "narHash": "sha256-Lymj4HktNEFmVXtwI0Os7srDXHZbZW0Nzw3/+5Hf8ko=", - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "rev": "c5133b91fc1d549087c91228bd213f2518728a4b", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1681001314, @@ -386,24 +228,6 @@ "type": "indirect" } }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1680213900, - "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1681269223, @@ -431,27 +255,9 @@ "type": "indirect" } }, - "parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1680392223, - "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "recipemd": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_3" }, "locked": { @@ -475,7 +281,6 @@ "devshell": "devshell", "flake-registry": "flake-registry", "flake-utils": "flake-utils_2", - "helix": "helix", "home-manager": "home-manager", "homePage": "homePage", "nixos-generators": "nixos-generators", @@ -484,28 +289,6 @@ "recipemd": "recipemd" } }, - "rust-overlay": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "helix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1668998422, - "narHash": "sha256-G/BklIplCHZEeDIabaaxqgITdIXtMolRGlwxn9jG2/Q=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "68ab029c93f8f8eed4cf3ce9a89a9fd4504b2d6e", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 273b18d..53fcacc 100644 --- a/flake.nix +++ b/flake.nix @@ -23,10 +23,6 @@ url = github:numtide/devshell; inputs.nixpkgs.follows = "nixpkgs"; }; - helix = { - url = github:helix-editor/helix/23.03; - inputs.nixpkgs.follows = "nixpkgs"; - }; nixos-generators = { url = "github:nix-community/nixos-generators"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nixos/configurations.nix b/nixos/configurations.nix index 9081b2f..8af4202 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -5,7 +5,6 @@ , homePage , nixos-hardware , recipemd -, helix , nixos-generators , flake-registry , ... @@ -37,16 +36,16 @@ in nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1 home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.sharedModules = (nixpkgs.lib.attrValues self.hmModules) ++ [ - { dadada.home.helix.package = helix.packages.${system}.helix; } - { manual.manpages.enable = false; } - ]; - home-manager.users.dadada = import ../home/home; - } - + ({ pkgs, lib, ... }: + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.sharedModules = (nixpkgs.lib.attrValues self.hmModules) ++ [ + { dadada.home.helix.package = pkgs.helix; } + { manual.manpages.enable = false; } + ]; + home-manager.users.dadada = import ../home/home; + }) ./modules/profiles/laptop.nix ./gorgon/configuration.nix ]; diff --git a/outputs.nix b/outputs.nix index 3393da0..568cd3d 100644 --- a/outputs.nix +++ b/outputs.nix @@ -9,7 +9,6 @@ , recipemd , agenix , devshell -, helix , ... } @ inputs: (flake-utils.lib.eachDefaultSystem (system: