From 795bb178574463b05b348fabba82fb8e2f884830 Mon Sep 17 00:00:00 2001 From: Chris Kruining Date: Mon, 22 Jul 2024 12:43:19 +0200 Subject: [PATCH] I am blind as a bat... --- default.nix | 3 +++ flake.lock | 17 +++++++++++++++++ flake.nix | 4 ++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 910d7ac..351b49a 100644 --- a/default.nix +++ b/default.nix @@ -14,6 +14,9 @@ in ++ (mapModulesRec' (toString ./modules) import); environments.variables = { + KAAS = config.kaas.dir; + KAAS_BIN = config.kaasbinDir; + NIXPKGS_ALLOW_UNFREE = "1"; }; system = { diff --git a/flake.lock b/flake.lock index 0ad6ecd..a859e15 100644 --- a/flake.lock +++ b/flake.lock @@ -220,6 +220,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1721379653, + "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1714912032, @@ -240,6 +256,7 @@ "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", "stylix": "stylix" } }, diff --git a/flake.nix b/flake.nix index 9ab358b..85eb03d 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ }; outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, ... }: let - inherit (lib.my) mapModules mapModules mapHosts; + inherit (lib.my) mapModules mapModulesRec mapHosts; system = "x84_64-linux"; @@ -37,7 +37,7 @@ in { lib = lib.my; - packages."${system}" = mapModules ./paclages (p: pkgs.callPackage p {}); + packages."${system}" = mapModules ./packages (p: pkgs.callPackage p {}); nixosModules = {