From 61c3c9c6b0c76c0060ea1c2e9dfcd7bf7ab84a8c Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Mon, 17 Feb 2025 21:06:28 -0800
Subject: [PATCH] Testing
---
nixos/common/modules/ssh-luks.nix | 2 --
nixos/hosts/framework-server/default.nix | 3 ++-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/nixos/common/modules/ssh-luks.nix b/nixos/common/modules/ssh-luks.nix
index 5862de36..ae376d62 100644
--- a/nixos/common/modules/ssh-luks.nix
+++ b/nixos/common/modules/ssh-luks.nix
@@ -3,8 +3,6 @@
# Unlock command:
# ssh root@<Local_IP_Address> "Password"
- imports = [ ] ++ lib.optional (builtins.isString wireless) ./ssh-luks-wifi.nix;
-
boot.initrd = {
enable = true;
systemd.users.root.shell = "/bin/systemd-tty-ask-password-agent";
diff --git a/nixos/hosts/framework-server/default.nix b/nixos/hosts/framework-server/default.nix
index e2b8d13d..3ed68ed6 100644
--- a/nixos/hosts/framework-server/default.nix
+++ b/nixos/hosts/framework-server/default.nix
@@ -6,7 +6,8 @@
../../common/modules/udev-rules.nix
../../common/modules/builder.nix
../../common/services/fwupd.nix
- ../../common/modules/ssh-luks.nix { wireless = true; }
+ ../../common/modules/ssh-luks.nix
+ ../../common/modules/ssh-luks-wifi.nix
../../common/services/docker.nix
../../common/services/tailscale-autoconnect.nix
../../common/services/forgejo-runner.nix