Skip to content

Commit f2ce6dc

Browse files
authored
refactored: networking modules
1 parent 3099d5f commit f2ce6dc

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

modules/nixos/network/default.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
{
22
imports = [
3-
./dhcp.nix
43
./firewalld.nix
54
./gnupg.nix
65
./manager.nix
76
# ./openssh.nix
8-
./resolved.nix
9-
./wait-online.nix
7+
./systemd.nix
108
./wireless.nix
119
];
1210
}

modules/nixos/network/dhcp.nix

Lines changed: 0 additions & 3 deletions
This file was deleted.

modules/nixos/network/manager.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ in {
1010
];
1111

1212
networking = {
13+
14+
# DHCP has been deprecated; use networkd instead
15+
useDHCP = mkForce false;
16+
useNetworkd = mkForce true;
17+
1318
# Use predictable interface names (e.g., wlp3s0) for stable rules
1419
usePredictableInterfaceNames = true;
1520

modules/nixos/network/resolved.nix

Lines changed: 0 additions & 3 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2+
# systemd DNS resolver daemon
3+
services.resolved.enable = true;
4+
25
systemd.network.wait-online.enable = false;
36
systemd.services.NetworkManager-wait-online.enable = false;
47
}

modules/nixos/network/wireless.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
networking.wireless = {
66
# wpa_supplicant
7-
userControlled = true;
7+
userControlled.enable = true;
88
allowAuxiliaryImperativeNetworks = true;
99
extraConfig = ''
1010
update_config=1

0 commit comments

Comments
 (0)