From 086f90f59ce267255809ce9483af83e4901c50ce Mon Sep 17 00:00:00 2001
From: Gabriella Bere <contact@gabbie.blue>
Date: Wed, 23 Apr 2025 00:52:01 +0100
Subject: [PATCH] moved ardour to home.packages, added some plugins

also set firefox search config to force instead of default as it was
breaking home-manager rebuilds
---
 home-manager/firefox.nix | 89 +++++++++++++++++++++-------------------
 home-manager/home.nix    |  2 +
 modules/packages.nix     |  1 -
 3 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/home-manager/firefox.nix b/home-manager/firefox.nix
index e9c70cf..134d588 100644
--- a/home-manager/firefox.nix
+++ b/home-manager/firefox.nix
@@ -1,44 +1,47 @@
-{ config, pkgs, ... }: {
-        programs.firefox = {
-                enable = true;
-#               package = pkgs.librewolf;
-                profiles.blue = {
-                        isDefault = true;
-                        id = 0;
-                        extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
-                                indie-wiki-buddy
-                                bitwarden
-                                darkreader
-                                ff2mpv
-                                i-dont-care-about-cookies
-                                ublock-origin
-                                unpaywall
-                                dearrow
-                                sponsorblock
-                                return-youtube-dislikes
-                                clearurls
-                                youtube-shorts-block
-                                youtube-high-definition
-                                shinigami-eyes
-                        ];
-                        search.default = "ddg"; # Set search engine to DuckDuckGo
-                        settings = {
-                                "browser.search.region" = "GB";
-                                "browser.search.isUS" = false;
-                                "distribution.searchplugins.defaultLocale" = "en-GB";
-                                "general.useragent.locale" = "en-GB";
-                                "identity.fxaccounts.enabled" = false;
-                                "extensions.autoDisableScopes" = 0;
-                                "browser.bookmarks.autoExportHTML" = true;
-                                "browser.bookmarks.file" = "~/bookmarks.html";
-                        };
-
-                };
-                policies = {
-                        "OfferToSaveLogins" = false;
-                        "DisablePocket" = true;
-                        "AutofillAddressEnabled" = false;
-                        "AutofillCreditCardEnabled" = false;
-                };
-        };
+{
+  config,
+  pkgs,
+  ...
+}: {
+  programs.firefox = {
+    enable = true;
+    #               package = pkgs.librewolf;
+    profiles.blue = {
+      isDefault = true;
+      id = 0;
+      extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
+        indie-wiki-buddy
+        bitwarden
+        darkreader
+        ff2mpv
+        i-dont-care-about-cookies
+        ublock-origin
+        unpaywall
+        dearrow
+        sponsorblock
+        return-youtube-dislikes
+        clearurls
+        youtube-shorts-block
+        youtube-high-definition
+        shinigami-eyes
+      ];
+      search.force = "ddg"; # Set search engine to DuckDuckGo
+      settings = {
+        "browser.search.region" = "GB";
+        "browser.search.isUS" = false;
+        "distribution.searchplugins.defaultLocale" = "en-GB";
+        "general.useragent.locale" = "en-GB";
+        "identity.fxaccounts.enabled" = false;
+        "extensions.autoDisableScopes" = 0;
+        "browser.bookmarks.autoExportHTML" = true;
+        "browser.bookmarks.file" = "~/bookmarks.html";
+      };
+    };
+    policies = {
+      "OfferToSaveLogins" = false;
+      "DisablePocket" = true;
+      "AutofillAddressEnabled" = false;
+      "AutofillCreditCardEnabled" = false;
+    };
+  };
 }
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 1cb1e9b..fec5dbc 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -45,6 +45,8 @@
     telegram-desktop # Telegram messenger client
     pavucontrol # Useful audio control GUI
     stable.prismlauncher
+    calf
+    ardour
   ];
   services.flatpak.packages = [
     "io.mrarm.mcpelauncher" # Minecraft bedrock edition launcher
diff --git a/modules/packages.nix b/modules/packages.nix
index cf734c1..a3e234a 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -40,6 +40,5 @@
     libreoffice
     nixfmt-rfc-style
     nixd
-    stable.ardour
   ];
 }