all: welcome to 23.05

modules/nixos/default.nix

@@ -10,5 +10,4 @@
   backup = import ./backup.nix;
   ulogger-server = import ./ulogger.nix;
   microbin = import ./microbin.nix;
-  photoprism = import ./photoprism.nix; #TODO remove once updated to 23.05, stolen from nixpkgs anyway
 }

modules/nixos/gonic.nix

@@ -3,13 +3,13 @@
 with lib;
 
 let
-  cfg = config.services.gonic;
+  cfg = config.mossnet.gonic;
   configFile = "/etc/gonic/config";
   dataFolder = "/var/lib/gonic";
 in {
   options = {
 
-    services.gonic = {
+    mossnet.gonic = {
       enable = mkEnableOption "Gonic music server and streamer";
 
       settings = lib.mkOption {