From 9d741b85166edf322b9c6618b0f5396c68b6a477 Mon Sep 17 00:00:00 2001 From: didier amyot Date: Mon, 13 Jul 2026 20:27:00 -0400 Subject: [PATCH] feat: fixed flake --- flake.nix | 86 +++++++++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/flake.nix b/flake.nix index 486a2fc..f448c05 100644 --- a/flake.nix +++ b/flake.nix @@ -7,50 +7,12 @@ }; outputs = { self, nixpkgs, flake-utils, ... }: - flake-utils.lib.eachDefaultSystem (system: - let - pkgs = nixpkgs.legacyPackages.${system}; - dotnet = pkgs.dotnetCorePackages.sdk_9_0; - pythonEnv = pkgs.python3.withPackages (ps: [ ps.requests ]); - - phenix-website = pkgs.buildDotnetModule { - name = "phenix-website"; - src = ./.; - projectFile = "Phenix.csproj"; - selfContainedBuild = true; - dotnet-sdk = dotnet; - dotnet-runtime = pkgs.dotnetCorePackages.runtime_9_0; - runtimeIdentifiers = "linux-x64"; - nugetDeps = ./deps.nix; - - postInstall = '' - cp -r static $out/lib/static/ - cp appsettings.json $out/lib/ - ''; - meta.mainProgram = "Phenix"; - }; - in { - packages = { - default = phenix-website; - website = phenix-website; - }; - - devShell = pkgs.mkShell { - name = "Phenix-Website"; - buildInputs = [ dotnet pkgs.nuget-to-nix pythonEnv ]; - - shellHook = '' - export PATH="$PWD/dev/populate-db:$PATH" - ''; - }; - }) // { - - nixosModules.default = { config, lib, pkgs, ... }: + let + nixosModule = { config, lib, pkgs, ... }: let cfg = config.services.all-dressed-programming.phenix-website; phenix = self.packages.${pkgs.system}.website; - pythonEnv = pkgs.python3.withPackages (ps: [ ps.requests ]); - in { + in { options.services.all-dressed-programming.phenix-website = { enable = lib.mkEnableOption "Balle Phenix website"; domain = lib.mkOption { @@ -120,8 +82,46 @@ }; users.groups.phenix = {}; - }; }; - }; + in + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + dotnet = pkgs.dotnetCorePackages.sdk_9_0; + pythonEnv = pkgs.python3.withPackages (ps: [ ps.requests ]); + + phenix-website = pkgs.buildDotnetModule { + name = "phenix-website"; + src = ./.; + projectFile = "Phenix.csproj"; + selfContainedBuild = true; + dotnet-sdk = dotnet; + dotnet-runtime = pkgs.dotnetCorePackages.runtime_9_0; + runtimeIdentifiers = "linux-x64"; + nugetDeps = ./deps.nix; + + postInstall = '' + cp -r static $out/lib/static/ + cp appsettings.json $out/lib/ + ''; + meta.mainProgram = "Phenix"; + }; + in { + packages = { + default = phenix-website; + website = phenix-website; + }; + + devShell = pkgs.mkShell { + name = "Phenix-Website"; + buildInputs = [ dotnet pkgs.nuget-to-nix pythonEnv ]; + + shellHook = '' + export PATH="$PWD/dev/populate-db:$PATH" + ''; + }; + }) // { + nixosModules.x86_64-linux = nixosModule; + }; }