Merge networking.nix and cleanup

This commit is contained in:
monologiq 2025-12-24 16:56:09 +01:00
parent 7c553dbf9a
commit abd055702b
5 changed files with 97 additions and 91 deletions

View file

@ -6,23 +6,31 @@
}:
let
inherit (lib) mkForce mkIf;
sessionVariables = {
NIXOS_OZONE_WL = "1";
};
systemPackages = with pkgs; [
adwaita-icon-theme
ddcutil
gsettings-desktop-schemas
libva-utils
sbctl
vdpauinfo
];
in
{
environment = {
inherit sessionVariables systemPackages;
sessionVariables = {
NIXOS_OZONE_WL = "1";
};
systemPackages = with pkgs; [
adwaita-icon-theme
ddcutil
gsettings-desktop-schemas
libva-utils
sbctl
vdpauinfo
];
};
environment.etc = mkIf config.programs._1password-gui.enable {
"1password/custom_allowed_browsers" = {
text = ''
firefox
brave
'';
mode = "0755";
};
};
fonts.fontconfig = {
@ -59,24 +67,34 @@ in
};
};
programs.dconf.enable = config.programs.niri.enable;
security.polkit.enable = config.programs.niri.enable;
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 = !config.services.resolved.enable;
programs._1password-gui = mkIf config.programs._1password.enable {
enable = true;
polkitPolicyOwners = [ "pml" ];
};
environment.etc = mkIf config.programs._1password-gui.enable {
"1password/custom_allowed_browsers" = {
text = ''
firefox
brave
'';
mode = "0755";
};
};
programs.dconf.enable = config.programs.niri.enable;
programs.niri.enable = true;
programs.regreet = {
@ -93,6 +111,7 @@ in
programs.zsh.enable = true;
security.polkit.enable = config.programs.niri.enable;
security.rtkit.enable = config.services.pipewire.enable;
services.pipewire = mkIf config.services.pipewire.enable {
@ -102,10 +121,26 @@ in
jack.enable = true;
};
system.activationScripts.openrgbOff =
mkIf (config.services.hardware.openrgb.startupProfile == "off") ''
mkdir -p /var/lib/OpenRGB
cp ${../config/openrgb/off.orp} /var/lib/OpenRGB/off.orp
chmod 0644 /var/lib/OpenRGB/off.orp
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
'';
};
system.activationScripts.openrgbOff =
mkIf (config.services.hardware.openrgb.startupProfile == "off")
''
mkdir -p /var/lib/OpenRGB
cp ${../config/openrgb/off.orp} /var/lib/OpenRGB/off.orp
chmod 0644 /var/lib/OpenRGB/off.orp
'';
}