Fixes stylix and comma on darwin

common/stylix.nix

@@ -0,0 +1,10 @@
+{
+  globals,
+  pkgs,
+  ...
+}: {
+  stylix.enable = true;
+  stylix.image = globals.wallpapers.current;
+  stylix.polarity = "dark";
+  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-hard.yaml";
+}

common/system.nix

@@ -4,11 +4,6 @@
   globals,
   ...
 }: {
-  stylix.enable = true;
-  stylix.image = globals.wallpapers.current;
-  stylix.polarity = "dark";
-  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-hard.yaml";
-
   environment.pathsToLink = ["/share/zsh"];
   environment.shells = [pkgs.bashInteractive pkgs.zsh];
   environment.systemPackages = [pkgs.coreutils pkgs.git];
@@ -34,7 +29,6 @@
     settings.trusted-users = ["root" "willem"];
   };
 
-  programs.bash.completion.enable = true;
   programs.bash.interactiveShellInit = ''
     export PS1=$'\n'"\e[0mbash: \e[34;1m\w"$'\n'"\e[32m\\$\e[0m "
   '';

home/default.nix

@@ -10,7 +10,9 @@
     ./programs/default.nix
     ./modules/nix/pkgs-config.nix
     ./modules/nix/use-flake-pkgs.nix
+    ../common/stylix.nix
     inputs.nix-index-database.hmModules.nix-index
+    inputs.stylix.homeManagerModules.stylix
   ];
 
   stylix.enable = true;

nixos/hosts/zeus.nix

@@ -10,14 +10,12 @@
     ../modules/nix/optimise.nix
     ../modules/nix/use-flake-pkgs.nix
     ../modules/nix/cachix.nix
-    ../modules/comma.nix
     ../users/willem/home/darwin.nix
     ../modules/yabai
-    inputs.stylix.darwinModules.stylix
+    inputs.nix-index-database.darwinModules.nix-index
   ];
 
-  # build of normal noto emoji fonts fails on darwin
-  stylix.fonts.emoji.package = pkgs.noto-fonts-emoji-blob-bin;
+  programs.nix-index-database.comma.enable = true;
 
   homebrew = {
     enable = true;

nixos/profiles/default.nix

@@ -8,6 +8,7 @@
 }: {
   imports = [
     ../../common/system.nix
+    ../../common/stylix.nix
     ../modules/nix/use-flake-pkgs.nix
     ../modules/nix/optimise.nix
     ../modules/nix/cachix.nix