Fix catccuppin for macos

flake.nix

@@ -118,7 +118,6 @@
                   "MatthewCroughan"
                   "MWMBL"
                   "Nix"
-                  "optimise"
                   "Reece"
                   "TrackMeNot"
                   "UTD"

home-manager/base-linux.nix

@@ -2,27 +2,9 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ inputs, pkgs, ... }:
+{ pkgs, ... }:
 {
-  imports = [
+  imports = [ ./base.nix ];
-    inputs.catppuccin.homeModules.catppuccin
-    ./base.nix
-  ];
-  # https://nix.catppuccin.com/search/rolling/
-  catppuccin = {
-    enable = true;
-    flavor = "mocha";
-    # bat.enable = false;
-    # fzf.enable = false;
-    # helix.enable = false;
-    # starship.enable = false;
-  };
-  stylix.targets = {
-    bat.enable = false;
-    fzf.enable = false;
-    helix.enable = false;
-    starship.enable = false;
-  };
   home.packages = [
     pkgs.acpi
     pkgs.iproute2

home-manager/base.nix

@@ -57,6 +57,7 @@ let
 in
 {
   imports = [
+    inputs.catppuccin.homeModules.catppuccin
     inputs.lix-module.nixosModules.default
     inputs.sops-nix.homeManagerModules.sops
     inputs.stylix.homeModules.stylix
@@ -68,7 +69,20 @@ in
     defaultSopsFile = ../sops/secrets.yaml;
   };
   # https://nix-community.github.io/stylix/options/modules/alacritty.html
-  stylix = import ../stylix { inherit config pkgs; };
+  stylix = (import ../stylix { inherit config pkgs; }) // {
+    targets = {
+      kitty.variant256Colors = true;
+      bat.enable = false;
+      fzf.enable = false;
+      helix.enable = false;
+      starship.enable = false;
+    };
+  };
+  # https://nix.catppuccin.com/search/rolling/
+  catppuccin = {
+    enable = true;
+    flavor = "mocha";
+  };
   home = {
     stateVersion = "24.11";
     language.base = "eo.utf8";

home-manager/macos/home.nix

@@ -46,4 +46,7 @@
         ];
       };
   };
+  catppuccin = {
+    gtk.icon.enable = false;
+  };
 }

nix-darwin/flake-module.nix

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 {
+  config,
   flake-parts-lib,
   inputs,
   lib,
@@ -18,19 +19,14 @@ in
     flake-parts-lib.importApply (./. + "/${module-name}/flake-module.nix") { inherit module-name; }
   ) modules;
   perSystem =
-    {
+    { pkgs, system, ... }:
-      config,
-      pkgs,
-      system,
-      ...
-    }:
     {
       devshells.default = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin {
         commands = [
           {
             help = "󰘥 show nix-darwin documentation";
             name = "man-darwin";
-            command = "${inputs.nix-darwin.packages.${system}.default}/bin/darwin-help";
+            command = "darwin-help";
             category = " nix-darwin";
           }
         ]

nix-darwin/macos/configuration.nix

@@ -2,12 +2,23 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ inputs, pkgs, ... }:
+{
+  config,
+  inputs,
+  pkgs,
+  ...
+}:
 let
   username = "ethanreece";
   homeDirectory = "/Users/${username}";
 in
 {
+  imports = [
+    inputs.home-manager.darwinModules.home-manager
+    inputs.lix-module.nixosModules.default
+    inputs.stylix.darwinModules.stylix
+    inputs.sops-nix.darwinModules.sops
+  ];
   nixpkgs.config.allowUnfree = true;
   system = {
     stateVersion = 6;
@@ -50,4 +61,10 @@ in
       imports = [ ../../home-manager/macos/home.nix ];
     };
   };
+  stylix = (import ../../stylix { inherit config pkgs; }) // {
+    homeManagerIntegration = {
+      autoImport = false;
+      followSystem = false;
+    };
+  };
 }

nix-darwin/macos/flake-module.nix

@@ -21,13 +21,7 @@
         inputs.nix-darwin.lib.darwinSystem {
           inherit system;
           specialArgs = { inherit inputs; };
-          modules = [
+          modules = [ ./configuration.nix ];
-            inputs.home-manager.darwinModules.home-manager
-            inputs.lix-module.nixosModules.default
-            inputs.stylix.darwinModules.stylix
-            inputs.sops-nix.darwinModules.sops
-            ./configuration.nix
-          ];
         }
       );
     }

stylix/default.nix

@@ -26,7 +26,4 @@
       name = "OpenMoji Color";
     };
   };
-  targets = {
-    kitty.variant256Colors = true;
-  };
 }