Fix on modules name and on zsh

flake.nix

@@ -70,10 +70,8 @@
               ++ [
                 ./hosts/nixos/overlays.nix
                 home-manager.nixosModules.home-manager
-                (import-tree ./hosts/common)
 
-                (import-tree ./modules/home/common)
+                (import-tree ./hosts/common)
-                (import-tree ./modules/home/nixos)
                 (import-tree ./hosts/nixos/home/users)
               ];
             };

hosts/common/nix.nix

@@ -1,7 +1,5 @@
 { ... }:
 {
-  system.primaryUser = "alistreaza";
-
   nix = {
     settings = {
       experimental-features = "nix-command flakes";

hosts/darwin/home/alistreaza.nix

@@ -11,11 +11,11 @@
     };
 
     # Shell apps
-    user.shell.zsh.enable = true;
+    home.shell.zsh.enable = true;
-    user.shell.git.enable = true;
+    home.shell.git.enable = true;
-    user.shell.neovim.enable = true;
+    home.shell.neovim.enable = true;
-    user.shell.nh.enable = true;
+    home.shell.nh.enable = true;
-    user.shell.devenv.enable = true;
+    home.shell.devenv.enable = true;
 
     # No Home Application Folders
     targets.darwin.linkApps.enable = false;

hosts/darwin/system/os.nix

@@ -1,5 +1,6 @@
 { ... }:
 {
+  system.primaryUser = "alistreaza";
   nixpkgs.hostPlatform = "aarch64-darwin";
 
   # Homebrew apps

hosts/nixos/home/users/alistreaza.nix

@@ -2,8 +2,8 @@
 {
   home-manager.users.alistreaza = {
     imports = [
-      (import-tree ../../../modules/home/common)
+      (import-tree ../../../../modules/home/common)
-      (import-tree ../../../modules/home/nixos)
+      (import-tree ../../../../modules/home/nixos)
       (import-tree ../partials)
     ];
 
@@ -13,27 +13,28 @@
     };
 
     # Shell apps
-    user.shell.zsh.enable = true;
+    home.shell.zsh.enable = true;
-    user.shell.git.enable = true;
+    home.shell.git.enable = true;
-    user.shell.neovim.enable = true;
+    home.shell.neovim.enable = true;
-    user.shell.nh.enable = true;
+    home.shell.nh.enable = true;
-    user.shell.devenv.enable = true;
+    home.shell.devenv.enable = true;
 
     # Code editor
-    user.ide.zed.enable = true;
+    home.ide.zed.enable = true;
 
     # IDE Jetbrains
-    user.ide.jetbrains.idea.enable = false;
+    home.ide.jetbrains.idea.enable = true;
-    user.ide.jetbrains.pycharm.enable = false;
+    home.ide.jetbrains.pycharm.enable = true;
-    user.ide.jetbrains.phpstorm.enable = false;
+    home.ide.jetbrains.phpstorm.enable = true;
-    user.ide.jetbrains.rustrover.enable = false;
+    home.ide.jetbrains.rustrover.enable = true;
+    home.ide.jetbrains.goland.enable = true;
 
     # IDE Data Jetbrains
-    user.ide.jetbrains.datagrip.enable = false;
+    home.ide.jetbrains.datagrip.enable = true;
-    user.ide.jetbrains.dataspell.enable = false;
+    home.ide.jetbrains.dataspell.enable = true;
 
     # Markdown Editor
-    user.editor.obsidian.enable = false;
+    home.md.obsidian.enable = true;
 
     # The state version is required and should stay at the version you
     # originally installed.

hosts/nixos/system/partials/zsh.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  programs.zsh = {
+    enable = true;
+  };
+}

modules/home/common/env.nix

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

modules/home/common/git.nix

@@ -5,10 +5,10 @@
 }:
 with lib;
 let
-  cfg = config.user.shell.git;
+  cfg = config.home.shell.git;
 in
 {
-  options.user.shell.git = {
+  options.home.shell.git = {
     enable = mkEnableOption "Zen Editor options";
   };
   config = mkIf cfg.enable {

modules/home/common/neovim.nix

@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.user.shell.neovim;
+  cfg = config.home.shell.neovim;
 in
 {
-  options.user.shell.neovim = {
+  options.home.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.user.shell.nh;
+  cfg = config.home.shell.nh;
 in
 {
-  options.user.shell.nh = {
+  options.home.shell.nh = {
     enable = mkEnableOption "System nh service";
   };
   config = mkIf cfg.enable {

modules/home/common/zsh.nix

@@ -1,16 +1,15 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.user.shell.zsh;
+  cfg = config.home.shell.zsh;
 in
 {
-  options.user.shell.zsh = {
+  options.home.shell.zsh = {
     enable = mkEnableOption "System zsh service";
   };
   config = mkIf cfg.enable {
 
     programs.zsh = {
-      enable = true;
       enableCompletion = true;
       autosuggestion.enable = true;
       syntaxHighlighting.enable = true;

modules/home/nixos/jetbrains/clion.nix

@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.clion;
+  cfg = config.home.ide.jetbrains.clion;
 in
 {
-  options.user.ide.jetbrains.clion = {
+  options.home.ide.jetbrains.clion = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {

modules/home/nixos/jetbrains/datagrip.nix

@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.datagrip;
+  cfg = config.home.ide.jetbrains.datagrip;
 in
 {
-  options.user.ide.jetbrains.datagrip = {
+  options.home.ide.jetbrains.datagrip = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {

modules/home/nixos/jetbrains/dataspell.nix

@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.dataspell;
+  cfg = config.home.ide.jetbrains.dataspell;
 in
 {
-  options.user.ide.jetbrains.dataspell = {
+  options.home.ide.jetbrains.dataspell = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {

modules/home/nixos/jetbrains/goland.nix

@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.goland;
+  cfg = config.home.ide.jetbrains.goland;
 in
 {
-  options.user.ide.jetbrains.goland = {
+  options.home.ide.jetbrains.goland = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {

modules/home/nixos/jetbrains/idea.nix

@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.idea;
+  cfg = config.home.ide.jetbrains.idea;
 in
 {
-  options.user.ide.jetbrains.idea = {
+  options.home.ide.jetbrains.idea = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {

modules/home/nixos/jetbrains/phpstorm.nix

@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.phpstorm;
+  cfg = config.home.ide.jetbrains.phpstorm;
 in
 {
-  options.user.ide.jetbrains.phpstorm = {
+  options.home.ide.jetbrains.phpstorm = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {

modules/home/nixos/jetbrains/pycharm.nix

@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.pycharm;
+  cfg = config.home.ide.jetbrains.pycharm;
 in
 {
-  options.user.ide.jetbrains.pycharm = {
+  options.home.ide.jetbrains.pycharm = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {

modules/home/nixos/jetbrains/rider.nix

@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.rider;
+  cfg = config.home.ide.jetbrains.rider;
 in
 {
-  options.user.ide.jetbrains.rider = {
+  options.home.ide.jetbrains.rider = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {

modules/home/nixos/jetbrains/rubymine.nix

@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.rubymine;
+  cfg = config.home.ide.jetbrains.rubymine;
 in
 {
-  options.user.ide.jetbrains.rubymine = {
+  options.home.ide.jetbrains.rubymine = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {

modules/home/nixos/jetbrains/rustrover.nix

@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.rustrover;
+  cfg = config.home.ide.jetbrains.rustrover;
 in
 {
-  options.user.ide.jetbrains.rustrover = {
+  options.home.ide.jetbrains.rustrover = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {

modules/home/nixos/jetbrains/webstorm.nix

@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.webstorm;
+  cfg = config.home.ide.jetbrains.webstorm;
 in
 {
-  options.user.ide.jetbrains.webstorm = {
+  options.home.ide.jetbrains.webstorm = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {

modules/home/nixos/obsidian.nix

@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.editor.obsidian;
+  cfg = config.home.md.obsidian;
 in
 {
-  options.user.editor.obsidian = {
+  options.home.md.obsidian = {
     enable = mkEnableOption "Obsidian options";
   };
   config = mkIf cfg.enable {

modules/home/nixos/zed.nix

@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.zed;
+  cfg = config.home.ide.zed;
 in
 {
-  options.user.ide.zed = {
+  options.home.ide.zed = {
     enable = mkEnableOption "Zen Editor options";
   };
   config = mkIf cfg.enable {