!update to 24.11 (beta)

nix/homeModules/common/cmus/default.nix

@@ -1,15 +1,12 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-{
-  options.programs.cmus.enable = lib.mkEnableOption "cmus";
+{ pkgs, lib, ... }:
 
-  config = lib.mkIf config.programs.cmus.enable {
-    home.packages = [ pkgs.cmus ];
-    xdg.configFile."cmus/rc".text = lib.mkMerge [
+{
+
+  programs.cmus = {
+
+    enable = true;
+
+    extraConfig = lib.mkMerge [
       (builtins.readFile ./rc)
 
       (lib.mkIf pkgs.stdenv.isLinux (
@@ -55,5 +52,7 @@
         set output_plugin=ao
       '')
     ];
+
   };
+
 }

nix/homeModules/common/user-nixconf.nix

@@ -1,9 +1,14 @@
-{ pkgs, lib, ... }:
+{
+  nixosConfig ? null,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
 
   nix = {
-    package = lib.mkForce pkgs.nixVersions.nix_2_23;
+    package = lib.mkDefault (nixosConfig.nix.package or pkgs.nix);
 
     settings = {
       allow-import-from-derivation = "true";