diff --git a/flake.lock b/flake.lock index f5eefd4..e6956f2 100644 --- a/flake.lock +++ b/flake.lock @@ -194,22 +194,6 @@ "type": "github" } }, - "nixpkgs-mullvad-browser": { - "locked": { - "lastModified": 1681399935, - "narHash": "sha256-v1rYzquyeLEwetn7RsxKw2eQSCxHm3QjAr4lB2D6JJA=", - "owner": "felschr", - "repo": "nixpkgs", - "rev": "b44a299381f3ce9faeb9f6cc41cda454d02335ed", - "type": "github" - }, - "original": { - "owner": "felschr", - "ref": "mullvad-browser", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1681828457, @@ -294,7 +278,6 @@ "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-mullvad-browser": "nixpkgs-mullvad-browser", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "nvim-kitty-navigator": "nvim-kitty-navigator", diff --git a/flake.nix b/flake.nix index 61ee78d..a80883c 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,6 @@ inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - inputs.nixpkgs-mullvad-browser.url = "github:felschr/nixpkgs/mullvad-browser"; - inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master"; inputs.flake-utils.url = "github:numtide/flake-utils"; @@ -42,7 +40,7 @@ outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, flake-utils , home-manager, nur, agenix, deploy-rs, pre-commit-hooks - , nvim-kitty-navigator, nixpkgs-mullvad-browser }@inputs: + , nvim-kitty-navigator }@inputs: let nixpkgsConfig.allowUnfree = true; overlays = { @@ -70,10 +68,6 @@ deconz = final: prev: { deconz = final.qt5.callPackage ./pkgs/deconz { }; }; - mullvad-browser = final: prev: { - inherit (nixpkgs-mullvad-browser.legacyPackages.${final.system}) - mullvad-browser; - }; }; nixosModules = { flakeDefaults = import ./modules/flakeDefaults.nix; @@ -82,18 +76,11 @@ homeManagerModules = { git = import ./home/modules/git.nix; firefox = import ./home/modules/firefox/firefox.nix; - mullvad-browser = import ./home/modules/firefox/mullvad-browser.nix; tor-browser = import ./home/modules/firefox/tor-browser.nix; }; systemDefaults = { modules = [ nixosModules.flakeDefaults agenix.nixosModules.default ]; - overlays = with overlays; [ - unstable - nur.overlay - neovim - deconz - mullvad-browser - ]; + overlays = with overlays; [ unstable nur.overlay neovim deconz ]; }; lib = rec { createSystem = hostName: diff --git a/home/browsers/mullvad-browser.nix b/home/browsers/mullvad-browser.nix index 21c2427..a878d84 100644 --- a/home/browsers/mullvad-browser.nix +++ b/home/browsers/mullvad-browser.nix @@ -32,6 +32,7 @@ in { programs.mullvad-browser = { enable = true; + package = pkgs.unstable.mullvad-browser; createProfileBins = true; profiles = { private = {