From 519b8d9e7abd543eab963d1078287f3f737de28e Mon Sep 17 00:00:00 2001
From: ChUrl <christoph.urlacher@protonmail.com>
Date: Sun, 7 Aug 2022 20:27:28 +0200
Subject: [PATCH] update audio

---
 derivations/carla-guitar-amp.nix | 10 ----------
 home/modules/audio.nix           | 12 ++++++------
 2 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 derivations/carla-guitar-amp.nix

diff --git a/derivations/carla-guitar-amp.nix b/derivations/carla-guitar-amp.nix
deleted file mode 100644
index fb45c866..00000000
--- a/derivations/carla-guitar-amp.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, lib, pkgs, home, ... }:
-
-pkgs.makeDesktopItem {
-  name = "carla-guitar";
-  exec =
-    "PIPEWIRE_LATENCY=256/48000 gamemoderun carla ${home.homeDirectory}/Documents/Carla/GuitarDefault.carxp";
-  genericName = "Guitar Amp Simulation";
-  categories = [ "Music" "Audio" ];
-  desktopName = "Carla Guitar Amp";
-}
diff --git a/home/modules/audio.nix b/home/modules/audio.nix
index 0378fc12..d302fbb6 100644
--- a/home/modules/audio.nix
+++ b/home/modules/audio.nix
@@ -14,7 +14,7 @@ in {
       description = "Configure for realtime audio and enable a bunch of music production tools";
     };
 
-    carla = mkOption {
+    carla.enable = mkOption {
       type = types.bool;
       default = false;
       description = "Enable Carla + guitar-specific stuff";
@@ -27,7 +27,7 @@ in {
         description = "Enable yabridge + yabridgectl";
       };
 
-      autosync = mkOption {
+      autoSync = mkOption {
         type = types.bool;
         default = false;
         description = "Sync yabridge plugins on nixos-rebuild";
@@ -52,7 +52,7 @@ in {
   config = mkIf cfg.enable {
 
     home.packages = with pkgs; (mkMerge [
-      (mkIf cfg.carla [ carla ])
+      (mkIf cfg.carla.enable [ carla ])
       (mkIf cfg.yabridge.enable [ yabridge yabridgectl ])
       (mkIf cfg.bitwig.enable [ bitwig-studio ])
       cfg.extraPackages
@@ -60,7 +60,7 @@ in {
 
     # NOTE: This desktop entry is created in /etc/profiles/per-user/christoph/share/applications
     #       This location is part of XDG_DATA_DIRS
-    xdg.desktopEntries.guitar = mkIf cfg.carla {
+    xdg.desktopEntries.guitar = mkIf cfg.carla.enable {
       name = "Guitar Amp (Carla)";
       genericName = "Guitar Amp Simulation";
       icon = "carla";
@@ -70,7 +70,7 @@ in {
     };
 
     home.activation = (mkMerge [
-      (mkIf cfg.carla {
+      (mkIf cfg.carla.enable {
 
         # The module includes the default carla project with ArchetypePetrucci + ArchetypeGojira
         # TODO: I don't know if I should keep this
@@ -81,7 +81,7 @@ in {
         '';
       })
 
-      (mkIf cfg.yabridge.autosync {
+      (mkIf cfg.yabridge.autoSync {
         syncYabridge = hm.dag.entryAfter [ "writeBoundary" ] ''
           yabridgectl sync
         '';