From 76cabab60a7e8543773477c3f9a83153bf9c854c Mon Sep 17 00:00:00 2001 From: fruchti Date: Sun, 2 Jun 2024 11:06:30 +0200 Subject: [PATCH] Rupert: Adapt for 24.05 --- hosts/bspwm.nix | 8 +++++--- hosts/nextcloud.nix | 10 ++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/hosts/bspwm.nix b/hosts/bspwm.nix index dbf37a4..d32093a 100644 --- a/hosts/bspwm.nix +++ b/hosts/bspwm.nix @@ -4,12 +4,14 @@ enable = true; windowManager.bspwm.enable = true; displayManager = { - defaultSession = "none+bspwm"; lightdm.enable = true; - autoLogin.enable = true; - autoLogin.user = "waldi"; }; }; + services.displayManager = { + defaultSession = "none+bspwm"; + autoLogin.enable = true; + autoLogin.user = "waldi"; + }; services.unclutter-xfixes = { enable = true; diff --git a/hosts/nextcloud.nix b/hosts/nextcloud.nix index b826d63..5a46d2e 100644 --- a/hosts/nextcloud.nix +++ b/hosts/nextcloud.nix @@ -9,14 +9,16 @@ in package = pkgs.nextcloud28; hostName = hostName; datadir = "/data/nextcloud"; + settings = { + trusted_domains = [ + ((lib.toLower config.networking.hostName) + ".lan") + (lib.toLower config.networking.hostName) + ]; + }; config = { dbtype = "pgsql"; dbhost = "/run/postgresql"; adminpassFile = "/secrets/nextcloud_admin_password.txt"; - extraTrustedDomains = [ - ((lib.toLower config.networking.hostName) + ".lan") - (lib.toLower config.networking.hostName) - ]; }; caching.redis = true; };