feat: switch to mullvad-browser from nixpkgs-unstable

This commit is contained in:
Felix Schröter 2023-04-20 11:51:20 +02:00
parent ae502bba6c
commit aba645bbbb
Signed by: felschr
GPG key ID: 671E39E6744C807D
3 changed files with 3 additions and 32 deletions

View file

@ -194,22 +194,6 @@
"type": "github" "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": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1681828457, "lastModified": 1681828457,
@ -294,7 +278,6 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-mullvad-browser": "nixpkgs-mullvad-browser",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur", "nur": "nur",
"nvim-kitty-navigator": "nvim-kitty-navigator", "nvim-kitty-navigator": "nvim-kitty-navigator",

View file

@ -3,8 +3,6 @@
inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; 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.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.flake-utils.url = "github:numtide/flake-utils";
@ -42,7 +40,7 @@
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, flake-utils outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, flake-utils
, home-manager, nur, agenix, deploy-rs, pre-commit-hooks , home-manager, nur, agenix, deploy-rs, pre-commit-hooks
, nvim-kitty-navigator, nixpkgs-mullvad-browser }@inputs: , nvim-kitty-navigator }@inputs:
let let
nixpkgsConfig.allowUnfree = true; nixpkgsConfig.allowUnfree = true;
overlays = { overlays = {
@ -70,10 +68,6 @@
deconz = final: prev: { deconz = final: prev: {
deconz = final.qt5.callPackage ./pkgs/deconz { }; deconz = final.qt5.callPackage ./pkgs/deconz { };
}; };
mullvad-browser = final: prev: {
inherit (nixpkgs-mullvad-browser.legacyPackages.${final.system})
mullvad-browser;
};
}; };
nixosModules = { nixosModules = {
flakeDefaults = import ./modules/flakeDefaults.nix; flakeDefaults = import ./modules/flakeDefaults.nix;
@ -82,18 +76,11 @@
homeManagerModules = { homeManagerModules = {
git = import ./home/modules/git.nix; git = import ./home/modules/git.nix;
firefox = import ./home/modules/firefox/firefox.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; tor-browser = import ./home/modules/firefox/tor-browser.nix;
}; };
systemDefaults = { systemDefaults = {
modules = [ nixosModules.flakeDefaults agenix.nixosModules.default ]; modules = [ nixosModules.flakeDefaults agenix.nixosModules.default ];
overlays = with overlays; [ overlays = with overlays; [ unstable nur.overlay neovim deconz ];
unstable
nur.overlay
neovim
deconz
mullvad-browser
];
}; };
lib = rec { lib = rec {
createSystem = hostName: createSystem = hostName:

View file

@ -32,6 +32,7 @@ in {
programs.mullvad-browser = { programs.mullvad-browser = {
enable = true; enable = true;
package = pkgs.unstable.mullvad-browser;
createProfileBins = true; createProfileBins = true;
profiles = { profiles = {
private = { private = {