diff --git a/hosts/common.nix b/hosts/common.nix index 81684ef..cf66608 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -13,13 +13,21 @@ ../modules/nixos ]; - nixpkgs.overlays = [ - inputs.agenix.overlays.default - (import ../overlays/default.nix) - (final: prev: { - unstable = import inputs.nixpkgs-unstable { system = final.system; }; - }) - ]; + nixpkgs = { + config.allowUnfree = true; + overlays = [ + inputs.agenix.overlays.default + (import ../overlays/default.nix) + (final: prev: { + unstable = import inputs.nixpkgs-unstable { + config = { + allowUnfree = true; + }; + system = final.system; + }; + }) + ]; + }; time.timeZone = "Europe/London"; diff --git a/hosts/desktop.nix b/hosts/desktop.nix index c7379cd..a554357 100644 --- a/hosts/desktop.nix +++ b/hosts/desktop.nix @@ -9,10 +9,6 @@ ../users/jordan ]; - nixpkgs = { - config.allowUnfree = true; - }; - services.printing.enable = true; services.openssh.startWhenNeeded = true; diff --git a/hosts/hypnos/default.nix b/hosts/hypnos/default.nix index f098121..9e7ed15 100644 --- a/hosts/hypnos/default.nix +++ b/hosts/hypnos/default.nix @@ -16,7 +16,6 @@ nixpkgs = { hostPlatform = "x86_64-linux"; config = { - allowUnfree = true; nvidia.acceptLicense = true; }; }; diff --git a/hosts/odyssey/default.nix b/hosts/odyssey/default.nix index 5c51091..5e87374 100644 --- a/hosts/odyssey/default.nix +++ b/hosts/odyssey/default.nix @@ -15,7 +15,6 @@ nixpkgs = { hostPlatform = "x86_64-linux"; config = { - allowUnfree = true; nvidia.acceptLicense = true; }; }; diff --git a/hosts/vps1/outline.nix b/hosts/vps1/outline.nix index 091c336..bb9e7c9 100644 --- a/hosts/vps1/outline.nix +++ b/hosts/vps1/outline.nix @@ -7,8 +7,6 @@ let domain = "outline.vimium.com"; in { - nixpkgs.config.allowUnfree = true; - services.nginx.virtualHosts = { "${domain}" = { forceSSL = true; diff --git a/modules/nixos/system/desktop/hyprland.nix b/modules/nixos/system/desktop/hyprland.nix index d379ad7..0086c9d 100644 --- a/modules/nixos/system/desktop/hyprland.nix +++ b/modules/nixos/system/desktop/hyprland.nix @@ -23,8 +23,6 @@ in withUWSM = true; }; - nixpkgs.config.allowUnfree = true; - stylix = { enable = true; autoEnable = false;