From d93aa9b473cd180cbb1ee1daee1374c12a8074c8 Mon Sep 17 00:00:00 2001 From: Matei Adriel Date: Sat, 27 Nov 2021 20:12:57 +0200 Subject: [PATCH] fix: actually did that now --- flake.lock | 34 ++++++++++++++++++++++++++++++++++ flake.nix | 12 ++++++++---- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index c2b9fee..d7da776 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,37 @@ { "nodes": { + "easy-dhall-nix": { + "flake": false, + "locked": { + "lastModified": 1626523404, + "narHash": "sha256-FLZcMqO8dKIwKi8/Szqgt3ksr5WegLGFGzCODHEMvb0=", + "owner": "justinwoo", + "repo": "easy-dhall-nix", + "rev": "9bd1bea0dcebe1d1d120c0fd1ba76683dc4a62e3", + "type": "github" + }, + "original": { + "owner": "justinwoo", + "repo": "easy-dhall-nix", + "type": "github" + } + }, + "easy-purescript-nix": { + "flake": false, + "locked": { + "lastModified": 1637830227, + "narHash": "sha256-S/n17xSJ9uSOY3EfIXWby/iNkQ+6LqHQmBM7T3yC4tg=", + "owner": "justinwoo", + "repo": "easy-purescript-nix", + "rev": "721bbd957c62594c46ea4c94f1a9f3cb341b2d25", + "type": "github" + }, + "original": { + "owner": "justinwoo", + "repo": "easy-purescript-nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -54,6 +86,8 @@ }, "root": { "inputs": { + "easy-dhall-nix": "easy-dhall-nix", + "easy-purescript-nix": "easy-purescript-nix", "home-manager": "home-manager", "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs" diff --git a/flake.nix b/flake.nix index 294b74c..09f8e79 100644 --- a/flake.nix +++ b/flake.nix @@ -21,14 +21,18 @@ ... }: { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - nixpkgs.overlays = [self: super: { - easy-purescript-nix = import easy-purescript-nix { inherit pgks }; - easy-dhall-nix = import easy-dhall-nix { inherit pgks }; - }]; modules = [ home-manager.nixosModules.home-manager ./hardware/laptop.nix ./configuration.nix + + # Make inputs available inside the config + ({ pkgs, ... }: { + nixpkgs.overlays = [(self: super: { + easy-purescript-nix = import easy-purescript-nix { inherit pkgs; }; + easy-dhall-nix = import easy-dhall-nix { inherit pkgs; }; + })]; + }) ]; }; };