From bd86a75ec514b56b89f978c2e680a49bb18e9aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Sun, 23 Mar 2025 23:02:23 +0100 Subject: [PATCH] flake: remove flake-parts --- flake.lock | 23 +---------------------- flake.nix | 28 +++++++++++----------------- 2 files changed, 12 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index eb64358..2011879 100644 --- a/flake.lock +++ b/flake.lock @@ -260,26 +260,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -474,7 +454,7 @@ }, "niko-nur": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs" }, "locked": { @@ -634,7 +614,6 @@ "disko": "disko", "fenix": "fenix", "firefox-darwin": "firefox-darwin", - "flake-parts": "flake-parts_2", "helix": "helix", "home-manager": "home-manager", "lix": "lix", diff --git a/flake.nix b/flake.nix index 1468e8f..d54c0be 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { outputs = - inputs@{ flake-parts, ... }: + inputs: let nilla = import ./nilla.nix { inherit inputs; }; systems = [ @@ -18,26 +18,20 @@ in lib.genAttrs systems mappedForSystem; in - flake-parts.lib.mkFlake { inherit inputs; } { - inherit systems; - - flake.nixosModules = nilla.nixosModules; - flake.darwinModules = nilla.darwinModules; - flake.homeModules = nilla.homeModules; - flake.nixosConfigurations = nilla.nixosConfigurations; - flake.darwinConfigurations = nilla.darwinConfigurations; - flake.homeConfigurations = nilla.homeConfigurations; - flake.devShells = transpose nilla.shells; - flake.packages = transpose nilla.packages; - flake.formatter = nilla.packages.formatter.result; + { + inherit (nilla) nixosModules; + inherit (nilla) darwinModules; + inherit (nilla) homeModules; + inherit (nilla) nixosConfigurations; + inherit (nilla) darwinConfigurations; + inherit (nilla) homeConfigurations; + devShells = transpose nilla.shells; + packages = transpose nilla.packages; + formatter = nilla.packages.formatter.result; }; inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixpkgs-unstable"; - flake-parts = { - url = "github:hercules-ci/flake-parts"; - inputs.nixpkgs-lib.follows = "nixpkgs"; - }; disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs";