diff --git a/modules/networking.nix b/modules/networking.nix index dd779ad..4fef019 100644 --- a/modules/networking.nix +++ b/modules/networking.nix @@ -1,8 +1,8 @@ { pkgs, config, lib, ... }: let cfg = config.grimmShared; in { - config = with cfg; lib.mkIf (enable && network) lib.mkMerge [ - { + config = lib.mkMerge [ + (with cfg; lib.mkIf (enable && network) { networking.networkmanager.enable = true; networking.useDHCP = lib.mkDefault true; networking.firewall.enable = true; @@ -13,11 +13,11 @@ in { wireguard-tools bluetuith ]; - } - (lib.mkIf cfg.graphical { + }) + (with cfg; lib.mkIf (enable && network && graphical) { services.blueman.enable = true; }) - (lib.mkIf cfg.sound { + (with cfg; lib.mkIf (enable && network && sound) { systemd.user.services.mpris-proxy = { description = "Mpris proxy"; after = [ "network.target" "sound.target" ];