diff --git a/configuration.nix b/configuration.nix
index bad46ad..8beee23 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -9,8 +9,6 @@
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
       ./cron-schedule.nix
-      ./desktop-environment.nix
-      ./terminal-environment.nix
       ./home-manager.nix
     ];
 
diff --git a/cron-schedule.nix b/cron-schedule.nix
index 600420d..8f3ecfa 100644
--- a/cron-schedule.nix
+++ b/cron-schedule.nix
@@ -5,7 +5,6 @@
   services.cron = {
     enable = true;
     systemCronJobs = [
-      "0 0 * * *      root    reboot"
     ];
   };
 
diff --git a/desktop-environment.nix b/desktop-environment/config.nix
similarity index 100%
rename from desktop-environment.nix
rename to desktop-environment/config.nix
diff --git a/home-manager.nix b/home-manager.nix
index 5a43aed..bdf9a4e 100644
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -1,26 +1,12 @@
 { config, pkgs, lib, ... }:
 
 let
-  home-manager = builtins.fetchTarball https://github.com/nix-community/home-manager/archive/release-25.11.tar.gz;
 in
 {
   imports =
     [
-      (import "${home-manager}/nixos")
-      ./home/hypr/hyprland.nix
+      ./desktop-environment/config.nix
+      ./terminal-environment/config.nix
+      ./system-environment/config.nix
     ];
-
-  users.users.nichkara.isNormalUser = true;
-  home-manager.users.nichkara = { pkgs, ... }: {
-    home.packages = [ pkgs.atool pkgs.httpie ];
-    home.username = "nichkara";
-    home.homeDirectory = "/home/nichkara";
-    programs.zsh.enable = true;
-    programs.home-manager.enable = true;
-
-    # The state version is required and should stay at the version you
-    # originally installed.
-    home.stateVersion = "25.11";
-  };
-  home-manager.backupFileExtension = "backup";
 }
diff --git a/system-environment/config.nix b/system-environment/config.nix
new file mode 100644
index 0000000..d9a8a3e
--- /dev/null
+++ b/system-environment/config.nix
@@ -0,0 +1,27 @@
+{ pkgs, ... }:
+{
+    environment.systemPackages = with pkgs; [
+        # Make systems
+        gnumake
+        cmake
+        cmakeCurses
+
+        # C/C++/Fortran tools
+        gcc
+        clang
+
+        # Common C based dependencies
+        eigen
+
+        # Ada/+Spark & Rust tools
+        alire
+        gnat
+        rustc
+        cargo
+    ];
+
+    environment.variables = {
+    };
+
+
+}
diff --git a/terminal-environment.nix b/terminal-environment/config.nix
similarity index 100%
rename from terminal-environment.nix
rename to terminal-environment/config.nix