refactor: nixos-* -> nixpkgs-*

This commit is contained in:
Giulio De Pasquale 2025-04-22 12:00:45 +01:00
parent dd151c9f1a
commit c47c8a42ee

View File

@ -1,8 +1,8 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/26d499fc9f1d567283d5d56fcf367edd815dba1d"; nixpkgs.url = "github:NixOS/nixpkgs/26d499fc9f1d567283d5d56fcf367edd815dba1d";
nixos-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c";
nixos-master.url = "github:NixOS/nixpkgs/master"; nixpkgs-master.url = "github:NixOS/nixpkgs/master";
local-unstable.url = "path:///home/giulio/dev/nixpkgs"; local-unstable.url = "path:///home/giulio/dev/nixpkgs";
pepeflake.url = "git+https://git.giugl.io/peperunas/pepeflake"; pepeflake.url = "git+https://git.giugl.io/peperunas/pepeflake";
teslamate-flake.url = "github:teslamate-org/teslamate/v1.32.0"; teslamate-flake.url = "github:teslamate-org/teslamate/v1.32.0";
@ -20,8 +20,8 @@
outputs = outputs =
{ self { self
, nixpkgs , nixpkgs
, nixos-unstable , nixpkgs-unstable
, nixos-master , nixpkgs-master
, local-unstable , local-unstable
, home-manager , home-manager
, teslamate-flake , teslamate-flake
@ -61,8 +61,8 @@
overlays = extOverlays; overlays = extOverlays;
}; };
unstablePkgs = importNixpkgs { flake = nixos-unstable; }; unstablePkgs = importNixpkgs { flake = nixpkgs-unstable; };
masterPkgs = importNixpkgs { flake = nixos-master; }; masterPkgs = importNixpkgs { flake = nixpkgs-master; };
localPkgs = importNixpkgs { flake = local-unstable; }; localPkgs = importNixpkgs { flake = local-unstable; };
teslamatePkgs = importNixpkgs { flake = teslamate-flake; }; teslamatePkgs = importNixpkgs { flake = teslamate-flake; };
agenixPkgs = importNixpkgs { flake = agenix-flake; }; agenixPkgs = importNixpkgs { flake = agenix-flake; };
@ -95,7 +95,7 @@
inherit (pkgs) newScope; inherit (pkgs) newScope;
in in
makeScope newScope (self: rec { makeScope newScope (self: rec {
inherit nixpkgs home-manager nixos-unstable; inherit nixpkgs home-manager nixpkgs-unstable;
inherit (self.callPackage ./lib/utils.nix { }) mkSysRole mkHomeRole; inherit (self.callPackage ./lib/utils.nix { }) mkSysRole mkHomeRole;
inherit (user) mkUser; inherit (user) mkUser;