Skip to content

Commit

Permalink
Adopt cannon flake "schema" (#6)
Browse files Browse the repository at this point in the history
* flake: rename outputs to match schema/standard

* flake: reintroduce old output names as deprecated

* flake: remove unnecessary uses of rec
  • Loading branch information
spikespaz authored Dec 9, 2022
1 parent d7f1434 commit c7530e0
Showing 1 changed file with 21 additions and 5 deletions.
26 changes: 21 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 {};
Expand All @@ -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;
Expand Down

0 comments on commit c7530e0

Please sign in to comment.