diff --git a/modules/networking.nix b/modules/networking.nix
index fdaa0ef..dd779ad 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -1,24 +1,29 @@
 { pkgs, config, lib, ... }: let
   cfg = config.grimmShared;
 in {
-  config = with cfg; lib.mkIf (enable && network) {
-    networking.networkmanager.enable = true;
-    networking.useDHCP = lib.mkDefault true;
-    networking.firewall.enable = true;
+  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;
+      hardware.bluetooth.enable = true;
   
-    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
-    ];
-  };
+      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";
+      };
+    })
+  ];
 }
diff --git a/modules/toolchains.nix b/modules/toolchains.nix
index 1f4858a..219dfd4 100644
--- a/modules/toolchains.nix
+++ b/modules/toolchains.nix
@@ -53,7 +53,7 @@ in {
       glxinfo
       alacritty
       vulkan-tools
-      pdfaranger
+      pdfarranger
       nomacs
       gparted
     ];