hosts: remove shared/nixosModules from mkSystem function
This commit is contained in:
parent
e0c277bf1e
commit
8967b25c80
1 changed files with 5 additions and 3 deletions
|
@ -7,10 +7,11 @@
|
||||||
mkSystem = args:
|
mkSystem = args:
|
||||||
inputs.nixpkgs.lib.nixosSystem {
|
inputs.nixpkgs.lib.nixosSystem {
|
||||||
specialArgs = {inherit inputs lib';};
|
specialArgs = {inherit inputs lib';};
|
||||||
modules = [../shared/nixosModules] ++ (args.modules or []);
|
modules = args.modules or [];
|
||||||
};
|
};
|
||||||
|
|
||||||
base = [
|
base = [
|
||||||
|
../shared/nixosModules
|
||||||
"${self}/config/nixos"
|
"${self}/config/nixos"
|
||||||
"${self}/config/nixos/core/home-manager.nix"
|
"${self}/config/nixos/core/home-manager.nix"
|
||||||
|
|
||||||
|
@ -18,6 +19,7 @@
|
||||||
|
|
||||||
"${self}/config/nixos/services/location.nix"
|
"${self}/config/nixos/services/location.nix"
|
||||||
|
|
||||||
|
"${self}/config/nixos/hardware/mcuxpresso.nix"
|
||||||
({
|
({
|
||||||
config,
|
config,
|
||||||
specialArgs,
|
specialArgs,
|
||||||
|
@ -41,6 +43,7 @@
|
||||||
"${self}/config/nixos/services/greetd.nix"
|
"${self}/config/nixos/services/greetd.nix"
|
||||||
|
|
||||||
"${self}/config/nixos/programs/hyprland.nix"
|
"${self}/config/nixos/programs/hyprland.nix"
|
||||||
|
"${self}/config/nixos/programs/xdg.nix"
|
||||||
"${self}/config/nixos/services/gnome.nix"
|
"${self}/config/nixos/services/gnome.nix"
|
||||||
({config, ...}: {
|
({config, ...}: {
|
||||||
home-manager.users.${config.local.systemVars.username}.imports = [
|
home-manager.users.${config.local.systemVars.username}.imports = [
|
||||||
|
@ -59,6 +62,7 @@
|
||||||
|
|
||||||
gaming = [
|
gaming = [
|
||||||
../config/nixos/programs/games.nix
|
../config/nixos/programs/games.nix
|
||||||
|
../config/nixos/services/flatpak.nix
|
||||||
({config, ...}: {
|
({config, ...}: {
|
||||||
home-manager.users.${config.local.systemVars.username}.imports = [
|
home-manager.users.${config.local.systemVars.username}.imports = [
|
||||||
"${self}/config/home-manager/programs/games"
|
"${self}/config/home-manager/programs/games"
|
||||||
|
@ -74,8 +78,6 @@
|
||||||
"${self}/config/nixos/services/kanata.nix"
|
"${self}/config/nixos/services/kanata.nix"
|
||||||
"${self}/config/nixos/services/power.nix"
|
"${self}/config/nixos/services/power.nix"
|
||||||
"${self}/config/nixos/services/brightness.nix"
|
"${self}/config/nixos/services/brightness.nix"
|
||||||
|
|
||||||
"${self}/config/nixos/hardware/mcuxpresso.nix"
|
|
||||||
];
|
];
|
||||||
in {
|
in {
|
||||||
vamos = mkSystem {
|
vamos = mkSystem {
|
||||||
|
|
Loading…
Reference in a new issue