!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";

nix/homeModules/extra/neovim-moreLangServers.nix

@@ -9,7 +9,7 @@
     pkgs.nil # nix
     pkgs.yaml-language-server # yaml
 
-    pkgs.nodePackages.pyright # python
+    pkgs.pyright # python
 
     pkgs.marksman # markdown
     pkgs.taplo # toml

nix/homeModules/named/bismuth/default.nix

@@ -27,5 +27,5 @@ in
     pkgs.colima
   ];
 
-  programs.neovim.extraPackages = [ myPkgs.fish-lsp ];
+  programs.neovim.extraPackages = [ pkgs.fish-lsp ];
 }

nix/homeModules/named/carbon/dev.nix

@@ -1,9 +1,5 @@
 { pkgs, config, ... }:
 
-let
-  inherit (pkgs) myPkgs;
-in
-
 {
   home.packages = [
     pkgs.jetbrains.idea-community
@@ -53,7 +49,7 @@ in
 
   programs.neovim.extraPackages = [
     # fish
-    myPkgs.fish-lsp
+    pkgs.fish-lsp
 
     # golang
     pkgs.gopls