Merge networking.nix and cleanup
This commit is contained in:
parent
7c553dbf9a
commit
abd055702b
5 changed files with 97 additions and 91 deletions
|
|
@ -2,14 +2,11 @@
|
|||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
./persephone/networking.nix
|
||||
../profiles/minimal.linux.nix
|
||||
../profiles/desktop.linux.nix
|
||||
];
|
||||
|
|
@ -122,6 +119,8 @@
|
|||
lm_sensors
|
||||
];
|
||||
|
||||
networking.wireless.iwd.enable = true;
|
||||
|
||||
nix.settings = {
|
||||
substituters = [ "https://cache.nixos-cuda.org" ];
|
||||
trusted-public-keys = [ "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" ];
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
{ lib, ... }:
|
||||
|
||||
{
|
||||
|
||||
networking.hostName = "persephone";
|
||||
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
|
||||
networking.wireless.iwd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
General = {
|
||||
EnableNetworkConfiguration = false; # Let dhcpcd handle this
|
||||
};
|
||||
Network = {
|
||||
EnableIPv6 = true;
|
||||
NameResolvingService = "systemd";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
networking.dhcpcd = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
nohook resolv.conf # Don't let dhcpcd manage resolv.conf
|
||||
'';
|
||||
};
|
||||
|
||||
networking.resolvconf.enable = false;
|
||||
|
||||
services.avahi.enable = true;
|
||||
|
||||
services.resolved = {
|
||||
enable = true;
|
||||
|
||||
dnssec = "true";
|
||||
domains = [ "~." ];
|
||||
fallbackDns = [
|
||||
"9.9.9.9#dns.quad9.net"
|
||||
"149.112.112.112#dns.quad9.net"
|
||||
"2620:fe::fe#dns.quad9.net"
|
||||
"2620:fe::9#dns.quad9.net"
|
||||
];
|
||||
|
||||
extraConfig = ''
|
||||
DNSOverTLS=yes
|
||||
'';
|
||||
};
|
||||
|
||||
services.openssh.enable = true;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue