From 3b651d5dc1317c0fcead869e51bef27ca590ba82 Mon Sep 17 00:00:00 2001 From: Giulio De Pasquale Date: Wed, 1 Jan 2025 15:20:48 +0000 Subject: [PATCH] feat: added pepeflake --- flake.lock | 49 ++++++++++++++++++++++++++++++++++++++++++------- flake.nix | 4 ++++ 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 5a8984b..a386838 100644 --- a/flake.lock +++ b/flake.lock @@ -35,7 +35,7 @@ "teslamate-flake", "devenv" ], - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1728672398, @@ -80,7 +80,7 @@ "flake-compat": "flake-compat", "git-hooks": "git-hooks", "nix": "nix", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1732298876, @@ -300,7 +300,7 @@ ], "flake-parts": "flake-parts", "libgit2": "libgit2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-23-11": [ "teslamate-flake", "devenv" @@ -394,6 +394,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1735264675, + "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d49da4c08359e3c39c4e27c74ac7ac9b70085966", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1730531603, "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", @@ -409,7 +425,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1717432640, "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", @@ -425,7 +441,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1716977621, "narHash": "sha256-Q1UQzYcMJH4RscmpTkjlgqQDX5yi1tZL0O345Ri6vXQ=", @@ -441,7 +457,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1732014248, "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", @@ -478,6 +494,24 @@ "type": "github" } }, + "pepeflake": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1735410731, + "narHash": "sha256-7cYfazIAz6DRhtjHze2CBvCD/Qleg8HgGCEF2NPUzQk=", + "ref": "refs/heads/master", + "rev": "619882bbc38afa8650219efb021827060db48c90", + "revCount": 9, + "type": "git", + "url": "https://git.giugl.io/peperunas/pepeflake" + }, + "original": { + "type": "git", + "url": "https://git.giugl.io/peperunas/pepeflake" + } + }, "root": { "inputs": { "agenix-flake": "agenix-flake", @@ -487,6 +521,7 @@ "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", "nvidia-patch": "nvidia-patch", + "pepeflake": "pepeflake", "teslamate-flake": "teslamate-flake" } }, @@ -525,7 +560,7 @@ "devenv": "devenv", "devenv-root": "devenv-root", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "treefmt-nix": "treefmt-nix" }, "locked": { diff --git a/flake.nix b/flake.nix index 7934711..a24d050 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ nixos-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixos-master.url = "github:NixOS/nixpkgs/master"; local-unstable.url = "path:///home/giulio/dev/nixpkgs"; + pepeflake.url = "git+https://git.giugl.io/peperunas/pepeflake"; teslamate-flake.url = "github:teslamate-org/teslamate/v1.32.0"; agenix-flake.url = "github:ryantm/agenix"; home-manager = { @@ -26,6 +27,7 @@ , teslamate-flake , nvidia-patch , agenix-flake + , pepeflake }: let sysLinuxX64 = "x86_64-linux"; @@ -64,6 +66,7 @@ localPkgs = importNixpkgs { flake = local-unstable; }; teslamatePkgs = importNixpkgs { flake = teslamate-flake; }; agenixPkgs = importNixpkgs { flake = agenix-flake; }; + pepePkgs = pepeflake.packages.${system} // pepeflake.legacyPackages.${system} or { }; additionalOverlays = [ (final: prev: { inherit unstablePkgs; }) @@ -71,6 +74,7 @@ (final: prev: { inherit teslamatePkgs; }) (final: prev: { inherit agenixPkgs; }) (final: prev: { inherit masterPkgs; }) + (final: prev: { inherit pepePkgs; }) ]; in import nixpkgs {