diff --git a/flake.lock b/flake.lock index 215aaa0..b87ebce 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "selfprivacy-graphql-api": "selfprivacy-graphql-api" }, "locked": { - "lastModified": 1699585538, - "narHash": "sha256-cXvJ3TqpNY+uxs1npza1+dMT4TFWG11y7AVUczWzgck=", + "lastModified": 1699588203, + "narHash": "sha256-nT25uKKYIL0FuCuLFmEbQrolMpG4zafYI5hcKYq2BHs=", "ref": "flakes", - "rev": "6c849e262838257afb20f258c3a66b0fc94e17b0", - "revCount": 125, + "rev": "41212f770accfcae3416c92c5dd46a4d19eda4d2", + "revCount": 128, "type": "git", "url": "file:///data/selfprivacy/selfprivacy-nixos-config" }, @@ -167,7 +167,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-1F21hNl40rklsXxDcFZXUGvY5aVLUqtc6QTsAZnHDsQ=", + "narHash": "sha256-I0bEECuJgrvEhmc82AjGcvONrkVc9sBRvRDNqc1IE+8=", "path": "./sp-modules", "type": "path" }, diff --git a/flake.nix b/flake.nix index 73d8290..3dfc6b4 100644 --- a/flake.nix +++ b/flake.nix @@ -2,14 +2,17 @@ description = "SelfPrivacy NixOS configuration local flake"; inputs.selfprivacy-nixos-config.url = git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git; - inputs.sp-modules.url = path:./sp-modules; + # inputs.sp-modules.url = path:./sp-modules; - outputs = { self, selfprivacy-nixos-config, sp-modules }: { - nixosConfigurations = builtins.trace self.rev + # outputs = { self, selfprivacy-nixos-config, sp-modules }: { + outputs = { self, selfprivacy-nixos-config }: { + nixosConfigurations = selfprivacy-nixos-config.outputs.nixosConfigurations-fun { hardware-configuration = ./hardware-configuration.nix; userdata = builtins.fromJSON (builtins.readFile ./userdata.json); top-level-flake = self; + # sp-modules = sp-modules.inputs; + sp-modules = builtins.getFlake (toString ./sp-modules); }; }; } diff --git a/sp-modules/flake.nix b/sp-modules/flake.nix index 16d7b5a..d8232aa 100644 --- a/sp-modules/flake.nix +++ b/sp-modules/flake.nix @@ -3,5 +3,5 @@ inputs.mailserver.url = gitlab:simple-nixos-mailserver/nixos-mailserver; - outputs = inputs: inputs; + outputs = _: { }; }