diff --git a/nixos/common/modules/ssh-luks-wifi.nix b/nixos/common/modules/ssh-luks-wifi.nix deleted file mode 100644 index d2342c14..00000000 --- a/nixos/common/modules/ssh-luks-wifi.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs, ... }: { - boot.initrd = let interface = "wlp170s0"; in { - systemd = { - enable = true; - - packages = [ pkgs.wpa_supplicant ]; - initrdBin = [ pkgs.wpa_supplicant ]; - targets.initrd.wants = [ "wpa_supplicant@${interface}.service" ]; - - # prevent WPA supplicant from requiring `sysinit.target`. - services."wpa_supplicant@".unitConfig.DefaultDependencies = false; - - network.enable = true; - network.networks."10-wlan" = { - matchConfig.Name = interface; - networkConfig.DHCP = "yes"; - }; - }; - }; -} diff --git a/nixos/common/modules/ssh-luks.nix b/nixos/common/modules/ssh-luks.nix index 1eb5c10a..23e368bf 100644 --- a/nixos/common/modules/ssh-luks.nix +++ b/nixos/common/modules/ssh-luks.nix @@ -1,16 +1,13 @@ -{ lib, ... }: { +{ ... }: { # https://nixos.wiki/wiki/Remote_LUKS_Unlocking # Unlock command: # ssh root@<Local_IP_Address> "Password" - boot.initrd = { enable = true; systemd.users.root.shell = "/bin/systemd-tty-ask-password-agent"; availableKernelModules = [ "cdc_ncm" # frameworks "e1000e" # nuc-server - "iwlwifi" # Add WiFi driver modules for your hardware - "cfg80211" # Wireless configuration API ]; network.enable = true; diff --git a/nixos/hosts/framework-server/default.nix b/nixos/hosts/framework-server/default.nix index 3ed68ed6..9743b1c5 100644 --- a/nixos/hosts/framework-server/default.nix +++ b/nixos/hosts/framework-server/default.nix @@ -7,7 +7,6 @@ ../../common/modules/builder.nix ../../common/services/fwupd.nix ../../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