Merge remote-tracking branch 'origin/main'

modules/home-manager/linux-desktop.nix

@@ -10,19 +10,13 @@
     firefox
   ];
 
-  gtk = {
-    enable = true;
-    # Currently failing: https://github.com/NixOS/nixpkgs/issues/298043
-    # Overlay from https://github.com/NixOS/nixpkgs/issues/298043#issuecomment-2015319496
-    # Fix on master but not yet in unstable https://github.com/NixOS/nixpkgs/pull/297683
-    theme = {
-      name = "Catppuccin-Mocha-Compact-Sapphire-Dark";
-      package = pkgs.catppuccin-gtk.override {
-        accents = ["sapphire"];
-        size = "compact";
-        tweaks = ["rimless"];
-        variant = "mocha";
-      };
+  gtk.theme = {
+    name = "Catppuccin-Mocha-Compact-Sapphire-Dark";
+    package = pkgs.catppuccin-gtk.override {
+      accents = ["sapphire"];
+      size = "compact";
+      tweaks = ["rimless"];
+      variant = "mocha";
     };
   };
 

modules/nixos/music-production.nix

@@ -3,15 +3,10 @@
   # environment?
   imports = [
     {
-      # DAW
       environment.systemPackages = with pkgs; [
-        ardour
-      ];
-    }
-    {
-      # synths/VSTs
-      environment.systemPackages = with pkgs; [
-        helm
+        helvum # pipewire graph/patchbay GUI
+        ardour # DAW
+        helm # synth
       ];
     }
   ];

modules/nixos/user-installed-applications.nix

@@ -1,14 +1,4 @@
 {pkgs, ...}: {
-  # enable flatpaks
   services.flatpak.enable = true;
-
-  # enable appimages
-  boot.binfmt.registrations.appimage = {
-    wrapInterpreterInShell = false;
-    interpreter = "${pkgs.appimage-run}/bin/appimage-run";
-    recognitionType = "magic";
-    offset = 0;
-    mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
-    magicOrExtension = ''\x7fELF....AI\x02'';
-  };
+  programs.appimage.binfmt = true;
 }

nixos/dragon.nix

@@ -16,6 +16,7 @@
     inputs.hardware.nixosModules.common-cpu-amd
     inputs.hardware.nixosModules.common-pc-ssd
     outputs.nixosModules.pipewire-low-latency
+    outputs.nixosModules.music-production
 
     desktop-usage
     podman
@@ -143,7 +144,7 @@
 
   hardware.bluetooth = {
     enable = true;
-    powerOnBoot = true;
+    # powerOnBoot = true; # this is the default
   };
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
 

nixos/thablet.nix

@@ -70,5 +70,10 @@
 
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;
+  };
+
   system.stateVersion = "23.11";
 }