diff --git a/.gitignore b/.gitignore
index af56f61..f32e31a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-.DS_Store
 .idea/
+.DS_Store
diff --git a/flake.lock b/flake.lock
index 63f42a5..df7b62b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1768135262,
+        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -21,6 +39,21 @@
         "type": "github"
       }
     },
+    "import-tree": {
+      "locked": {
+        "lastModified": 1763762820,
+        "narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=",
+        "owner": "vic",
+        "repo": "import-tree",
+        "rev": "3c23749d8013ec6daa1d7255057590e9ca726646",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vic",
+        "repo": "import-tree",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1769089682,
@@ -37,6 +70,21 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1765674936,
+        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1769170682,
@@ -55,7 +103,9 @@
     },
     "root": {
       "inputs": {
+        "flake-parts": "flake-parts",
         "home-manager": "home-manager",
+        "import-tree": "import-tree",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
diff --git a/flake.nix b/flake.nix
index be40dd5..6c6e2b4 100755
--- a/flake.nix
+++ b/flake.nix
@@ -2,6 +2,9 @@
   description = "NixOS files config";
 
   inputs = {
+    import-tree.url = "github:vic/import-tree";
+    flake-parts.url = "github:hercules-ci/flake-parts";
+
     # Nixpkgs
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -12,51 +15,34 @@
   };
 
   outputs =
-    {
+    inputs@{
       nixpkgs,
+      flake-parts,
+      import-tree,
       home-manager,
+      nixpkgs-unstable,
       ...
-    }@inputs:
-    let
-      systems = [ "x86_64-linux" ];
-      forAllSystems = nixpkgs.lib.genAttrs systems;
-    in
-    {
-      packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
-      overlays = import ./overlays { inherit inputs; };
-
-      apps = import ./modules/apps;
-      home = import ./modules/home;
-      nixos = import ./modules/nixos;
-
-      nix.settings.experimental-features = "nix-command flakes";
-
-      nixpkgs = {
-        overlays = [
-          inputs.self.overlays.additions
-          inputs.self.overlays.modifications
-          inputs.self.overlays.unstable-packages
-        ];
-      };
-
-      nixosConfigurations = {
-        nixos = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs; };
-          modules = [
-            (
-              { ... }:
-              {
-                nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (nixpkgs.lib.getName pkg) [ "nvidia-x11" ];
-              }
-            )
-            ./nixos/configuration.nix
-          ]
-          ++ [
-            {}
-            home-manager.nixosModules.home-manager
-            ./home/configuration.nix
-          ];
+    }:
+    flake-parts.lib.mkFlake { inherit inputs; } (
+      { ... }:
+      {
+        systems = [ "x86_64-linux" ];
+        flake = {
+          nixosConfigurations = {
+            nixos = nixpkgs.lib.nixosSystem {
+              modules = [
+                (import-tree ./modules/system)
+                ./modules/hardware-configuration.nix
+                (import ./modules/overlays.nix { inherit nixpkgs nixpkgs-unstable; })
+              ]
+              ++ [
+                home-manager.nixosModules.home-manager
+                (import ./modules/overlays.nix { inherit nixpkgs nixpkgs-unstable; })
+                (import ./modules/users/home.nix { inherit import-tree home-manager; })
+              ];
+            };
+          };
         };
-      };
-    };
+      }
+    );
 }
diff --git a/home/configuration.nix b/home/configuration.nix
deleted file mode 100644
index e57f493..0000000
--- a/home/configuration.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ inputs, ... }:
-
-{
-  imports = [ ./users ];
-  home-manager.useUserPackages = true;
-  home-manager.overwriteBackup = true;
-  home-manager.backupFileExtension = "bak";
-  home-manager.extraSpecialArgs = { inherit inputs; };
-}
diff --git a/home/home.nix b/home/home.nix
deleted file mode 100755
index 71016e2..0000000
--- a/home/home.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  inputs,
-  ...
-}:
-{
-  imports = [
-
-    # App configurations
-    ./configurations/gnome.nix
-    ./configurations/firefox.nix
-    ./configurations/ghostty.nix
-
-    # Modules
-    inputs.self.home
-
-  ];
-
-  within.home.zed.enable = true;
-  within.home.jetbrains.enable = true;
-
-  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  home.stateVersion = "25.11";
-}
diff --git a/home/users/alistreaza.nix b/home/users/alistreaza.nix
deleted file mode 100644
index c62a364..0000000
--- a/home/users/alistreaza.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-
-{
-  imports = [ ../home.nix ];
-  home = {
-    username = "alistreaza";
-    homeDirectory = "/home/alistreaza";
-  };
-}
diff --git a/home/users/default.nix b/home/users/default.nix
deleted file mode 100644
index defa159..0000000
--- a/home/users/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  home-manager.users.alistreaza = import ./alistreaza.nix;
-}
diff --git a/modules/apps/default.nix b/modules/apps/default.nix
deleted file mode 100755
index af5ac6c..0000000
--- a/modules/apps/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./subgroups/shell.nix
-    ./subgroups/gnome.nix
-  ];
-}
diff --git a/modules/apps/subgroups/gnome.nix b/modules/apps/subgroups/gnome.nix
deleted file mode 100644
index d0670f6..0000000
--- a/modules/apps/subgroups/gnome.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ../submodules/gnome-shell.nix
-    ../submodules/gnome-apps.nix
-  ];
-}
diff --git a/modules/apps/subgroups/shell.nix b/modules/apps/subgroups/shell.nix
deleted file mode 100644
index f2ff46e..0000000
--- a/modules/apps/subgroups/shell.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  imports = [
-    ../submodules/zsh.nix
-    ../submodules/nh.nix
-    ../submodules/git.nix
-    ../submodules/docker.nix
-  ];
-}
diff --git a/modules/hardware-configuration.nix b/modules/hardware-configuration.nix
new file mode 100644
index 0000000..9f3de55
--- /dev/null
+++ b/modules/hardware-configuration.nix
@@ -0,0 +1,48 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usbhid"
+    "uas"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/6c7250d7-8a40-4b12-94de-276c4b325473";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/2620-29F6";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/7c10a8e6-c396-457e-a66f-577bd217b2e3"; }
+  ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/modules/home/default.nix b/modules/home/default.nix
deleted file mode 100755
index eefa0f8..0000000
--- a/modules/home/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./submodules/zed.nix
-    ./submodules/jetbrains.nix
-  ];
-}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
deleted file mode 100644
index 5545637..0000000
--- a/modules/nixos/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  imports = [
-    ./subgroups/boot.nix
-    ./subgroups/graphics.nix
-    ./subgroups/networks.nix
-    ./subgroups/audio.nix
-    ./subgroups/keyboard.nix
-  ];
-}
diff --git a/modules/nixos/subgroups/audio.nix b/modules/nixos/subgroups/audio.nix
deleted file mode 100644
index ae1dbf0..0000000
--- a/modules/nixos/subgroups/audio.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  imports = [ ../submodules/pipewire.nix ];
-}
diff --git a/modules/nixos/subgroups/boot.nix b/modules/nixos/subgroups/boot.nix
deleted file mode 100644
index 646f588..0000000
--- a/modules/nixos/subgroups/boot.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ../submodules/systemd-boot.nix
-    ../submodules/plymouth.nix
-  ];
-}
diff --git a/modules/nixos/subgroups/graphics.nix b/modules/nixos/subgroups/graphics.nix
deleted file mode 100644
index 55ab307..0000000
--- a/modules/nixos/subgroups/graphics.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ../submodules/nvidia.nix
-    ../submodules/nvidia-prime.nix
-  ];
-}
diff --git a/modules/nixos/subgroups/keyboard.nix b/modules/nixos/subgroups/keyboard.nix
deleted file mode 100644
index 94f316c..0000000
--- a/modules/nixos/subgroups/keyboard.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  imports = [ ../submodules/keyboard-apple.nix ];
-}
diff --git a/modules/nixos/subgroups/networks.nix b/modules/nixos/subgroups/networks.nix
deleted file mode 100755
index 5a2cb43..0000000
--- a/modules/nixos/subgroups/networks.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ../submodules/dns.nix
-    ../submodules/manager.nix
-  ];
-}
diff --git a/modules/overlays.nix b/modules/overlays.nix
new file mode 100644
index 0000000..16c2546
--- /dev/null
+++ b/modules/overlays.nix
@@ -0,0 +1,27 @@
+{
+  nixpkgs,
+  nixpkgs-unstable,
+  ...
+}:
+{
+
+  nixpkgs.config.allowUnfreePredicate =
+    pkg:
+    builtins.elem (nixpkgs.lib.getName pkg) [
+      "nvidia-x11"
+    ];
+
+  nixpkgs.overlays = [
+    (final: prev: {
+      unstable = import nixpkgs-unstable {
+        system = prev.system;
+        config.allowUnfreePredicate =
+          pkg:
+          builtins.elem (nixpkgs-unstable.lib.getName pkg) [
+            "pycharm"
+          ];
+      };
+    })
+  ];
+
+}
diff --git a/modules/apps/submodules/docker.nix b/modules/system/options/apps/docker.nix
similarity index 73%
rename from modules/apps/submodules/docker.nix
rename to modules/system/options/apps/docker.nix
index 793a4ce..d6f79fc 100644
--- a/modules/apps/submodules/docker.nix
+++ b/modules/system/options/apps/docker.nix
@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.within.shell.docker;
+  cfg = config.os.shell.docker;
 in
 {
-  options.within.shell.docker = {
+  options.os.shell.docker = {
     enable = mkEnableOption "System docker service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/apps/submodules/git.nix b/modules/system/options/apps/git.nix
similarity index 86%
rename from modules/apps/submodules/git.nix
rename to modules/system/options/apps/git.nix
index 91239c6..7e7b0ac 100644
--- a/modules/apps/submodules/git.nix
+++ b/modules/system/options/apps/git.nix
@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.within.shell.git;
+  cfg = config.os.shell.git;
 in
 {
-  options.within.shell.git = {
+  options.os.shell.git = {
     enable = mkEnableOption "System git service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/apps/submodules/gnome-apps.nix b/modules/system/options/apps/gnome-apps.nix
similarity index 87%
rename from modules/apps/submodules/gnome-apps.nix
rename to modules/system/options/apps/gnome-apps.nix
index 3b989ce..da64b03 100644
--- a/modules/apps/submodules/gnome-apps.nix
+++ b/modules/system/options/apps/gnome-apps.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.within.gnome.apps;
+  cfg = config.os.gnome.apps;
 in
 {
-  options.within.gnome.apps = {
+  options.os.gnome.apps = {
     enable = mkEnableOption "System gnome apps service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/apps/submodules/gnome-shell.nix b/modules/system/options/apps/gnome-shell.nix
similarity index 92%
rename from modules/apps/submodules/gnome-shell.nix
rename to modules/system/options/apps/gnome-shell.nix
index c099648..0f6a5c2 100644
--- a/modules/apps/submodules/gnome-shell.nix
+++ b/modules/system/options/apps/gnome-shell.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.within.gnome.shell;
+  cfg = config.os.gnome.shell;
 in
 {
-  options.within.gnome.shell = {
+  options.os.gnome.shell = {
     enable = mkEnableOption "System gnome shell service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/apps/submodules/nh.nix b/modules/system/options/apps/nh.nix
similarity index 80%
rename from modules/apps/submodules/nh.nix
rename to modules/system/options/apps/nh.nix
index 4afc2b4..d0c0883 100644
--- a/modules/apps/submodules/nh.nix
+++ b/modules/system/options/apps/nh.nix
@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.within.shell.nh;
+  cfg = config.os.shell.nh;
 in
 {
-  options.within.shell.nh = {
+  options.os.shell.nh = {
     enable = mkEnableOption "System nh service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/apps/submodules/zsh.nix b/modules/system/options/apps/zsh.nix
similarity index 85%
rename from modules/apps/submodules/zsh.nix
rename to modules/system/options/apps/zsh.nix
index e3a4ccb..25081ab 100644
--- a/modules/apps/submodules/zsh.nix
+++ b/modules/system/options/apps/zsh.nix
@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.within.shell.zsh;
+  cfg = config.os.shell.zsh;
 in
 {
-  options.within.shell.zsh = {
+  options.os.shell.zsh = {
     enable = mkEnableOption "System zsh service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/nixos/submodules/dns.nix b/modules/system/options/nixos/dns.nix
similarity index 77%
rename from modules/nixos/submodules/dns.nix
rename to modules/system/options/nixos/dns.nix
index 1a16a22..9cc6d2b 100644
--- a/modules/nixos/submodules/dns.nix
+++ b/modules/system/options/nixos/dns.nix
@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.within.networks.dns;
+  cfg = config.os.networks.dns;
 in
 {
-  options.within.networks.dns = {
+  options.os.networks.dns = {
     enable = mkEnableOption "System dns service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/nixos/submodules/keyboard-apple.nix b/modules/system/options/nixos/keyboard-apple.nix
similarity index 84%
rename from modules/nixos/submodules/keyboard-apple.nix
rename to modules/system/options/nixos/keyboard-apple.nix
index 1fd7906..8f14921 100644
--- a/modules/nixos/submodules/keyboard-apple.nix
+++ b/modules/system/options/nixos/keyboard-apple.nix
@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.within.keyboard.apple;
+  cfg = config.os.keyboard.apple;
 in
 {
-  options.within.keyboard.apple = {
+  options.os.keyboard.apple = {
     enable = mkEnableOption "System apple locales service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/nixos/submodules/manager.nix b/modules/system/options/nixos/manager.nix
similarity index 71%
rename from modules/nixos/submodules/manager.nix
rename to modules/system/options/nixos/manager.nix
index 03f26db..5b80476 100644
--- a/modules/nixos/submodules/manager.nix
+++ b/modules/system/options/nixos/manager.nix
@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.within.networks.manager;
+  cfg = config.os.networks.manager;
 in
 {
-  options.within.networks.manager = {
+  options.os.networks.manager = {
     enable = mkEnableOption "System networks manager service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/nixos/submodules/nvidia.nix b/modules/system/options/nixos/nvidia.nix
similarity index 85%
rename from modules/nixos/submodules/nvidia.nix
rename to modules/system/options/nixos/nvidia.nix
index c3bd6c8..42a9a48 100644
--- a/modules/nixos/submodules/nvidia.nix
+++ b/modules/system/options/nixos/nvidia.nix
@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.within.graphics.nvidia;
+  cfg = config.os.graphics.nvidia;
 in
 {
-  options.within.graphics.nvidia = {
+  options.os.graphics.nvidia = {
     enable = mkEnableOption "System nvidia service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/nixos/submodules/pipewire.nix b/modules/system/options/nixos/pipewire.nix
similarity index 82%
rename from modules/nixos/submodules/pipewire.nix
rename to modules/system/options/nixos/pipewire.nix
index 0cd2d5c..c8813b7 100644
--- a/modules/nixos/submodules/pipewire.nix
+++ b/modules/system/options/nixos/pipewire.nix
@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.within.audio.pipewire;
+  cfg = config.os.audio.pipewire;
 in
 {
-  options.within.audio.pipewire = {
+  options.os.audio.pipewire = {
     enable = mkEnableOption "System pipewire service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/nixos/submodules/plymouth.nix b/modules/system/options/nixos/plymouth.nix
similarity index 81%
rename from modules/nixos/submodules/plymouth.nix
rename to modules/system/options/nixos/plymouth.nix
index 9c68ac3..44668b0 100644
--- a/modules/nixos/submodules/plymouth.nix
+++ b/modules/system/options/nixos/plymouth.nix
@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.within.boot.plymouth;
+  cfg = config.os.boot.plymouth;
 in
 {
-  options.within.boot.plymouth = {
+  options.os.boot.plymouth = {
     enable = mkEnableOption "Boot plymouth service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/nixos/submodules/systemd-boot.nix b/modules/system/options/nixos/systemd-boot.nix
similarity index 79%
rename from modules/nixos/submodules/systemd-boot.nix
rename to modules/system/options/nixos/systemd-boot.nix
index 9891082..706bfcd 100644
--- a/modules/nixos/submodules/systemd-boot.nix
+++ b/modules/system/options/nixos/systemd-boot.nix
@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.within.boot.systemd;
+  cfg = config.os.boot.systemd;
 in
 {
-  options.within.boot.systemd = {
+  options.os.boot.systemd = {
     enable = mkEnableOption "Boot systemd service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/system/os.nix b/modules/system/os.nix
new file mode 100755
index 0000000..18d417e
--- /dev/null
+++ b/modules/system/os.nix
@@ -0,0 +1,31 @@
+{ ... }:
+
+{
+  nix.settings.experimental-features = "nix-command flakes";
+
+  # System services
+  os.boot.systemd.enable = true;
+  os.boot.plymouth.enable = true;
+  os.graphics.nvidia.enable = true;
+  os.audio.pipewire.enable = true;
+  os.networks.dns.enable = true;
+  os.networks.manager.enable = true;
+
+  # System configurations
+  os.keyboard.apple.enable = true;
+
+  # Shell configurations
+  os.shell.zsh.enable = true;
+  os.shell.git.enable = true;
+  os.shell.nh.enable = true;
+
+  # Gnome configurations
+  os.gnome.shell.enable = true;
+  os.gnome.apps.enable = true;
+
+  # Virtualisation Apps
+  os.shell.docker.enable = true;
+
+  # System version
+  system.stateVersion = "25.11";
+}
diff --git a/nixos/partials/kernel.nix b/modules/system/partials/kernel.nix
similarity index 100%
rename from nixos/partials/kernel.nix
rename to modules/system/partials/kernel.nix
diff --git a/modules/system/partials/networking.nix b/modules/system/partials/networking.nix
new file mode 100644
index 0000000..0abf76d
--- /dev/null
+++ b/modules/system/partials/networking.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  networking.hostName = "nixos";
+  networking.firewall.enable = true;
+
+  time.timeZone = "Europe/Brussels";
+}
diff --git a/nixos/partials/users.nix b/modules/system/partials/users.nix
similarity index 100%
rename from nixos/partials/users.nix
rename to modules/system/partials/users.nix
diff --git a/modules/users/home.nix b/modules/users/home.nix
new file mode 100644
index 0000000..1a2e4c0
--- /dev/null
+++ b/modules/users/home.nix
@@ -0,0 +1,27 @@
+{ import-tree, ... }:
+{
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+  home-manager.overwriteBackup = true;
+  home-manager.backupFileExtension = "bak";
+
+  home-manager.users = {
+    alistreaza = {
+
+      imports = [
+        (import-tree ./options)
+        (import-tree ./partials)
+      ];
+
+      home = {
+        username = "alistreaza";
+        homeDirectory = "/home/alistreaza";
+      };
+
+      os.ide.zed.enable = true;
+      os.ide.jetbrains.enable = true;
+
+      home.stateVersion = "25.11";
+    };
+  };
+}
diff --git a/modules/home/submodules/jetbrains.nix b/modules/users/options/jetbrains.nix
similarity index 57%
rename from modules/home/submodules/jetbrains.nix
rename to modules/users/options/jetbrains.nix
index b2cda93..6a63dd1 100644
--- a/modules/home/submodules/jetbrains.nix
+++ b/modules/users/options/jetbrains.nix
@@ -6,11 +6,11 @@
 }:
 with lib;
 let
-  cfg = config.within.home.jetbrains;
+  cfg = config.os.ide.jetbrains;
 in
 {
-  options.within.home.jetbrains = {
-    enable = mkEnableOption "System dns service";
+  options.os.ide.jetbrains = {
+    enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {
 
diff --git a/modules/home/submodules/zed.nix b/modules/users/options/zed.nix
similarity index 61%
rename from modules/home/submodules/zed.nix
rename to modules/users/options/zed.nix
index c73c347..81b6f9c 100644
--- a/modules/home/submodules/zed.nix
+++ b/modules/users/options/zed.nix
@@ -6,11 +6,11 @@
 }:
 with lib;
 let
-  cfg = config.within.home.zed;
+  cfg = config.os.ide.zed;
 in
 {
-  options.within.home.zed = {
-    enable = mkEnableOption "System dns service";
+  options.os.ide.zed = {
+    enable = mkEnableOption "Zen Editor options";
   };
   config = mkIf cfg.enable {
 
diff --git a/home/configurations/firefox.nix b/modules/users/partials/firefox.nix
similarity index 100%
rename from home/configurations/firefox.nix
rename to modules/users/partials/firefox.nix
diff --git a/home/configurations/ghostty.nix b/modules/users/partials/ghostty.nix
similarity index 100%
rename from home/configurations/ghostty.nix
rename to modules/users/partials/ghostty.nix
diff --git a/home/configurations/gnome.nix b/modules/users/partials/gnome.nix
similarity index 100%
rename from home/configurations/gnome.nix
rename to modules/users/partials/gnome.nix
diff --git a/home/configurations/wallpapers/dark-gray.svg b/modules/users/partials/wallpapers/dark-gray.svg
similarity index 100%
rename from home/configurations/wallpapers/dark-gray.svg
rename to modules/users/partials/wallpapers/dark-gray.svg
diff --git a/home/configurations/wallpapers/frappe.svg b/modules/users/partials/wallpapers/frappe.svg
similarity index 100%
rename from home/configurations/wallpapers/frappe.svg
rename to modules/users/partials/wallpapers/frappe.svg
diff --git a/home/configurations/wallpapers/latte.svg b/modules/users/partials/wallpapers/latte.svg
similarity index 100%
rename from home/configurations/wallpapers/latte.svg
rename to modules/users/partials/wallpapers/latte.svg
diff --git a/home/configurations/wallpapers/macchiato.svg b/modules/users/partials/wallpapers/macchiato.svg
similarity index 100%
rename from home/configurations/wallpapers/macchiato.svg
rename to modules/users/partials/wallpapers/macchiato.svg
diff --git a/home/configurations/wallpapers/mocha.svg b/modules/users/partials/wallpapers/mocha.svg
similarity index 100%
rename from home/configurations/wallpapers/mocha.svg
rename to modules/users/partials/wallpapers/mocha.svg
diff --git a/home/configurations/wallpapers/solarized-light.svg b/modules/users/partials/wallpapers/solarized-light.svg
similarity index 100%
rename from home/configurations/wallpapers/solarized-light.svg
rename to modules/users/partials/wallpapers/solarized-light.svg
diff --git a/home/configurations/wallpapers/solarized.svg b/modules/users/partials/wallpapers/solarized.svg
similarity index 100%
rename from home/configurations/wallpapers/solarized.svg
rename to modules/users/partials/wallpapers/solarized.svg
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
deleted file mode 100755
index 9095513..0000000
--- a/nixos/configuration.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  inputs,
-  ...
-}:
-{
-  imports = [
-
-    # Hardware
-    ./hardware-configuration.nix
-    ./partials/kernel.nix
-
-    # Configurations
-    ./partials/users.nix
-
-    # Modules
-    inputs.self.nixos
-    inputs.self.apps
-
-  ];
-
-  networking.hostName = "nixos";
-  networking.firewall.enable = true;
-
-  time.timeZone = "Europe/Brussels";
-
-  # System services
-  within.boot.systemd.enable = true;
-  within.boot.plymouth.enable = true;
-  within.graphics.nvidia.enable = true;
-  within.audio.pipewire.enable = true;
-  within.networks.dns.enable = true;
-  within.networks.manager.enable = true;
-
-  # System configurations
-  within.keyboard.apple.enable = true;
-
-  # Shell configurations
-  within.shell.zsh.enable = true;
-  within.shell.git.enable = true;
-  within.shell.nh.enable = true;
-
-  # Gnome configurations
-  within.gnome.shell.enable = true;
-  within.gnome.apps.enable = true;
-
-  # Virtualisation Apps
-  within.shell.docker.enable = true;
-
-  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = "25.11";
-}
diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix
deleted file mode 100644
index 5cdb140..0000000
--- a/nixos/hardware-configuration.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "uas" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/6c7250d7-8a40-4b12-94de-276c4b325473";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/2620-29F6";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/7c10a8e6-c396-457e-a66f-577bd217b2e3"; }
-    ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/overlays/default.nix b/overlays/default.nix
deleted file mode 100755
index cca0799..0000000
--- a/overlays/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ inputs, ... }:
-{
-  additions = final: _prev: import ../pkgs final;
-  modifications = final: prev: { };
-
-  unstable-packages = final: _prev: {
-    unstable = import inputs.nixpkgs-unstable { system = final.system; };
-  };
-
-}
diff --git a/pkgs/default.nix b/pkgs/default.nix
deleted file mode 100755
index 3d9e23c..0000000
--- a/pkgs/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-# Custom packages, that can be defined similarly to ones from nixpkgs
-# You can build them using 'nix build .#example'
-pkgs: {
-  # example = pkgs.callPackage ./example { };
-}