From a05ffd55c33564a6149bb74cb3c38c2fd9705cf9 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Wed, 16 Oct 2024 01:21:11 -0400 Subject: [PATCH] Update the networking stuff --- hosts/shuttleworth/system/default.nix | 1 + hosts/shuttleworth/system/hardware/default.nix | 4 ++-- modules/system/devices/networking/wireless/default.nix | 6 +++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hosts/shuttleworth/system/default.nix b/hosts/shuttleworth/system/default.nix index 572ab93..cc8fbca 100644 --- a/hosts/shuttleworth/system/default.nix +++ b/hosts/shuttleworth/system/default.nix @@ -13,6 +13,7 @@ # Devices and hardware ../../../modules/system/devices ../../../modules/system/devices/boot/extlinux + ../../../modules/system/devices/networking/wireless ../../../modules/system/devices/networking/firewall/pc ../../../modules/system/devices/networking/wireguard/pc diff --git a/hosts/shuttleworth/system/hardware/default.nix b/hosts/shuttleworth/system/hardware/default.nix index 2336291..2de1890 100644 --- a/hosts/shuttleworth/system/hardware/default.nix +++ b/hosts/shuttleworth/system/hardware/default.nix @@ -1,4 +1,4 @@ -{ config, outputs, lib, pkgs, modulesPath, ... }: +{ config, lib, pkgs, modulesPath, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -27,7 +27,7 @@ fsType = "btrfs"; }; "/home/jimbo/JimboNFS" = { - device = "${outputs.ips.wgSpan}.1:/export/JimboNFS"; + device = "${config.ips.wgSpan}.1:/export/JimboNFS"; fsType = "nfs4"; options = ["x-systemd.automount" "_netdev" "nofail" "noauto"]; }; diff --git a/modules/system/devices/networking/wireless/default.nix b/modules/system/devices/networking/wireless/default.nix index cc3c95a..73f6087 100644 --- a/modules/system/devices/networking/wireless/default.nix +++ b/modules/system/devices/networking/wireless/default.nix @@ -1,7 +1,11 @@ -{ ... }: +{ pkgs, ... }: { networking = { wireless.iwd.enable = true; enableB43Firmware = true; }; + + environment.systemPackages = with pkgs; [ + unstable.impala + ]; }