Change of named folders and fix configurations

flake.nix

@@ -14,6 +14,7 @@
   outputs =
     {
       nixpkgs,
+      home-manager,
       ...
     }@inputs:
     let
@@ -25,13 +26,19 @@
       overlays = import ./overlays { inherit inputs; };
 
       apps = import ./modules/apps;
+      home = import ./modules/home;
       nixos = import ./modules/nixos;
-      home-manager = import ./modules/home;
 
       nixosConfigurations = {
         nixos = nixpkgs.lib.nixosSystem {
           specialArgs = { inherit inputs; };
-          modules = [ ./nixos/configuration.nix ];
+          modules = [
+            ./nixos/configuration.nix
+          ]
+          ++ [
+            home-manager.nixosModules.home-manager
+            ./home/configuration.nix
+          ];
         };
       };
 

home-manager/configurations/zed.nix

@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-with lib;
-let
-  cfg = config.within.zed;
-in
-{
-  options.within.zed = {
-    enable = mkEnableOption "System zed service";
-  };
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-
-      # Nix languages parser
-      nil
-      nixd
-
-      # Zed Editor
-      zed-editor
-
-    ];
-  };
-}

home/configuration.nix

@@ -0,0 +1,11 @@
+{ inputs, ... }:
+
+{
+  home-manager.useUserPackages = true;
+  home-manager.overwriteBackup = true;
+  home-manager.backupFileExtension = "bak";
+  home-manager.extraSpecialArgs = { inherit inputs; };
+  home-manager.sharedModules = [
+    ./home.nix
+  ];
+}

home/home.nix

@@ -7,7 +7,6 @@
     ./configurations/gnome.nix
     ./configurations/firefox.nix
     ./configurations/ghostty.nix
-    ./configurations/zed.nix
   ];
 
   nixpkgs = {

nixos/configuration.nix

@@ -10,11 +10,10 @@
 
     # Hardware
     ./hardware-configuration.nix
-    ./configurations/kernel.nix
+    ./parts/kernel.nix
 
     # Configurations
-    ./configurations/users.nix
-    ./configurations/home-manager.nix
+    ./parts/users.nix
 
     # Modules
     inputs.self.nixos

nixos/configurations/home-manager.nix

@@ -1,12 +0,0 @@
-{ inputs, ... }:
-
-{
-  imports = [ inputs.home-manager.nixosModules.home-manager ];
-
-  home-manager = {
-    extraSpecialArgs = { inherit inputs; };
-    users = {
-      alistreaza = import ../../home-manager/home.nix;
-    };
-  };
-}