Update things

flake.lock

@@ -173,11 +173,11 @@
         "zig": "zig"
       },
       "locked": {
-        "lastModified": 1733783261,
+        "lastModified": 1733867032,
-        "narHash": "sha256-SnLO3H9RKzqwEqpsjGIm4XWaiznK8H6kJBxFprgTyeY=",
+        "narHash": "sha256-2ddDF3j8aI70WdWIn+Gsef4XGM2+grIlaEtHlkZmWdY=",
         "ref": "refs/heads/main",
-        "rev": "5dcca19038f57519e91dbd6d5510978bb8553909",
+        "rev": "59df17a699f6f13700823124cefaf91fb0c37d4f",
-        "revCount": 8194,
+        "revCount": 8196,
         "type": "git",
         "url": "ssh://git@github.com/mitchellh/ghostty"
       },
@@ -301,14 +301,15 @@
         "neovim-src": "neovim-src",
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1733812790,
+        "lastModified": 1733903671,
-        "narHash": "sha256-PxxXxmwGeAkJ/FQ3iEqaphwnK/b1zazGyczJJVyq6dU=",
+        "narHash": "sha256-pztctU+iwx4zh1TrGAmnrZOv9ud8/tRjlObXmZnbRbo=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "34c8b396834adaa253131d65c9250f073f721175",
+        "rev": "331e9c8200a2413f891b9dd762fc179ce6d335f9",
         "type": "github"
       },
       "original": {
@@ -320,11 +321,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1733731191,
+        "lastModified": 1733850961,
-        "narHash": "sha256-Xtd0YLx6RKJMDu2GfE9geO48Dw3KnpVkfZjUqA51xDw=",
+        "narHash": "sha256-GpdTTQ1g7tERjY/rzGZtiWd5eAqKsTtPJN/LEBkTU0E=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "3bb2d027597107a3d7f84ef61507104fd4dc050a",
+        "rev": "3f1d09bc94d02266d6fa588a2ccd1be1ca084cf7",
         "type": "github"
       },
       "original": {
@@ -375,11 +376,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1733481457,
+        "lastModified": 1733861262,
-        "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=",
+        "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "e563803af3526852b6b1d77107a81908c66a9fcf",
+        "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5",
         "type": "github"
       },
       "original": {
@@ -398,11 +399,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733767699,
+        "lastModified": 1733854371,
-        "narHash": "sha256-e7j6BZpHo83LCsLzi/LuW/P7YXdGRPBiYR+H7vADBQM=",
+        "narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "f130def404d6c69920ba1c61cb94bdaa9d6fc8f1",
+        "rev": "dee4425dcee3149475ead0cb6a616b8a028c5888",
         "type": "github"
       },
       "original": {
@@ -413,11 +414,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733581040,
+        "lastModified": 1733759999,
-        "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
+        "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
+        "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
         "type": "github"
       },
       "original": {
@@ -457,7 +458,7 @@
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs",
         "river-src": "river-src",
-        "zen": "zen"
+        "zen-browser": "zen-browser"
       }
     },
     "systems": {
@@ -490,22 +491,89 @@
         "type": "github"
       }
     },
-    "zen": {
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "neovim-nightly",
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1732818136,
+        "lastModified": 1733761991,
-        "narHash": "sha256-n94kw3ro0xujt/FzKz0nm47sX7sC13EwaemvIo28I2c=",
+        "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=",
-        "owner": "matthewpi",
+        "owner": "numtide",
-        "repo": "nixpkgs",
+        "repo": "treefmt-nix",
-        "rev": "f946c505ed283080fb57efaea72b36d24629926f",
+        "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085",
         "type": "github"
       },
       "original": {
-        "owner": "matthewpi",
+        "owner": "numtide",
-        "ref": "zen-browser",
+        "repo": "treefmt-nix",
-        "repo": "nixpkgs",
         "type": "github"
       }
     },
+    "zen-browser": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "zen-browser-aarch64": "zen-browser-aarch64",
+        "zen-browser-generic": "zen-browser-generic",
+        "zen-browser-specific": "zen-browser-specific"
+      },
+      "locked": {
+        "lastModified": 1733866152,
+        "narHash": "sha256-r/uMP+ewTEoQLFaLa2EFktu9PCgOmat0xD1QvoPgwAY=",
+        "owner": "youwen5",
+        "repo": "zen-browser-flake",
+        "rev": "ebb6df0cf500b36ce76bcd49a1ad246e66d9edc3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "youwen5",
+        "repo": "zen-browser-flake",
+        "type": "github"
+      }
+    },
+    "zen-browser-aarch64": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733825278,
+        "narHash": "sha256-UkfTh+p+8D5qP8ZmcdiTIvUay0kNBjWA9Bi6OVZu/b8=",
+        "type": "tarball",
+        "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.0/zen.linux-aarch64.tar.bz2"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.0/zen.linux-aarch64.tar.bz2"
+      }
+    },
+    "zen-browser-generic": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733829638,
+        "narHash": "sha256-4gEnE+4v3A35ggUCZOkqBOXcRE7vAV2A+kEDhJ3gpAs=",
+        "type": "tarball",
+        "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.0/zen.linux-generic.tar.bz2"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.0/zen.linux-generic.tar.bz2"
+      }
+    },
+    "zen-browser-specific": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733830242,
+        "narHash": "sha256-nXDJ1ZGrGkMr6tdkMgDTFfXJLbzUDSuVMUM5i8g79Rg=",
+        "type": "tarball",
+        "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.0/zen.linux-specific.tar.bz2"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.0/zen.linux-specific.tar.bz2"
+      }
+    },
     "zig": {
       "inputs": {
         "flake-compat": [

flake.nix

@@ -40,7 +40,10 @@
       url = "github:LnL7/nix-darwin";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    zen.url = "github:matthewpi/nixpkgs/zen-browser";
+    zen-browser = {
+      url = "github:youwen5/zen-browser-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {

lib/mksystem.nix

@@ -25,7 +25,7 @@
     then ../modules/cli/darwin.nix
     else ../modules/cli;
 
-  specialArgs = inputs // {inherit system user;};
+  specialArgs = inputs // {inherit user;};
 in
   systemFunc {
     inherit system specialArgs;

modules/gui/default.nix

@@ -1,8 +1,7 @@
 {
   config,
   pkgs,
-  zen,
+  zen-browser,
-  system,
   ...
 }: let
   # When editing this, don't forget to edit home.sessionVariables.
@@ -20,7 +19,7 @@ in {
   home.packages = with pkgs; [
     google-chrome
     firefox
-    (import zen {system = system;}).zen-browser
+    zen-browser.packages.${pkgs.system}.default
     vesktop
     mpv
     xdg-utils

modules/gui/ghostty.nix

@@ -1,6 +1,5 @@
 {
   ghostty,
-  system,
   pkgs,
   lib,
   ...
@@ -8,6 +7,6 @@
   xdg.configFile."ghostty/config".source = ./ghostty.config;
 
   home.packages = lib.optionals pkgs.stdenv.isLinux [
-    ghostty.packages.${system}.default
+    ghostty.packages.${pkgs.system}.default
   ];
 }

modules/wm/ags/default.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   astal,
-  system,
   ...
 }: let
   covercolors = pkgs.stdenv.mkDerivation {
@@ -22,7 +21,7 @@
       prev.buildInputs
       ++ [
         pkgs.libdbusmenu-gtk3
-        astal.packages.${system}.river
+        astal.packages.${pkgs.system}.river
       ];
   });
 in {