diff --git a/configuration.nix b/configuration.nix
index c7f1c2a..9c93b84 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -3,7 +3,9 @@
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
 { config, pkgs, ... }:
-
+let
+    profile = import ./profile.nix;
+in
 {
   imports =
     [ # Include the results of the hardware scan.
@@ -16,7 +18,7 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  networking.hostName = "amelia"; # Define your hostname.
+  networking.hostName = profile.hostname; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # Enable networking
diff --git a/desktop-environment/config.nix b/desktop-environment/config.nix
index a14f87a..4ab4993 100644
--- a/desktop-environment/config.nix
+++ b/desktop-environment/config.nix
@@ -1,4 +1,7 @@
 { pkgs, ... }:
+let
+    profile = import ../profile.nix;
+in
 {
 
     imports  = [
@@ -24,7 +27,7 @@
       settings = {
         default_session = {
           command = "Hyprland";
-          user = "nichkara";
+          user = profile.username;
         };
       };
     };
diff --git a/desktop-environment/window-manager.nix b/desktop-environment/window-manager.nix
index a5e9383..fbbcbf3 100644
--- a/desktop-environment/window-manager.nix
+++ b/desktop-environment/window-manager.nix
@@ -5,6 +5,8 @@ let
         rev = "96f9ca03450049baffbc8a2b71c3a40367edd2a5";
         sha256 = "sha256-dHxf2UNEDC/KyDgjMMQ988hyGM2gasYNbNtLTityhDY=";
     };
+
+    profile = import ../profile.nix;
 in
 {
     environment.systemPackages = with pkgs; [
@@ -25,7 +27,7 @@ in
         xwayland.enable = true;
     };
 
-    home-manager.users.nichkara = { ... }: {
+    home-manager.users.${profile.username} = { ... }: {
         home.file.".config/hypr" = {
         source = dotfiles_hypr;
         recursive = true;
diff --git a/home-manager.nix b/home-manager.nix
index bebfe97..f96b404 100644
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
-
 let
+    profile = import ./profile.nix;
 in
 {
 
@@ -11,7 +11,7 @@ in
         ./system-environment/config.nix
     ];
 
-    users.users.nichkara = {
+    users.users.${profile.username} = {
         isNormalUser = true;
         description = "Nina Chloé Kassandra";
         extraGroups = [ "networkmanager" "wheel" "docker" "scanner" "lp"];
@@ -21,7 +21,7 @@ in
 
     home-manager.backupFileExtension = "bck.lck";
 
-    home-manager.users.nichkara = { pkgs, ... }: {
+    home-manager.users.${profile.username} = { pkgs, ... }: {
         home.stateVersion = "25.11";
         programs.git = {
             enable = true;
diff --git a/profile.nix.template b/profile.nix.template
index b0bb952..8fd7646 100644
--- a/profile.nix.template
+++ b/profile.nix.template
@@ -1,7 +1,7 @@
 {
     username = "nichkara";
     hostname = "amelia";
-    hashedPassword = "$y$j9T$W72kGNL9hSTiN7CjnUpqH1$uyE1OzYN4kvbhhylX7pwRmLYYYmouRPVGIDZKwx8YW8";
+    hashed-password = "$y$j9T$W72kGNL9hSTiN7CjnUpqH1$uyE1OzYN4kvbhhylX7pwRmLYYYmouRPVGIDZKwx8YW8";
     interface = "hyprland";
     modules = {
         base = true;
diff --git a/system-environment/config.nix b/system-environment/config.nix
index fdb3ee9..394c2a3 100644
--- a/system-environment/config.nix
+++ b/system-environment/config.nix
@@ -1,4 +1,7 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
+let
+    profile = import ../profile.nix;
+in
 {
 
     imports = [
@@ -8,6 +11,9 @@
     environment.systemPackages = with pkgs; [
         # Make systems
         gnumake
+        pathon3
+        ]
+        ++ lib.optionals profile.modules.development [
         cmake
         cmakeCurses
 
diff --git a/terminal-environment/config.nix b/terminal-environment/config.nix
index 880a8d2..b16a2be 100644
--- a/terminal-environment/config.nix
+++ b/terminal-environment/config.nix
@@ -1,4 +1,7 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
+let
+    profile = import ../profile.nix;
+in
 {
 
     environment.systemPackages = with pkgs; [
@@ -64,7 +67,7 @@
         };
     };
 
-    home-manager.users.nichkara = { ... }: {
+    home-manager.users.${profile.username} = { ... }: {
         programs.zsh = {
             enable = true;
             enableCompletion = true;
@@ -84,7 +87,25 @@
                 ignorePatterns = [  ];
                 saveNoDups = true;
                 ignoreAllDups = true;
-                };
+            };
+
+            oh-my-zsh = {
+                enable = true;
+                theme = "sonicradish";
+                plugins = [
+                    "git"
+                    "z"
+                    "dotenv"
+                    "battery"
+                    "emoji"
+                    "emoji-clock"
+                    "fzf"
+                    "kitty"
+                    "themes"
+                    "tmux"
+                    "vi-mode"
+                ];
+            };
 
             setOptions = [
                 "HIST_IGNORE_ALL_DUPS"