diff --git a/config/base.nix b/config/base.nix index 4e3a2c2..10d09ef 100644 --- a/config/base.nix +++ b/config/base.nix @@ -71,14 +71,6 @@ nixpkgs.config = { allowUnfree = true; allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "corefonts" ]; - permittedInsecurePackages = [ - "aspnetcore-runtime-wrapped-6.0.36" - "aspnetcore-runtime-6.0.36" - "dotnet-runtime-6.0.36" - "dotnet-sdk-wrapped-6.0.428" - "dotnet-sdk-6.0.428" - "mbedtls-2.28.10" - ]; }; nix = { nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; diff --git a/hosts/miniserver/configuration.nix b/hosts/miniserver/configuration.nix index f2d4027..e407263 100644 --- a/hosts/miniserver/configuration.nix +++ b/hosts/miniserver/configuration.nix @@ -31,7 +31,6 @@ (buildMachine "workstation" 8 40) (buildMachine "server" 6 17) ]; - nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ]; networking = { hostName = "miniserver"; firewall = { diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index 92a8690..d6caae2 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -48,6 +48,7 @@ in supportedFeatures = config.my.nix.features; } ]; + nixpkgs.config.permittedInsecurePackages = [ "mbedtls-2.28.10" ]; sops.secrets = { "server/private" = lib.mkIf config.my.secureHost { sopsFile = ../../secrets/wireguard.yaml; diff --git a/modules/scripts/find-dup-episode.nix b/modules/scripts/find-dup-episodes.nix similarity index 100% rename from modules/scripts/find-dup-episode.nix rename to modules/scripts/find-dup-episodes.nix diff --git a/modules/servers/nextcloud.nix b/modules/servers/nextcloud.nix index e0f4de7..1da5345 100644 --- a/modules/servers/nextcloud.nix +++ b/modules/servers/nextcloud.nix @@ -49,10 +49,6 @@ in owner = config.users.users.nextcloud.name; inherit (config.users.users.nextcloud) group; }; - nixpkgs.config.permittedInsecurePackages = [ - "nodejs-14.21.3" - "openssl-1.1.1v" - ]; users = { groups.nextcloud = { inherit gid; diff --git a/modules/servers/paperless.nix b/modules/servers/paperless.nix index e8db7a8..4950a9c 100644 --- a/modules/servers/paperless.nix +++ b/modules/servers/paperless.nix @@ -24,7 +24,7 @@ in settings = { PAPERLESS_ACCOUNT_DEFAULT_HTTP_PROTOCOL = "http"; PAPERLESS_URL = "http://${config.my.ips.server}:${builtins.toString port}"; - PAPERLESS_DBENGINE = "postgress"; + PAPERLESS_DBENGINE = "postgresql"; PAPERLESS_DBNAME = "paperless"; PAPERLESS_DBHOST = config.my.postgresSocket; PAPERLESS_TIME_ZONE = config.my.timeZone;