5 files changed, 16 insertions, 16 deletions
diff --git a/hosts/common/optional/games.nix b/hosts/common/optional/games.nix
index 71bcd95..6f6e384 100644
--- a/hosts/common/optional/games.nix
+++ b/hosts/common/optional/games.nix
@@ -1,14 +1,14 @@
 { pkgs, ... }:
 {
   environment.systemPackages = [
-    #pkgs.master.godot
+    pkgs.godot
     pkgs.mame
     pkgs.mame.tools
     pkgs.mednafen
     pkgs.mednaffe
     pkgs.protontricks
     pkgs.winetricks
-    pkgs.master.wineWowPackages.stagingFull
+    pkgs.wineWowPackages.stagingFull
   ];
 
   programs.steam = {
diff --git a/hosts/common/optional/pipewire.nix b/hosts/common/optional/pipewire.nix
index ef50b9c..fc558c7 100644
--- a/hosts/common/optional/pipewire.nix
+++ b/hosts/common/optional/pipewire.nix
@@ -22,11 +22,11 @@
     alsa.support32Bit = true;
     enable = true;
     jack.enable = true;
-    package = pkgs.master.pipewire;
+    #package = pkgs.master.pipewire;
     pulse.enable = true;
     wireplumber = {
       enable = true;
-      package = pkgs.master.wireplumber;
+      #package = pkgs.master.wireplumber;
     };
 
     # use the example session manager (no others are packaged yet so this is enabled by default,
diff --git a/hosts/common/optional/services/wayland.nix b/hosts/common/optional/services/wayland.nix
index 0179d94..01398f7 100644
--- a/hosts/common/optional/services/wayland.nix
+++ b/hosts/common/optional/services/wayland.nix
@@ -5,7 +5,7 @@
     pkgs.evince
     pkgs.feh
     pkgs.gcr
-    #pkgs.master.geeqie
+    #pkgs.geeqie
     pkgs.ghostty
     pkgs.gimp3
     #pkgs.gimp-with-plugins
@@ -48,7 +48,7 @@
   programs = {
     firefox = {
       enable = true;
-      package = pkgs.master.firefox;
+      #package = pkgs.master.firefox;
     };
 
     gamemode.enable = true;
diff --git a/hosts/common/optional/services/xorg.nix b/hosts/common/optional/services/xorg.nix
index 324c1f4..54a1de6 100644
--- a/hosts/common/optional/services/xorg.nix
+++ b/hosts/common/optional/services/xorg.nix
@@ -42,7 +42,7 @@
 
   programs.firefox = {
     enable = true;
-    package = pkgs.master.firefox;
+    #package = pkgs.master.firefox;
   };
 
   security.polkit = {
diff --git a/hosts/common/optional/sound.nix b/hosts/common/optional/sound.nix
index 8f733d2..19c5ebc 100644
--- a/hosts/common/optional/sound.nix
+++ b/hosts/common/optional/sound.nix
@@ -3,25 +3,25 @@
   environment = {
     systemPackages = [
       pkgs.artyFX
-      #pkgs.master.audacity
+      pkgs.audacity
       pkgs.bespokesynth
       pkgs.boops
       pkgs.cardinal
       #pkgs.carla
-      #pkgs.master.chow-tape-model
+      pkgs.chow-tape-model
       pkgs.cmus
       pkgs.distrho-ports
       pkgs.fluidsynth
-      #pkgs.master.fmsynth
+      pkgs.fmsynth
       #pkgs.gearmulator
       pkgs.geonkick
       pkgs.guitarix
       pkgs.gxplugins-lv2
-      #pkgs.lilypond-unstable-with-fonts
+      pkgs.lilypond-unstable-with-fonts
       pkgs.lsp-plugins
       pkgs.metersLv2
       pkgs.odin2
-      pkgs.master.oxefmsynth
+      pkgs.oxefmsynth
       pkgs.polyphone
       pkgs.qsynth
       pkgs.reaper
@@ -32,7 +32,7 @@
       pkgs.surge-XT
       pkgs.synthv1
       pkgs.talentedhack
-      #pkgs.master.tunefish
+      pkgs.tunefish
       pkgs.v4l-utils
       pkgs.vapoursynth
       pkgs.vital
@@ -40,9 +40,9 @@
       pkgs.vocproc
       pkgs.wavpack
       pkgs.winetricks
-      pkgs.master.wineWowPackages.stagingFull
-      pkgs.master.yabridge
-      pkgs.master.yabridgectl
+      pkgs.wineWowPackages.stagingFull
+      pkgs.yabridge
+      pkgs.yabridgectl
       pkgs.yoshimi
       pkgs.zam-plugins
       pkgs.zynaddsubfx