From 8967b25c8011592c70024ae18e45794542e72daa Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Sat, 4 Jan 2025 22:36:14 +0100 Subject: [PATCH] hosts: remove shared/nixosModules from mkSystem function --- hosts/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hosts/default.nix b/hosts/default.nix index f1fc20d..a840d3e 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -7,10 +7,11 @@ mkSystem = args: inputs.nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs lib';}; - modules = [../shared/nixosModules] ++ (args.modules or []); + modules = args.modules or []; }; base = [ + ../shared/nixosModules "${self}/config/nixos" "${self}/config/nixos/core/home-manager.nix" @@ -18,6 +19,7 @@ "${self}/config/nixos/services/location.nix" + "${self}/config/nixos/hardware/mcuxpresso.nix" ({ config, specialArgs, @@ -41,6 +43,7 @@ "${self}/config/nixos/services/greetd.nix" "${self}/config/nixos/programs/hyprland.nix" + "${self}/config/nixos/programs/xdg.nix" "${self}/config/nixos/services/gnome.nix" ({config, ...}: { home-manager.users.${config.local.systemVars.username}.imports = [ @@ -59,6 +62,7 @@ gaming = [ ../config/nixos/programs/games.nix + ../config/nixos/services/flatpak.nix ({config, ...}: { home-manager.users.${config.local.systemVars.username}.imports = [ "${self}/config/home-manager/programs/games" @@ -74,8 +78,6 @@ "${self}/config/nixos/services/kanata.nix" "${self}/config/nixos/services/power.nix" "${self}/config/nixos/services/brightness.nix" - - "${self}/config/nixos/hardware/mcuxpresso.nix" ]; in { vamos = mkSystem {