From 4e75b9fca2868263f7ec4e4184bd33101dda25ed Mon Sep 17 00:00:00 2001 From: Astrid Yu Date: Fri, 14 Jun 2024 11:20:47 -0700 Subject: [PATCH] fix recursion --- nix/nixos-modules/roles/ejabberd.nix | 1 + nix/nixos-modules/roles/laptop.nix | 2 +- nix/outputs.nix | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nix/nixos-modules/roles/ejabberd.nix b/nix/nixos-modules/roles/ejabberd.nix index 37ca12f0..9ad5050f 100644 --- a/nix/nixos-modules/roles/ejabberd.nix +++ b/nix/nixos-modules/roles/ejabberd.nix @@ -1,4 +1,5 @@ { config, pkgs, lib, ... }: +with lib; let httpPort = 5443; diff --git a/nix/nixos-modules/roles/laptop.nix b/nix/nixos-modules/roles/laptop.nix index c2189fbc..05c910ca 100644 --- a/nix/nixos-modules/roles/laptop.nix +++ b/nix/nixos-modules/roles/laptop.nix @@ -3,7 +3,7 @@ { config, pkgs, lib, ... }: let inputs = config.astral.inputs; in { - imports = [ inputs.self.nixosModules.pc ]; + # imports = [ inputs.self.nixosModules.pc ]; environment.systemPackages = with pkgs; [ xorg.xf86videointel diff --git a/nix/outputs.nix b/nix/outputs.nix index 662c8878..5b0f3dc2 100644 --- a/nix/outputs.nix +++ b/nix/outputs.nix @@ -89,7 +89,7 @@ in { nixosModules = { default = self.nixosModules.astral; astral = import ./nixos-modules/astral inputs; - } // import ./nixos-modules/roles.nix inputs; + } // import ./nixos-modules/roles.nix; nixosConfigurations = self.lib.machines.nixosConfigurations; } // flake-utils.lib.eachSystem [