Last fix on darwin new structure

modules/home/common/devenv.nix

@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.home.shell.devenv;
+  cfg = config.user.shell.devenv;
 in
 {
-  options.home.shell.devenv = {
+  options.user.shell.devenv = {
     enable = mkEnableOption "System devenv service";
   };
   config = mkIf cfg.enable {

modules/home/common/git.nix

@@ -5,16 +5,15 @@
 }:
 with lib;
 let
-  cfg = config.home.shell.git;
+  cfg = config.user.shell.git;
 in
 {
-  options.home.shell.git = {
+  options.user.shell.git = {
     enable = mkEnableOption "Zen Editor options";
   };
   config = mkIf cfg.enable {
 
     programs.git = {
-      enable = true;
       config.init.defaultBranch = "main";
       settings = {
         user = {

modules/home/common/neovim.nix

@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.home.shell.neovim;
+  cfg = config.user.shell.neovim;
 in
 {
-  options.home.shell.neovim = {
+  options.user.shell.neovim = {
     enable = mkEnableOption "System neovim service";
   };
   config = mkIf cfg.enable {

modules/home/common/nh.nix

@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.home.shell.nh;
+  cfg = config.user.shell.nh;
 in
 {
-  options.home.shell.nh = {
+  options.user.shell.nh = {
     enable = mkEnableOption "System nh service";
   };
   config = mkIf cfg.enable {

modules/home/common/zsh.nix

@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.home.shell.zsh;
+  cfg = config.user.shell.zsh;
 in
 {
-  options.home.shell.zsh = {
+  options.user.shell.zsh = {
     enable = mkEnableOption "System zsh service";
   };
   config = mkIf cfg.enable {