From 82dd9ad2d4635882b77923e6cb823b32c7334fa4 Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Mon, 17 Jul 2023 04:22:20 +0400 Subject: [PATCH] now it's a function, requiring userdata argument --- configuration.nix | 2 +- flake.nix | 5 +---- variables.nix | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/configuration.nix b/configuration.nix index 70a6dc6..cfed0c6 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,4 @@ -{ selfprivacy-overlay, config, pkgs, lib, ... }: +{ userdata, selfprivacy-overlay, config, pkgs, lib, ... }: { imports = [ ./hardware-configuration.nix diff --git a/flake.nix b/flake.nix index 277f726..654cc02 100644 --- a/flake.nix +++ b/flake.nix @@ -12,12 +12,9 @@ outputs = { self, nixpkgs, selfprivacy-overlay }: let system = "x86_64-linux"; - - # pkgs = import nixpkgs { inherit system; }; - userdata = builtins.fromJSON (builtins.readFile ./userdata/userdata.json); in { - nixosConfigurations = { + nixosConfigurations-fun = userdata: { just-nixos = nixpkgs.lib.nixosSystem { specialArgs = { inherit system selfprivacy-overlay userdata; }; diff --git a/variables.nix b/variables.nix index b9a7366..2799df4 100644 --- a/variables.nix +++ b/variables.nix @@ -1,6 +1,6 @@ -{ pkgs, lib, ... }: +{ lib, userdata, ... }: let - jsonData = builtins.fromJSON (builtins.readFile ./userdata/userdata.json); + jsonData = userdata; in { services.userdata = {