From 5b8f6f675bd413b58a1713e100e19e35fb609510 Mon Sep 17 00:00:00 2001 From: Tigor Hutasuhut Date: Mon, 18 Nov 2024 21:32:31 +0700 Subject: [PATCH] zen: added native zen-browser --- flake.lock | 37 ++++++++++++++++++++++++++++++++++++- flake.nix | 12 +++++++----- home/modules/firefox.nix | 1 + profiles/castle.nix | 2 +- 4 files changed, 45 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 6dbdf84..560bf1f 100644 --- a/flake.lock +++ b/flake.lock @@ -587,6 +587,22 @@ "type": "indirect" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1729392836, @@ -638,7 +654,8 @@ "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "rust-overlay": "rust-overlay", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "zen-browser": "zen-browser" } }, "rust-overlay": { @@ -737,6 +754,24 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } + }, + "zen-browser": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1727721329, + "narHash": "sha256-QYlWZwUSwrM7BuO+dXclZIwoPvBIuJr6GpFKv9XKFPI=", + "owner": "MarceColl", + "repo": "zen-browser-flake", + "rev": "e6ab73f405e9a2896cce5956c549a9cc359e5fcc", + "type": "github" + }, + "original": { + "owner": "MarceColl", + "repo": "zen-browser-flake", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 3ac52ff..009ced4 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,7 @@ ]; }; inputs = { + zen-browser.url = "github:MarceColl/zen-browser-flake"; nur.url = "github:nix-community/NUR"; neovim-nightly-overlay = { url = "github:nix-community/neovim-nightly-overlay"; @@ -45,7 +46,6 @@ }; outputs = inputs@{ - self, nur, nixpkgs, home-manager, @@ -57,6 +57,7 @@ ... }: let + system = "x86_64-linux"; commonModules = [ nur.nixosModules.nur nix-flatpak.nixosModules.nix-flatpak @@ -71,6 +72,7 @@ neovim-nightly-overlay.overlays.default nur.overlay rust-overlay.overlays.default + (final: prev: { zen-browser = inputs.zen-browser.packages."${system}".default; }) ]; } { @@ -93,7 +95,7 @@ } ]; unstable = import inputs.nixpkgs-unstable { - system = "x86_64-linux"; + inherit system; config.allowUnfree = true; }; in @@ -113,7 +115,7 @@ }; in nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; + inherit system; modules = [ ./system { @@ -137,7 +139,7 @@ }; in nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; + inherit system; modules = [ ./system { @@ -161,7 +163,7 @@ }; in nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; + inherit system; modules = [ ./system { diff --git a/home/modules/firefox.nix b/home/modules/firefox.nix index b7b00e8..cb65982 100644 --- a/home/modules/firefox.nix +++ b/home/modules/firefox.nix @@ -9,6 +9,7 @@ let in { config = lib.mkIf cfg.enable { + home.packages = [ pkgs.zen-browser ]; programs.firefox = { enable = true; policies = { diff --git a/profiles/castle.nix b/profiles/castle.nix index aa51fd1..b1d26a1 100644 --- a/profiles/castle.nix +++ b/profiles/castle.nix @@ -99,7 +99,7 @@ in flatpak = { enable = true; - zen-browser.enable = true; + zen-browser.enable = false; redisinsight.enable = true; };