From 35325886827a5b7e4e79be860687214fb872aeab Mon Sep 17 00:00:00 2001 From: isabel Date: Thu, 9 Nov 2023 17:16:45 +0000 Subject: [PATCH] fix: messy stuff lol --- .../host/os/boot/loader/grub/default.nix | 2 +- .../base/common/host/os/network/default.nix | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/base/common/host/os/boot/loader/grub/default.nix b/modules/base/common/host/os/boot/loader/grub/default.nix index 4355f87dc..463e3c392 100644 --- a/modules/base/common/host/os/boot/loader/grub/default.nix +++ b/modules/base/common/host/os/boot/loader/grub/default.nix @@ -14,7 +14,7 @@ in { useOSProber = true; efiSupport = true; enableCryptodisk = mkDefault false; - device = cfg.boot.device; + device = cfg.boot.grub.device; theme = null; backgroundColor = null; splashImage = null; diff --git a/modules/base/common/host/os/network/default.nix b/modules/base/common/host/os/network/default.nix index 381b4ecf7..d001779f5 100644 --- a/modules/base/common/host/os/network/default.nix +++ b/modules/base/common/host/os/network/default.nix @@ -29,19 +29,6 @@ in { resolved.enable = true; }; - wireless = { - enable = sys.networking.wirelessBackend == "wpa_supplicant"; - userControlled.enable = true; - iwd = { - enable = sys.networking.wirelessBackend == "iwd"; - settings = { - Settings = { - AutoConnect = true; - }; - }; - }; - }; - networking = { # generate a host ID by hashing the hostname hostId = builtins.substring 0 8 (builtins.hashString "md5" config.networking.hostName); @@ -68,6 +55,19 @@ in { "9.9.9.9" ]; + wireless = { + enable = sys.networking.wirelessBackend == "wpa_supplicant"; + userControlled.enable = true; + iwd = { + enable = sys.networking.wirelessBackend == "iwd"; + settings = { + Settings = { + AutoConnect = true; + }; + }; + }; + }; + networkmanager = { enable = true; plugins = [];