From c7530e0ae7a611f8ed74fd86fe6ca4dadaaa94d4 Mon Sep 17 00:00:00 2001 From: Jacob Birkett Date: Fri, 9 Dec 2022 11:03:58 -0700 Subject: [PATCH] Adopt cannon flake "schema" (#6) * flake: rename outputs to match schema/standard * flake: reintroduce old output names as deprecated * flake: remove unnecessary uses of rec --- flake.nix | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 50fcac8a..9216c5b9 100644 --- a/flake.nix +++ b/flake.nix @@ -16,8 +16,6 @@ # legacy reasons... defaultSystem = "x86_64-linux"; in { - homeManagerModule = import ./module.nix; - # legacy stuff thats just for x86_64 linux pkgs = pkgs.${defaultSystem}.callPackage ./pkgs {}; lib = pkgs.${defaultSystem}.callPackage ./lib {}; @@ -26,9 +24,27 @@ libs = genSystems ( system: (pkgs.${system}.callPackage ./lib {}) ); - pkgSets = genSystems ( - system: (pkgs.${system}.callPackage ./pkgs {}) - ); + + packages = genSystems (system: { + spicetify = pkgs.${system}.callPackage ./pkgs {}; + default = self.packages.${system}.spicetify; + }); + + homeManagerModules = { + spicetify = import ./module.nix; + default = self.homeManagerModules.spicetify; + }; + + pkgSets = genSystems (system: ( + nixpkgs.lib.warn + "deprecated, use packages.${system}.default" + self.packages.${system}.default + )); + + homeManagerModule = + nixpkgs.lib.warn + "deprecated, use homeManagerModules.default" + self.homeManagerModules.default; templates.default = { path = ./template;