From c88242c4fa240ddd5bb9c38dccd4d48cd142f511 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 2 Jun 2023 15:25:15 -0400 Subject: [PATCH] fix(modules): vendor our own revision of nixpkgs --- flake.lock | 18 +++++++++++++++++- flake.nix | 7 ++++--- modules/home-manager/default.nix | 4 ++-- modules/nixos/default.nix | 4 ++-- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 2d0cd86..9f825d3 100644 --- a/flake.lock +++ b/flake.lock @@ -16,9 +16,25 @@ "type": "github" } }, + "nixpkgs": { + "locked": { + "lastModified": 1685655444, + "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "root": { "inputs": { - "flake-compat": "flake-compat" + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 0a604ff..00c9b49 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,15 @@ { description = "Soothing pastel theme for Nix"; inputs = { + nixpkgs.url = "nixpkgs/nixos-unstable"; flake-compat = { url = "github:edolstra/flake-compat"; flake = false; }; }; - outputs = _: { - nixosModules.catppuccin = import ./modules/nixos; - homeManagerModules.catppuccin = import ./modules/home-manager; + outputs = { nixpkgs, ... }: { + nixosModules.catppuccin = import ./modules/nixos nixpkgs; + homeManagerModules.catppuccin = import ./modules/home-manager nixpkgs; }; } diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 3999379..b5a7a4d 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -1,6 +1,6 @@ -{ config, pkgs, lib, ... }: +nixpkgs: { config, pkgs, lib, ... }: let - extendedLib = import ../lib/mkExtLib.nix lib; + extendedLib = import ../lib/mkExtLib.nix nixpkgs.lib; in { imports = diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 884f888..0d4ff6a 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,6 +1,6 @@ -{ config, pkgs, lib, ... }: +nixpkgs: { config, pkgs, lib, ... }: let - extendedLib = import ../lib/mkExtLib.nix lib; + extendedLib = import ../lib/mkExtLib.nix nixpkgs.lib; in { imports =