From 4501768728653b6bc8ca384a63cfd8b1e007ec9a Mon Sep 17 00:00:00 2001 From: Myned Date: Mon, 10 Feb 2025 10:49:55 -0600 Subject: [PATCH] nix: restrict jovian module by version Signed-off-by: Myned --- flake.in.nix | 52 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/flake.in.nix b/flake.in.nix index e391098..8c6486a 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -109,29 +109,37 @@ #!! Avoid globally importing modules that are not guarded by .enable # https://github.com/NixOS/nixpkgs/issues/137168 ( - {inputs, ...}: { - imports = [ - inputs."aagl-gtk-on-nix-${branch}".nixosModules.default - inputs."home-manager-${branch}".nixosModules.home-manager - inputs."nix-index-database-${branch}".nixosModules.nix-index - inputs."stylix-${branch}".nixosModules.stylix - inputs.agenix.nixosModules.default - inputs.arion.nixosModules.arion - inputs.disko.nixosModules.disko - inputs.fw-fanctrl.nixosModules.default - inputs.jovian-nixos.nixosModules.default - inputs.niri-flake.nixosModules.niri - ]; + { + inputs, + lib, + ... + }: + with lib; { + imports = + [ + inputs."aagl-gtk-on-nix-${branch}".nixosModules.default + inputs."home-manager-${branch}".nixosModules.home-manager + inputs."nix-index-database-${branch}".nixosModules.nix-index + inputs."stylix-${branch}".nixosModules.stylix + inputs.agenix.nixosModules.default + inputs.arion.nixosModules.arion + inputs.disko.nixosModules.disko + inputs.fw-fanctrl.nixosModules.default + inputs.niri-flake.nixosModules.niri + ] + ++ optionals (versionAtLeast version "25.05") [ + inputs.jovian-nixos.nixosModules.default + ]; - # TODO: Use home-manager.sharedModules for all options - home-manager.sharedModules = [ - inputs."nix-index-database-${branch}".hmModules.nix-index - inputs.ags.homeManagerModules.default - inputs.anyrun.homeManagerModules.default - inputs.nix-flatpak.homeManagerModules.nix-flatpak - inputs.walker.homeManagerModules.default - ]; - } + # TODO: Use home-manager.sharedModules for all options + home-manager.sharedModules = [ + inputs."nix-index-database-${branch}".hmModules.nix-index + inputs.ags.homeManagerModules.default + inputs.anyrun.homeManagerModules.default + inputs.nix-flatpak.homeManagerModules.nix-flatpak + inputs.walker.homeManagerModules.default + ]; + } ) ]; };