make networking more tightly controlled by config values

modules/networking.nix

@@ -1,24 +1,29 @@
 { pkgs, config, lib, ... }: let
   cfg = config.grimmShared;
 in {
-  config = with cfg; lib.mkIf (enable && network) {
+  config = with cfg; lib.mkIf (enable && network) lib.mkMerge [
+    {
       networking.networkmanager.enable = true;
       networking.useDHCP = lib.mkDefault true;
       networking.firewall.enable = true;
 
-    services.blueman.enable = true;
       hardware.bluetooth.enable = true;
   
+      environment.systemPackages = with pkgs; [
+        wireguard-tools
+        bluetuith
+      ];
+    }
+    (lib.mkIf cfg.graphical {
+      services.blueman.enable = true;
+    })
+    (lib.mkIf cfg.sound {
       systemd.user.services.mpris-proxy = {
         description = "Mpris proxy";
         after = [ "network.target" "sound.target" ];
         wantedBy = [ "default.target" ];
         serviceConfig.ExecStart = "${pkgs.bluez}/bin/mpris-proxy";
       };
-
+    })
-    environment.systemPackages = with pkgs; [
-      wireguard-tools
-      bluetuith
   ];
-  };
 }

modules/toolchains.nix

@@ -53,7 +53,7 @@ in {
       glxinfo
       alacritty
       vulkan-tools
-      pdfaranger
+      pdfarranger
       nomacs
       gparted
     ];