From 31cecf05cc106c95f4145adda65b6daa510a1997 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Sat, 1 Aug 2026 08:35:08 -0400
Subject: [PATCH] try to fix nix warnings

---
 flake.nix                                     | 87 ++++++++++---------
 lib/default.nix                               |  3 +-
 pkgs/actualtap/package.nix                    |  1 +
 .../modules/nmasur/presets/gtk.nix            |  1 +
 .../modules/nmasur/presets/programs/aerc.nix  |  2 +-
 .../nmasur/presets/programs/firefox.nix       |  1 +
 .../modules/nmasur/profiles/linux-base.nix    |  3 +-
 7 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7de3a581..e79cf56c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -159,38 +159,9 @@
           transmission = "transmission.${baseName}";
         };
 
-    in
-    rec {
-
       lib = import ./lib inputs;
       flattenAttrset = attrs: builtins.foldl' lib.mergeAttrs { } (builtins.attrValues attrs);
 
-      nixosConfigurations = flattenAttrset (
-        builtins.mapAttrs (
-          system: hosts:
-          builtins.mapAttrs (
-            name: module:
-            lib.buildNixos {
-              inherit system module;
-              specialArgs = { inherit hostnames; };
-            }
-          ) hosts
-        ) lib.linuxHosts
-      );
-
-      darwinConfigurations = flattenAttrset (
-        builtins.mapAttrs (
-          system: hosts:
-          builtins.mapAttrs (
-            name: module:
-            lib.buildDarwin {
-              inherit system module;
-              specialArgs = { inherit hostnames; };
-            }
-          ) hosts
-        ) lib.darwinHosts
-      );
-
       homeModules = builtins.mapAttrs (
         system: hosts:
         builtins.mapAttrs (
@@ -198,19 +169,6 @@
         ) hosts
       ) lib.hosts;
 
-      homeConfigurations = flattenAttrset (
-        builtins.mapAttrs (
-          system: hosts:
-          builtins.mapAttrs (
-            name: module:
-            lib.buildHome {
-              inherit system module;
-              specialArgs = { inherit hostnames; };
-            }
-          ) hosts
-        ) homeModules
-      );
-
       # Disk formatting, only used once
       diskoConfigurations = {
         root = import ./hosts/x86_64-linux/swan/root.nix;
@@ -240,6 +198,51 @@
       ) lib.linuxHosts # x86_64-linux = { arrow = ...; swan = ...; }
       ;
 
+    in
+    {
+
+      inherit lib;
+
+      nixosConfigurations = flattenAttrset (
+
+        builtins.mapAttrs (
+          system: hosts:
+          builtins.mapAttrs (
+            name: module:
+            lib.buildNixos {
+              inherit system module;
+              specialArgs = { inherit hostnames; };
+            }
+          ) hosts
+        ) lib.linuxHosts
+      );
+
+      darwinConfigurations = flattenAttrset (
+        builtins.mapAttrs (
+          system: hosts:
+          builtins.mapAttrs (
+            name: module:
+            lib.buildDarwin {
+              inherit system module;
+              specialArgs = { inherit hostnames; };
+            }
+          ) hosts
+        ) lib.darwinHosts
+      );
+
+      homeConfigurations = flattenAttrset (
+        builtins.mapAttrs (
+          system: hosts:
+          builtins.mapAttrs (
+            name: module:
+            lib.buildHome {
+              inherit system module;
+              specialArgs = { inherit hostnames; };
+            }
+          ) hosts
+        ) homeModules
+      );
+
       # packages =
       #   lib.forSystems lib.linuxSystems (
       #     system: generateImagesForHosts system // lib.pkgsBySystem.${system}.nmasur
diff --git a/lib/default.nix b/lib/default.nix
index ccd40799..e90c8f11 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -76,7 +76,6 @@ lib
   # System types to support.
   supportedSystems = [
     "x86_64-linux"
-    "x86_64-darwin"
     "aarch64-linux"
     "aarch64-darwin"
   ];
@@ -227,7 +226,7 @@ lib
       pkgs = pkgsBySystem.${system};
       modules = [
         inputs.home-manager.nixosModules.home-manager
-        inputs.nix-index-database.homeModules.default
+        inputs.nix-index-database.nixosModules.default
         inputs.disko.nixosModules.disko
         inputs.wsl.nixosModules.wsl
         {
diff --git a/pkgs/actualtap/package.nix b/pkgs/actualtap/package.nix
index c8dc60ca..6d23af8b 100644
--- a/pkgs/actualtap/package.nix
+++ b/pkgs/actualtap/package.nix
@@ -39,5 +39,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/MattFaz/actualtap";
     license = licenses.gpl3Only;
     maintainers = [ ];
+    mainProgram = "actualtap";
   };
 }
diff --git a/platforms/home-manager/modules/nmasur/presets/gtk.nix b/platforms/home-manager/modules/nmasur/presets/gtk.nix
index bc9591a6..915eb0d4 100644
--- a/platforms/home-manager/modules/nmasur/presets/gtk.nix
+++ b/platforms/home-manager/modules/nmasur/presets/gtk.nix
@@ -25,6 +25,7 @@ in
   config = lib.mkIf cfg.enable {
     # Cursor
     home.pointerCursor = {
+      enable = true;
       name = "Adwaita";
       package = pkgs.adwaita-icon-theme;
       size = 24;
diff --git a/platforms/home-manager/modules/nmasur/presets/programs/aerc.nix b/platforms/home-manager/modules/nmasur/presets/programs/aerc.nix
index d3f383df..adca82b1 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/aerc.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/aerc.nix
@@ -203,7 +203,7 @@ in
     };
 
     # Used for macOS
-    xdg.enable = lib.mkDefault pkgs.stdenv.isDarwin;
+    xdg.enable = lib.mkIf pkgs.stdenv.isDarwin true;
 
     xdg.desktopEntries.aerc = lib.mkIf (pkgs.stdenv.isLinux) {
       name = "aerc";
diff --git a/platforms/home-manager/modules/nmasur/presets/programs/firefox.nix b/platforms/home-manager/modules/nmasur/presets/programs/firefox.nix
index 3c400a8d..8791d286 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/firefox.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/firefox.nix
@@ -23,6 +23,7 @@ in
 
     programs.firefox = {
       enable = true;
+      configPath = ".mozilla/firefox";
       package = pkgs.firefox;
       profiles.default = {
         id = 0;
diff --git a/platforms/home-manager/modules/nmasur/profiles/linux-base.nix b/platforms/home-manager/modules/nmasur/profiles/linux-base.nix
index 4a4ae217..f89cdab9 100644
--- a/platforms/home-manager/modules/nmasur/profiles/linux-base.nix
+++ b/platforms/home-manager/modules/nmasur/profiles/linux-base.nix
@@ -30,8 +30,9 @@ in
       publicShare = lib.mkDefault "$HOME/other/public";
       templates = lib.mkDefault "$HOME/other/templates";
       extraConfig = {
-        XDG_DEV_DIR = lib.mkDefault "$HOME/dev";
+        DEV = lib.mkDefault "$HOME/dev";
       };
+      setSessionVariables = true;
     };
 
     nmasur.presets.programs = {