chore: merge remote-tracking branch 'refs/remotes/origin/master'

modules/services/mpd.nix

@@ -14,17 +14,19 @@
 
   services.mpd = {
     enable = true;
-    musicDirectory = "/home/${username}/Music";
-    playlistDirectory = "/home/${username}/Music/.playlists";
-    extraConfig = ''
-      restore_paused "yes"
-      auto_update "yes"
+    settings = {
+      playlist_directory = "/home/${username}/Music/.playlists";
+      music_directory = "/home/${username}/Music";
+      restore_paused = "yes";
+      auto_update = "yes";
 
-      audio_output {
-        type "pipewire"
-        name "pipewire"
-      }
-    '';
+      audio_output = [
+        {
+          type = "pipewire";
+          name = "pipewire";
+        }
+      ];
+    };
     user = "${username}"; # PipeWire requires this as it runs as the normal user and mpd normally runs as a system user.
 
     # Optional:

modules/services/ollama.nix

@@ -1,9 +1,10 @@
+{ pkgs, ... }:
 {
   services.ollama = {
     enable = true;
     # Optional: preload models, see https://ollama.com/library
     # loadModels = [ "llama3.2:3b" "deepseek-r1:1.5b"];
-    acceleration = "rocm"; # nope, 5700XT is too old for this
+    package = pkgs.ollama-rocm; # nope, 5700XT is too old for this
   };
   services.open-webui.enable = false;
 }