diff --git a/flake.lock b/flake.lock index 5f88adf..2617fdc 100644 --- a/flake.lock +++ b/flake.lock @@ -188,22 +188,6 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1718714799, - "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1718835956, @@ -286,7 +270,6 @@ "kpp": "kpp", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs_2", - "nixpkgs-unstable": "nixpkgs-unstable", "print-interface": "print-interface", "sops-nix": "sops-nix", "vscode-server": "vscode-server" diff --git a/flake.nix b/flake.nix index 729bc82..badd3c2 100755 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,6 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database.url = "github:nix-community/nix-index-database"; diff --git a/modules/keycloak.nix b/modules/keycloak.nix index 08d5d2d..ccee386 100644 --- a/modules/keycloak.nix +++ b/modules/keycloak.nix @@ -1,4 +1,4 @@ -{ config, nixpkgs-unstable, ... }: +{ config, ... }: let domain = "sso.${config.networking.domain}"; in @@ -7,7 +7,7 @@ in services.keycloak = { enable = true; # we use unstable as the release in stable is insecure - package = nixpkgs-unstable.legacyPackages.x86_64-linux.keycloak; + # package = nixpkgs-unstable.legacyPackages.x86_64-linux.keycloak; settings = { http-port = 8086; https-port = 19000; diff --git a/modules/ldap/default.nix b/modules/ldap/default.nix index b5d1cf7..85ba359 100644 --- a/modules/ldap/default.nix +++ b/modules/ldap/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, nixpkgs-unstable, system, ... }: +{ config, pkgs, system, ... }: let domain = "auth.${config.networking.domain}"; seedSettings = { @@ -43,15 +43,6 @@ let }; in { - # Use portunus from unstable branch until 24.05 is here - disabledModules = [ "services/misc/portunus.nix" ]; - imports = [ "${nixpkgs-unstable}/nixos/modules/services/misc/portunus.nix" ]; - nixpkgs.overlays = [ - (_self: _super: { - inherit (nixpkgs-unstable.legacyPackages.${system}) portunus; - }) - ]; - sops.secrets = { "portunus/admin-password".owner = config.services.portunus.user; "portunus/search-password".owner = config.services.portunus.user;