aviallon/nixos-lib
1
0
Fork 0
mirror of https://github.com/aviallon/nixos-lib.git synced 2026-04-05 17:27:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Network] Add aviallon.network.backend option, remove useNetworkManager option

Browse source
This commit is contained in:
Antoine Viallon 2022-01-25 11:52:44 +01:00
parent 5af5049986
commit 824e773310
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
desktop.nix
View file

@ -82,6 +82,8 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
aviallon.network.backend = mkDefault "NetworkManager";
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = true; services.xserver.enable = true;
# services.xserver.tty = mkOverride 70 1; # services.xserver.tty = mkOverride 70 1;

23
network.nix
View file

@ -12,26 +12,27 @@ in
description = "Enable aviallon's network tuning"; description = "Enable aviallon's network tuning";
type = types.bool; type = types.bool;
}; };
useNetworkManager = mkOption { backend = mkOption {
default = desktopCfg.enable; default = "systemd-networkd";
example = !desktopCfg.enable; example = "NetworkManager";
description = "Enable NetworkManager"; description = "Set network backend";
type = types.bool; type = types.enum [ "systemd-networkd" "NetworkManager" "dhcpcd" ];
}; };
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
networking.useNetworkd = mkOverride 500 true; networking.useNetworkd = (cfg.backend == "systemd-networkd");
networking.networkmanager.enable = cfg.useNetworkManager; networking.networkmanager.enable = (cfg.backend == "NetworkManager");
networking.networkmanager.wifi.backend = "iwd"; networking.dhcpcd.enable = (cfg.backend == "dhcpcd");
networking.dhcpcd.enable = !config.networking.useNetworkd; # networking.networkmanager.wifi.backend = mkDefault "iwd";
networking.wireless.enable = (cfg.backend != "NetworkManager");
# Must always be false # Must always be false
networking.useDHCP = false; networking.useDHCP = false;
networking.hostId = lib.mkDefault (builtins.abort "Default hostId not changed" null); networking.hostId = mkDefault (builtins.abort "Default hostId not changed" null);
networking.hostName = lib.mkDefault (builtins.abort "Default hostname not changed" null); networking.hostName = mkDefault (builtins.abort "Default hostname not changed" null);
networking.firewall.allowPing = !desktopCfg.enable; networking.firewall.allowPing = !desktopCfg.enable;
}; };