From 846be90bda6d293abc397b544e0bfbe10fcdc2a8 Mon Sep 17 00:00:00 2001 From: Grey Jones Date: Sun, 6 Sep 2026 18:57:35 +0100 Subject: [PATCH] add zen-browser as standard application module --- dotfiles/takamaki/niri.kdl | 2 +- flake.lock | 80 ++++++++++++------- flake.nix | 4 +- .../features/applications/gui/zen-browser.nix | 17 ++++ modules/hosts/takamaki/takamaki.nix | 1 + 5 files changed, 73 insertions(+), 31 deletions(-) create mode 100644 modules/features/applications/gui/zen-browser.nix diff --git a/dotfiles/takamaki/niri.kdl b/dotfiles/takamaki/niri.kdl index 0b8dfdf..7559f99 100644 --- a/dotfiles/takamaki/niri.kdl +++ b/dotfiles/takamaki/niri.kdl @@ -44,7 +44,7 @@ layout { empty-workspace-above-first } binds { - Mod+B { spawn "zen-browser"; } + Mod+B { spawn "zen-beta"; } Mod+C { spawn "kcalc"; } Mod+E { spawn "dolphin"; } diff --git a/flake.lock b/flake.lock index e96512d..9e6971c 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1788062878, - "narHash": "sha256-rcVVm6aHB0uUy0W4IE/Pbs8E7YVONklftB2v3vUqsd0=", + "lastModified": 1788678358, + "narHash": "sha256-xFu9deElkBd81tRYo2yRSZQ40LDXMnVd/gO1/uELxhI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "b1ad358290dcf751d364b80f50bb706e30327f7b", + "rev": "2554c0e25259c6ab3e71dac5177f8d38f76a6e1c", "type": "gitlab" }, "original": { @@ -111,11 +111,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1787559586, - "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=", + "lastModified": 1788450739, + "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1", + "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1787797243, - "narHash": "sha256-8+Q7NOB7RPajRjA4pbCDLzqH+MTjnG9x6LUPLfL2joA=", + "lastModified": 1788651960, + "narHash": "sha256-v9wJd32eZ2bvhBzVOd7TIjLQd011P7nwOhjKtWlci5I=", "owner": "nix-community", "repo": "home-manager", - "rev": "99c9ec63390f1d8c14d95d9e8b17cc29cfbd4e11", + "rev": "2c0350c759688177331b8f5242311fae8877bdb3", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "import-tree": { "locked": { - "lastModified": 1784254960, - "narHash": "sha256-iI88R3wHz8wTKQb5orvpc51L/Xr64AJyxid/0MKa/b8=", + "lastModified": 1788467110, + "narHash": "sha256-ljEMTXP/rH0tOvDzc9gzwww6KcHRPRnEHzd9lK48V7s=", "owner": "vic", "repo": "import-tree", - "rev": "4ebb10ae17d5f1ad366e7aef5b92cb8eecf24f69", + "rev": "eb1b52eaecc57f7c136d07ae8a93e724dfecac46", "type": "github" }, "original": { @@ -237,11 +237,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1788039129, - "narHash": "sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85+A=", + "lastModified": 1788614874, + "narHash": "sha256-7QYjT2vHLuX9Z1pdxHXDKCbh1CR3D/2rywB9Tx0MPRg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d2f67949798825fe853f7c5d0492b8bf016d3f88", + "rev": "c043004d1c6985732bcc1cbc5a9c9aecbbb4e0f0", "type": "github" }, "original": { @@ -253,11 +253,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1788297115, - "narHash": "sha256-Z+vUNbfd2FIKkWOTkcT7RYlh3oFCnig/d2eXD1SWf2E=", + "lastModified": 1788584326, + "narHash": "sha256-Fd3OB8J9JhgliQwOKcqx4M672CInxi1I5VnwsaXeSQo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3116115851d68b8952a2a4221cc25a84e56b532", + "rev": "6713828a351efa628b025a1adf7f43cbf8597513", "type": "github" }, "original": { @@ -269,11 +269,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1785031560, - "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", + "lastModified": 1788057806, + "narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c", + "rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c", "type": "github" }, "original": { @@ -289,11 +289,11 @@ ] }, "locked": { - "lastModified": 1788125858, - "narHash": "sha256-CIAwVQWtDSFiGulRQlLALXfdoJDUrtXBEtctSxXuCXQ=", + "lastModified": 1788659825, + "narHash": "sha256-daBPX2MPsVb0fD/wTX68K6lWU4uqWwNrmqhcBTCGTwc=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "da34acc58d6c3c5733ebe95caaeb6086cc96d7de", + "rev": "224da6dd4360c5d2400fea967736c8195396ebb9", "type": "github" }, "original": { @@ -338,7 +338,8 @@ "nixpkgs-26-05": "nixpkgs-26-05", "noctalia": "noctalia", "spicetify": "spicetify", - "stylix": "stylix" + "stylix": "stylix", + "zen-browser": "zen-browser" } }, "spicetify": { @@ -349,11 +350,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1788083617, - "narHash": "sha256-aXMDRUxm/9se+vgKViKdDcClk1k3qA3sUwT0kAYo3Fg=", + "lastModified": 1788683578, + "narHash": "sha256-bERpuakmPAC2b36zgXy6OXh+SkZUjbaV+vV2sPmm6p8=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "bf4ed54253a61c8324a5b461638c42db77c0b980", + "rev": "a4ef43fb13e3615f36e5a0935aabe8cc29363dc9", "type": "github" }, "original": { @@ -489,6 +490,29 @@ "repo": "base16-zed", "type": "github" } + }, + "zen-browser": { + "inputs": { + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1788672837, + "narHash": "sha256-FgtxJIiNZfqNkLeIz30/CDE6v6gbou0MhuiFLt2En7w=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "ec2c94c95846c36130edb9872a8ca4c203028c84", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 3606d32..448c879 100644 --- a/flake.nix +++ b/flake.nix @@ -25,11 +25,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - /* zen-browser = { + zen-browser = { url = "github:0xc000022070/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; - }; */ + }; firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; diff --git a/modules/features/applications/gui/zen-browser.nix b/modules/features/applications/gui/zen-browser.nix new file mode 100644 index 0000000..a3bb790 --- /dev/null +++ b/modules/features/applications/gui/zen-browser.nix @@ -0,0 +1,17 @@ +{ inputs, self, ... }: let + optionName = "features.applications.gui.zen-browser.enable"; +in { + imports = [ (inputs.helpers.mkStandardFeature.flakeModule "graphics" optionName "Zen Browser") ]; + + flake.nixosModules.graphics = { config, pkgs, ... }: { + imports = [ (inputs.helpers.mkStandardFeature.nixosModule { inherit config optionName; } { + environment.systemPackages = [ inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default ]; + }) ]; + }; + + flake.homeModules.graphics = { config, pkgs, ... }: { + imports = [ (inputs.helpers.mkStandardFeature.homeModule { inherit config optionName; } { + home.packages = [ inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default ]; + }) ]; + }; +} diff --git a/modules/hosts/takamaki/takamaki.nix b/modules/hosts/takamaki/takamaki.nix index d506ab6..fbe5253 100644 --- a/modules/hosts/takamaki/takamaki.nix +++ b/modules/hosts/takamaki/takamaki.nix @@ -68,6 +68,7 @@ }; }; thunderbird.enable = true; + zen-browser.enable = true; }; extraPackages = with pkgs; [