flake.nix

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

home-manager/base-linux.nix

@@ -2,9 +2,27 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ pkgs, ... }:
+{ inputs, pkgs, ... }:
 {
-  imports = [ ./base.nix ];
+  imports = [
+    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,7 +57,6 @@ let
 in
 {
   imports = [
-    inputs.catppuccin.homeModules.catppuccin
     inputs.lix-module.nixosModules.default
     inputs.sops-nix.homeManagerModules.sops
     inputs.stylix.homeModules.stylix
@@ -69,20 +68,7 @@ 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,7 +46,4 @@
         ];
       };
   };
-  catppuccin = {
-    gtk.icon.enable = false;
-  };
 }

nix-darwin/flake-module.nix

@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: MIT
 
 {
-  config,
   flake-parts-lib,
   inputs,
   lib,
@@ -19,14 +18,19 @@ 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 = "darwin-help";
+            command = "${inputs.nix-darwin.packages.${system}.default}/bin/darwin-help";
             category = " nix-darwin";
           }
         ]

nix-darwin/macos/configuration.nix

@@ -2,23 +2,12 @@
 #
 # 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;
@@ -61,10 +50,4 @@ 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,7 +21,13 @@
         inputs.nix-darwin.lib.darwinSystem {
           inherit system;
           specialArgs = { inherit inputs; };
-          modules = [ ./configuration.nix ];
+          modules = [
+            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,4 +26,7 @@
       name = "OpenMoji Color";
     };
   };
+  targets = {
+    kitty.variant256Colors = true;
+  };
 }