summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/nix.org1
-rw-r--r--flake.nix7
m---------nix0
3 files changed, 4 insertions, 4 deletions
diff --git a/config/nix.org b/config/nix.org
index 1939a28..89928d5 100644
--- a/config/nix.org
+++ b/config/nix.org
@@ -2738,7 +2738,6 @@ because they enhance security.
programs = {
nix-ld.enable = true;
zsh.enable = true;
- light.enable = true;
ssh.enableAskPassword = false;
};
diff --git a/flake.nix b/flake.nix
index a524c32..7c309c8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -346,7 +346,7 @@ sha256sum installer.iso > installer.iso.sha256
node.specialArgs = {
monorepoSelf = self;
isIntegrationTest = true;
- };
+ } // nixmacs.inputs;
nodes."spontaneity" = { lib, ... }: {
imports = nixmacs.lib.mkHostModules "spontaneity" ++ [
@@ -359,8 +359,9 @@ sha256sum installer.iso > installer.iso.sha256
nixpkgs.overlays = lib.mkForce [];
}
];
- disabledModules = [
- "${nixmacs}/systems/spontaneity/hardware-configuration.nix"
+ disabledModules = [
+ "${self}/nix/modules/nixpkgs-options.nix"
+ "${self}/nix/systems/spontaneity/hardware-configuration.nix"
];
};
diff --git a/nix b/nix
-Subproject db63be0ac07cd5c2dad8f316250c6a6115f21c6
+Subproject 202612ad3fabefa274423bb24f955157b9a290a