From 889db08cc5fe4f767d64c2f89a6e1cf871d0c036 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 2 Sep 2024 23:04:37 +0200 Subject: [PATCH] Export desk-os as nixosModule --- flake.nix | 4 ++++ packages/calamares-extensions/modules/desk_os/main.py | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/flake.nix b/flake.nix index cef1a82..6162734 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,10 @@ }; }; + nixosModules = { + desk-os = import ./modules/desk-os; + }; + packages = forAllSystems (system: let pkgs = nixpkgsFor.${system}; in { diff --git a/packages/calamares-extensions/modules/desk_os/main.py b/packages/calamares-extensions/modules/desk_os/main.py index e6faa6b..5937c97 100644 --- a/packages/calamares-extensions/modules/desk_os/main.py +++ b/packages/calamares-extensions/modules/desk_os/main.py @@ -55,16 +55,22 @@ flake = f""" inputs = {{ nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + desk-os = {{ + url = "github:nixup-io/desk-os"; + inputs.nixpkgs.follows = "nixpkgs"; + }}; }}; outputs = {{ self, nixpkgs, + desk-os, }} @ inputs: {{ nixosConfigurations.{random_hostname} = nixpkgs.lib.nixosSystem {{ system = "x86_64-linux"; specialArgs = {{inherit inputs;}}; modules = [ + desk-os.nixosModules.desk-os ./configuration.nix ]; }};