Fixes stylix and comma on darwin

flake.lock: Update
Flake lock file updates: • Updated input 'fenix': 'github:nix-community/fenix/0774f58cf1025bbb713971deecc7f07c856be6ed' (2024-09-02) → 'github:nix-community/fenix/43efa7a3a97f290441bd75b18defcd4f7b8df220' (2024-09-13) • Updated input 'fenix/nixpkgs': 'github:nixos/nixpkgs/12228ff1752d7b7624a54e9c1af4b222b3c1073b' (2024-08-31) → 'github:nixos/nixpkgs/574d1eac1c200690e27b8eb4e24887f8df7ac27c' (2024-09-06) • Updated input 'fenix/rust-analyzer-src': 'github:rust-lang/rust-analyzer/779d9eee2ea403da447278a7007c9627c8878856' (2024-09-01) → 'github:rust-lang/rust-analyzer/bcc708992104c2059f310fbc3ac00bfc377f9ea8' (2024-09-10) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/567b938d64d4b4112ee253b9274472dc3a346eb6' (2024-09-01) → 'github:hercules-ci/flake-parts/bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a' (2024-09-12) • Updated input 'home-manager': 'github:nix-community/home-manager/471e3eb0a114265bcd62d11d58ba8d3421ee68eb' (2024-09-01) → 'github:nix-community/home-manager/6c1a461a444e6ccb3f3e42bb627b510c3a722a57' (2024-09-14) • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=6934e7aa2b300bc4565855a4092fb34de8a9a8d2' (2024-09-01) → 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=d35e70a8c6599bb058cf86eb87c783ce1cf72471' (2024-09-13) • Updated input 'hyprland/aquamarine': 'github:hyprwm/aquamarine/f8a687dd29ff019657498f1bd14da2fbbf0e604b' (2024-09-01) → 'github:hyprwm/aquamarine/e4a13203112a036fc7f437d391c7810f3dd5ab52' (2024-09-07) • Updated input 'hyprland/hyprlang': 'github:hyprwm/hyprlang/c12ab785ce1982f82594aff03b3104c598186ddd' (2024-09-01) → 'github:hyprwm/hyprlang/dfeb5811dd6485490cce18d6cc1e38a055eea876' (2024-09-10) • Updated input 'hyprland/nixpkgs': 'github:NixOS/nixpkgs/12228ff1752d7b7624a54e9c1af4b222b3c1073b' (2024-08-31) → 'github:NixOS/nixpkgs/1355a0cbfeac61d785b7183c0caaec1f97361b43' (2024-09-10) • Updated input 'hyprland/xdph': 'github:hyprwm/xdg-desktop-portal-hyprland/2425e8f541525fa7409d9f26a8ffaf92a3767251' (2024-09-01) → 'github:hyprwm/xdg-desktop-portal-hyprland/e695669fd8e1d1be9eaae40f35e00f8bd8b64c18' (2024-09-11) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/32058e9138248874773630c846563b1a78ee7a5b' (2024-09-01) → 'github:nix-community/nix-index-database/642275444c5a9defce57219c944b3179bf2adaa9' (2024-09-08) • Updated input 'nixos-apple-silicon': 'github:tpwrules/nixos-apple-silicon/8a665fee82901878edaeb8ee120296a979db2dd2' (2024-07-31) → 'github:tpwrules/nixos-apple-silicon/c5f944f49a052232015bb3c03524b69e3fdd2aa4' (2024-09-04) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/4509ca64f1084e73bc7a721b20c669a8d4c5ebe6' (2024-08-28) → 'github:cachix/pre-commit-hooks.nix/7570de7b9b504cfe92025dd1be797bf546f66528' (2024-09-05) • Updated input 'stylix': 'github:danth/stylix/ef81ad9e85e60420cc83d4642619c14b57139d33' (2024-09-02) → 'github:danth/stylix/35233f929629c8eb64e939e35260fc8347f94df9' (2024-09-12)
2025-04-12 11:17:17 +00:00 · 2024-09-14 15:44:38 -06:00 · 2024-09-14 15:22:51 -06:00 · 2024-09-14 15:22:16 -06:00
8 changed files with 60 additions and 54 deletions
--- a/common/stylix.nix
+++ b/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";
+}
--- a/common/system.nix
+++ b/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 "
  '';
--- a/flake.lock
+++ b/flake.lock
@ -20,11 +20,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725199881,
-        "narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=",
+        "lastModified": 1725753098,
+        "narHash": "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b",
+        "rev": "e4a13203112a036fc7f437d391c7810f3dd5ab52",
        "type": "github"
      },
      "original": {
@ -174,11 +174,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1725258763,
-        "narHash": "sha256-7s5RfYlTljWnKGkK4hOMJCJ0sNQoLYjMxezX3Vijy/0=",
+        "lastModified": 1726230467,
+        "narHash": "sha256-YyMNF7IFyysZ2KeqEO6AmV3nQeaDSxyNXLdHp1ghO60=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "0774f58cf1025bbb713971deecc7f07c856be6ed",
+        "rev": "43efa7a3a97f290441bd75b18defcd4f7b8df220",
        "type": "github"
      },
      "original": {
@ -239,11 +239,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1725234343,
-        "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
+        "lastModified": 1726153070,
+        "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
+        "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
        "type": "github"
      },
      "original": {
@ -349,11 +349,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725180166,
-        "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
+        "lastModified": 1726308872,
+        "narHash": "sha256-d4vwO5N4RsLnCY7k5tY9xbdYDWQsY3RDMeUoIa4ms2A=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
+        "rev": "6c1a461a444e6ccb3f3e42bb627b510c3a722a57",
        "type": "github"
      },
      "original": {
@ -424,11 +424,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1725219211,
-        "narHash": "sha256-17WA01XfBTuH1CJdGje3095K/7RUUL6lwQHEFq9t2Go=",
+        "lastModified": 1726246604,
+        "narHash": "sha256-cScS34F71HzhIUeMScfKrT7iSZA0tr8pGIjOqHF+ue8=",
        "ref": "refs/heads/main",
-        "rev": "6934e7aa2b300bc4565855a4092fb34de8a9a8d2",
-        "revCount": 5178,
+        "rev": "d35e70a8c6599bb058cf86eb87c783ce1cf72471",
+        "revCount": 5218,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@ -482,11 +482,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725188252,
-        "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=",
+        "lastModified": 1725997860,
+        "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "c12ab785ce1982f82594aff03b3104c598186ddd",
+        "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876",
        "type": "github"
      },
      "original": {
@ -572,11 +572,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725161148,
-        "narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=",
+        "lastModified": 1725765290,
+        "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=",
        "owner": "nix-community",
        "repo": "nix-index-database",
-        "rev": "32058e9138248874773630c846563b1a78ee7a5b",
+        "rev": "642275444c5a9defce57219c944b3179bf2adaa9",
        "type": "github"
      },
      "original": {
@ -619,11 +619,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1722469787,
-        "narHash": "sha256-P20oAmbgXHl1E77TXPXiAj1Ntycc1mf7fZMI7X13VYw=",
+        "lastModified": 1725418254,
+        "narHash": "sha256-2zPzPP9Eu5NxgJxTVcuCCX5xh7CWy7rYaLHfaAZS6H8=",
        "owner": "tpwrules",
        "repo": "nixos-apple-silicon",
-        "rev": "8a665fee82901878edaeb8ee120296a979db2dd2",
+        "rev": "c5f944f49a052232015bb3c03524b69e3fdd2aa4",
        "type": "github"
      },
      "original": {
@ -634,11 +634,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1725103162,
-        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
+        "lastModified": 1725634671,
+        "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+        "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
        "type": "github"
      },
      "original": {
@ -678,11 +678,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1725103162,
-        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
+        "lastModified": 1725983898,
+        "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+        "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43",
        "type": "github"
      },
      "original": {
@ -718,11 +718,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1724857454,
-        "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
+        "lastModified": 1725513492,
+        "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
+        "rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
        "type": "github"
      },
      "original": {
@ -750,11 +750,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1725191098,
-        "narHash": "sha256-YH0kH5CSOnAuPUB1BUzUqvnKiv5SgDhfMNjrkki9Ahk=",
+        "lastModified": 1725985110,
+        "narHash": "sha256-0HKj+JI6rtxaE6Kzcd6HyFNbEFJRsLy5DoNgVF1pyRM=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "779d9eee2ea403da447278a7007c9627c8878856",
+        "rev": "bcc708992104c2059f310fbc3ac00bfc377f9ea8",
        "type": "github"
      },
      "original": {
@ -799,11 +799,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1725290973,
-        "narHash": "sha256-+jwXF9KI0HfvDgpsoJGvOdfOGGSKOrID1wQB79zjUbo=",
+        "lastModified": 1726170940,
+        "narHash": "sha256-sobkRkGBaMX9pD0bwU1iVPWi0WtQvZqlHyl1YtvNDio=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "ef81ad9e85e60420cc83d4642619c14b57139d33",
+        "rev": "35233f929629c8eb64e939e35260fc8347f94df9",
        "type": "github"
      },
      "original": {
@ -880,11 +880,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725203932,
-        "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=",
+        "lastModified": 1726046979,
+        "narHash": "sha256-6SEsjurq9cdTkITA6d49ncAJe4O/8CgRG5/F//s6Xh8=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251",
+        "rev": "e695669fd8e1d1be9eaae40f35e00f8bd8b64c18",
        "type": "github"
      },
      "original": {
--- a/home/darwin/default.nix
+++ b/home/darwin/default.nix
@ -19,7 +19,7 @@

  home.file.".gnupg/gpg-agent.conf" = {
    text = ''
-      pinentry-program "${pkgs.pinentry-curses}/bin/curses"
+      pinentry-program "${pkgs.pinentry-curses}/bin/pinentry"
      default-cache-ttl 30
      max-cache-ttl 600
    '';
--- a/home/default.nix
+++ b/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;
--- a/home/packages.nix
+++ b/home/packages.nix
@ -41,6 +41,7 @@ in {
      omnisharp-roslyn
      openssh
      pass-git-helper
+      pinentry-curses
      pv
      ripgrep
      rsync
--- a/nixos/hosts/zeus.nix
+++ b/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;
--- a/nixos/profiles/default.nix
+++ b/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