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

Merge pull request 'nixos: upgrade to 24.05' (#93) from upgrade-24.05 into main

Browse source 
Reviewed-on: #93
This commit is contained in:
Rouven Seifert 2024-06-21 13:35:26 +02:00
parent 54a86b59ed 97de6f6489
commit ef50b987a4
8 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.lock
View file

@ -160,16 +160,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716361217, "lastModified": 1718208800,
"narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -1,6 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; 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";

8
hosts/tomate/configuration.nix
View file

@ -50,13 +50,13 @@
services.xserver.enable = true; services.xserver.enable = true;
# Enable the KDE Plasma Desktop Environment. # Enable the KDE Plasma Desktop Environment.
services.xserver.displayManager.sddm.enable = true; services.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.plasma5.enable = true;
# Configure keymap in X11 # Configure keymap in X11
services.xserver = { services.xserver = {
layout = "de"; xkb.layout = "de";
xkbVariant = ""; xkb.variant = "";
}; };
# Configure console keymap # Configure console keymap
@ -90,7 +90,7 @@
services.avahi = { services.avahi = {
enable = true; enable = true;
nssmdns = true; nssmdns4 = true;
openFirewall = true; openFirewall = true;
publish = { publish = {
enable = true; enable = true;

5
modules/core/bacula.nix
View file

@ -26,7 +26,10 @@
mailcommand = "${pkgs.bacula}/bin/bsmtp -f \"Bacula <bacula@${config.networking.domain}>\" -s \"Bacula report" %r" mailcommand = "${pkgs.bacula}/bin/bsmtp -f \"Bacula <bacula@${config.networking.domain}>\" -s \"Bacula report" %r"
mail = root+backup = all, !skipped mail = root+backup = all, !skipped
''; '';
director."abel-dir".password = "@${config.sops.secrets."bacula/password".path}"; director."abel-dir" = {
password = "@${config.sops.secrets."bacula/password".path}";
tls.enable = false;
};
}; };
environment.etc."bacula/bconsole.conf".text = '' environment.etc."bacula/bconsole.conf".text = ''
Director { Director {

1
modules/core/base.nix
View file

@ -1,6 +1,5 @@
{ pkgs, config, ... }: { { pkgs, config, ... }: {
nix = { nix = {
package = pkgs.nixUnstable; # or versioned attributes like nix_2_4
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
''; '';

2
modules/mail/dovecot2.nix
View file

@ -100,7 +100,7 @@ in
# set to satisfy the sieveScripts check, will be overridden by userdb lookups anyways # set to satisfy the sieveScripts check, will be overridden by userdb lookups anyways
mailUser = "vmail"; mailUser = "vmail";
mailGroup = "vmail"; mailGroup = "vmail";
sieveScripts = { sieve.scripts = {
before = pkgs.writeText "spam.sieve" '' before = pkgs.writeText "spam.sieve" ''
require "fileinto"; require "fileinto";

2
modules/nextcloud.nix
View file

@ -30,7 +30,7 @@ in
database.createLocally = true; database.createLocally = true;
# enable HEIC image preview # enable HEIC image preview
extraOptions.enabledPreviewProviders = [ settings.enabledPreviewProviders = [
"OC\\Preview\\BMP" "OC\\Preview\\BMP"
"OC\\Preview\\GIF" "OC\\Preview\\GIF"
"OC\\Preview\\JPEG" "OC\\Preview\\JPEG"

8
modules/web/ese.nix
View file

@ -5,7 +5,7 @@ let
in in
{ {
sops.secrets."directus_env" = { }; sops.secrets."directus_env" = { };
environment.systemPackages = [ pkgs.nodejs_21 ]; environment.systemPackages = [ pkgs.nodejs_22 ];
virtualisation.oci-containers = { virtualisation.oci-containers = {
containers.directus-ese = { containers.directus-ese = {
image = "directus/directus:latest"; image = "directus/directus:latest";
@ -21,13 +21,13 @@ in
"DB_DATABASE" = "directus_ese"; "DB_DATABASE" = "directus_ese";
"DB_USER" = "directus_ese"; "DB_USER" = "directus_ese";
"PUBLIC_URL" = "https://directus-ese.ifsr.de"; "PUBLIC_URL" = "https://directus-ese.ifsr.de";
"AUTH_PROVIDERS"="keycloak"; "AUTH_PROVIDERS" = "keycloak";
"AUTH_KEYCLOAK_DRIVER" = "openid"; "AUTH_KEYCLOAK_DRIVER" = "openid";
"AUTH_KEYCLOAK_CLIENT_ID" = "directus-ese"; "AUTH_KEYCLOAK_CLIENT_ID" = "directus-ese";
"AUTH_KEYCLOAK_ISSUER_URL" = "https://sso.ifsr.de/realms/internal/.well-known/openid-configuration"; "AUTH_KEYCLOAK_ISSUER_URL" = "https://sso.ifsr.de/realms/internal/.well-known/openid-configuration";
"AUTH_KEYCLOAK_IDENTIFIER_KEY" = "email"; "AUTH_KEYCLOAK_IDENTIFIER_KEY" = "email";
"AUTH_KEYCLOAK_ALLOW_PUBLIC_REGISTRATION"="true"; "AUTH_KEYCLOAK_ALLOW_PUBLIC_REGISTRATION" = "true";
"AUTH_KEYCLOAK_DEFAULT_ROLE_ID"="a6b7a1b6-a6fa-442c-87fd-e37c2a16424b"; "AUTH_KEYCLOAK_DEFAULT_ROLE_ID" = "a6b7a1b6-a6fa-442c-87fd-e37c2a16424b";
}; };
environmentFiles = [ environmentFiles = [
config.sops.secrets."directus_env".path config.sops.secrets."directus_env".path