From f33fb9e9bf1c05e3e0bcc3925c85c7ba66dc06de Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Tue, 14 Nov 2023 02:47:01 +0400 Subject: [PATCH] just-nixos => sp-nixos; selfprivacy/current-config-source; add formatter --- flake.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 68fbc85..79a0383 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ selfprivacy-graphql-api.url = "git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git"; + # make selfprivacy-graphql-api use the same shared nixpkgs selfprivacy-graphql-api.inputs.nixpkgs.follows = "nixpkgs"; }; @@ -21,7 +22,7 @@ lib = nixpkgs.legacyPackages.${system}.lib; in { - just-nixos = nixpkgs.lib.nixosSystem { + sp-nixos = nixpkgs.lib.nixosSystem { specialArgs = { inherit system; }; modules = [ hardware-configuration @@ -31,7 +32,7 @@ selfprivacy-graphql-api.packages.${system}.default) { # embed top-level flake source folder into the build - environment.etc."selfprivacy-config-source".source = + environment.etc."selfprivacy/current-config-source".source = top-level-flake.outPath; # for running "nix search nixpkgs", etc nix.registry.nixpkgs.flake = nixpkgs; @@ -53,9 +54,9 @@ sp-module.configPathsNeeded)); })) ) - # (sp-module: sp-module.nixosModules.default) (lib.attrsets.attrValues sp-modules); }; }; + formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt; }; }