From b5cbecc775eb38e998fa31abd1ef6e4d9933bf44 Mon Sep 17 00:00:00 2001 From: Myned Date: Thu, 6 Mar 2025 14:56:38 -0600 Subject: [PATCH] nix: fix jovian import affecting all systems Signed-off-by: Myned --- flake.in.nix | 28 ++++++++++++---------------- profiles/console/default.nix | 7 ++++++- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/flake.in.nix b/flake.in.nix index 8298a2d..57c76bd 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -123,22 +123,18 @@ # 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."nur-${branch}".modules.nixos.default - 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 - ]; + 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."nur-${branch}".modules.nixos.default + 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 + ]; # TODO: Use home-manager.sharedModules for all options home-manager.sharedModules = [ diff --git a/profiles/console/default.nix b/profiles/console/default.nix index 745b30c..8754d5a 100644 --- a/profiles/console/default.nix +++ b/profiles/console/default.nix @@ -1,16 +1,21 @@ { config, + inputs, lib, options, pkgs, ... }: { + imports = [ + inputs.jovian-nixos.nixosModules.default + ]; + custom = { minimal = true; profile = "console"; + desktop = "gnome"; desktops = { - desktop = "gnome"; gnome.gdm = false; };