Rename folders coherently

home/configuration.nix

@@ -1,7 +1,7 @@
 { inputs, ... }:
 
 {
-  imports = [ ./parts/users.nix ];
+  imports = [ ./users ];
   home-manager.useUserPackages = true;
   home-manager.overwriteBackup = true;
   home-manager.backupFileExtension = "bak";

home/configurations/zed.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-
-    zed-editor
-
-    # Languages servers
-    nil
-    nixd
-
-  ];
-}

home/home.nix

@@ -4,24 +4,19 @@
 }:
 {
   imports = [
+
+    # App configurations
     ./configurations/gnome.nix
     ./configurations/firefox.nix
     ./configurations/ghostty.nix
-    ./configurations/zed.nix
+
+    # Modules
+    inputs.self.home
+
   ];
 
-  nixpkgs = {
-    overlays = [
-      inputs.self.overlays.additions
-      inputs.self.overlays.modifications
-      inputs.self.overlays.unstable-packages
-    ];
-  };
-
-  home = {
-    username = "alistreaza";
-    homeDirectory = "/home/alistreaza";
-  };
+  within.home.zed.enable = true;
+  within.home.jetbrains.enable = true;
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   home.stateVersion = "25.11";

home/parts/users.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  home-manager.users.alistreaza = import ../home.nix;
-}

home/users/alistreaza.nix

@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  imports = [ ../home.nix ];
+  home = {
+    username = "alistreaza";
+    homeDirectory = "/home/alistreaza";
+  };
+}

home/users/default.nix

@@ -0,0 +1,3 @@
+{
+  home-manager.users.alistreaza = import ./alistreaza.nix;
+}