From ca023db81f9796a724ddd7272b5afbf3ecfd6cd0 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Thu, 6 Jun 2024 10:53:21 -0500
Subject: [PATCH] GTK, appimage binfmt, and bluetooth

---
 modules/home-manager/linux-desktop.nix        | 20 +++++++------------
 modules/nixos/user-installed-applications.nix | 12 +----------
 nixos/dragon.nix                              |  2 +-
 3 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/modules/home-manager/linux-desktop.nix b/modules/home-manager/linux-desktop.nix
index c6e352b..ee00f78 100644
--- a/modules/home-manager/linux-desktop.nix
+++ b/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";
     };
   };
 
diff --git a/modules/nixos/user-installed-applications.nix b/modules/nixos/user-installed-applications.nix
index cc64817..b921172 100644
--- a/modules/nixos/user-installed-applications.nix
+++ b/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;
 }
diff --git a/nixos/dragon.nix b/nixos/dragon.nix
index e8df000..ad94f57 100644
--- a/nixos/dragon.nix
+++ b/nixos/dragon.nix
@@ -144,7 +144,7 @@
 
   hardware.bluetooth = {
     enable = true;
-    powerOnBoot = true;
+    # powerOnBoot = true; # this is the default
   };
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";