wurzel/fruitbasket
9
1
Fork 0
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

drop nixos-unstable

Browse source
This commit is contained in:
Rouven Seifert 2024-06-21 18:47:49 +02:00
parent a971e3f100
commit 033e1fad2d
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
4 changed files with 3 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
flake.lock
View file

@ -188,22 +188,6 @@
"type": "github" "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": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1718835956, "lastModified": 1718835956,
@ -286,7 +270,6 @@
"kpp": "kpp", "kpp": "kpp",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable",
"print-interface": "print-interface", "print-interface": "print-interface",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"vscode-server": "vscode-server" "vscode-server": "vscode-server"

1
flake.nix
View file

@ -1,7 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; 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.url = "github:Mic92/sops-nix";
sops-nix.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs.nixpkgs.follows = "nixpkgs";
nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.url = "github:nix-community/nix-index-database";

4
modules/keycloak.nix
View file

@ -1,4 +1,4 @@
{ config, nixpkgs-unstable, ... }: { config, ... }:
let let
domain = "sso.${config.networking.domain}"; domain = "sso.${config.networking.domain}";
in in
@ -7,7 +7,7 @@ in
services.keycloak = { services.keycloak = {
enable = true; enable = true;
# we use unstable as the release in stable is insecure # 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 = { settings = {
http-port = 8086; http-port = 8086;
https-port = 19000; https-port = 19000;

11
modules/ldap/default.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, nixpkgs-unstable, system, ... }: { config, pkgs, system, ... }:
let let
domain = "auth.${config.networking.domain}"; domain = "auth.${config.networking.domain}";
seedSettings = { seedSettings = {
@ -43,15 +43,6 @@ let
}; };
in 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 = { sops.secrets = {
"portunus/admin-password".owner = config.services.portunus.user; "portunus/admin-password".owner = config.services.portunus.user;
"portunus/search-password".owner = config.services.portunus.user; "portunus/search-password".owner = config.services.portunus.user;