3 files changed, 8 insertions, 31 deletions
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index ecef098..e09c622 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -14,12 +14,14 @@
       allowUnfree.enable = true;
       flatpak.enable = true;
 
-      audio.enable = true;
+      audio = {
+        enable = true;
+        disable-devices.enable = true;
+      };
       bootloader = "systemd-boot";
       drivers = {
         enable = true;
         amdgpu.enable = true;
-        stability = "stable";
       };
       fonts.enable = true;
       greet.enable = true;
@@ -60,6 +62,8 @@
       kvm.enable = true;
       nix-helper.enable = true;
       ollama.enable = true;
+      bluetooth.enable = true;
+      zzz.enable = true;
     };
     wm = {
       enable = true;
@@ -67,16 +71,6 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    rivalcfg
-  ];
-
-  services.blueman.enable = true;
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-  };
-
   boot = {
     kernelParams = [ "video=DP-1:2560x1440@240" ];
     kernelModules = [ "nct6687" ];
@@ -84,22 +78,4 @@
       config.boot.kernelPackages.nct6687d 
     ];
   };
-  services.pipewire.wireplumber.extraConfig."99-disable-useless-devices"."monitor.alsa.rules" = [{
-    matches = [
-      { "device.name" = "~alsa_card.pci-0000_03_00.1*"; }
-      { "device.description" = "~USB Audio*"; }
-    ];
-    actions.update-props = { "device.disabled" = true; };
-  }];
-
-  systemd.user.services.zzz-presence = {
-    description = "Zenless Zone Zero Discord Rich Presence";
-    wantedBy = [ "default.target" ];
-
-    serviceConfig = {
-      ExecStart = "${pkgs.python3.withPackages (ps: [ ps.pypresence ])}/bin/python3 /etc/nixos/resources/zzz.py";
-      Restart = "always";
-      RestartSec = "10";
-    };
-  };
 }
diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix
index e2d32f6..be7bbdc 100644
--- a/hosts/desktop/hardware-configuration.nix
+++ b/hosts/desktop/hardware-configuration.nix
@@ -31,7 +31,7 @@
       options = [ "noatime" ];
     };
 
-  fileSystems."/run/media/adam/hdd" =
+  fileSystems."/storage" =
     { device = "/dev/disk/by-uuid/c0dc7c4d-1800-4c84-a04c-5ea7f5e86c4b";
       fsType = "ext4";
       options = [ "nofail" "noatime" ];
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index 6435e79..d790d57 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -39,6 +39,7 @@
       users.enable = true;
     };
     srv = {
+      bluetooth.enable = true;
       files = {
         thunar.enable = true;
         utils.enable = true;