From 1f936258f251f4d8c71a10510ddcf7c58828763e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Thu, 1 May 2025 22:59:28 +0200 Subject: [PATCH] modules/home/desktop: use firefox from nixpkgs --- flake.lock | 21 --------------------- flake.nix | 4 ---- modules/home/desktop/default.nix | 7 +------ 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index f849df2..2b4bac2 100644 --- a/flake.lock +++ b/flake.lock @@ -164,26 +164,6 @@ "type": "github" } }, - "firefox-darwin": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743383039, - "narHash": "sha256-Palj4EeFRS3tLl2aK0FgE01SBWRbqD4vKE+SNBJaYo4=", - "owner": "bandithedoge", - "repo": "nixpkgs-firefox-darwin", - "rev": "96f1d9e12f0efbbc4cea47c0a06a1667ed90e5f8", - "type": "github" - }, - "original": { - "owner": "bandithedoge", - "repo": "nixpkgs-firefox-darwin", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -532,7 +512,6 @@ "crane": "crane", "darwin": "darwin", "disko": "disko", - "firefox-darwin": "firefox-darwin", "helix": "helix", "home-manager": "home-manager", "lix": "lix", diff --git a/flake.nix b/flake.nix index dddf8bd..9786d64 100644 --- a/flake.nix +++ b/flake.nix @@ -47,10 +47,6 @@ url = "gitlab:famedly/conduit?ref=next"; flake = false; }; - firefox-darwin = { - url = "github:bandithedoge/nixpkgs-firefox-darwin"; - inputs.nixpkgs.follows = "nixpkgs"; - }; niko-nur = { url = "github:nrabulinski/nur-packages"; }; diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix index 825d69c..068c82c 100644 --- a/modules/home/desktop/default.nix +++ b/modules/home/desktop/default.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - inputs, inputs', ... }: @@ -29,11 +28,7 @@ programs.firefox = { enable = true; - package = - let - firefox-pkgs = pkgs.extend inputs.firefox-darwin.overlay; - in - lib.mkIf pkgs.stdenv.isDarwin firefox-pkgs.firefox-bin; + package = lib.mkIf pkgs.stdenv.isDarwin pkgs.firefox-unwrapped; }; programs.qutebrowser = {