diff --git a/configuration.nix b/configuration.nix
index e2997cd..658368d 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -2,13 +2,17 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ inputs, config, pkgs, ... }:
+{
+  inputs,
+  config,
+  pkgs,
+  ...
+}:
 
 {
-  imports =
-    [
-      inputs.home-manager.nixosModules.home-manager
-    ];
+  imports = [
+    inputs.home-manager.nixosModules.home-manager
+  ];
 
   home-manager = {
     extraSpecialArgs = { inherit inputs; };
@@ -21,7 +25,7 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  networking.hostName = "nixos"; # Define your hostname.
+  networking.hostName = "tohka"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # Configure network proxy if necessary
@@ -184,7 +188,7 @@
       ## Uncomment if you want to use the libraries provided by default in the steam distribution
       ## but this is quite far from being exhaustive
       ## https://github.com/NixOS/nixpkgs/issues/354513
-      (pkgs.runCommand "steamrun-lib" {} "mkdir $out; ln -s ${pkgs.steam-run.fhsenv}/usr/lib64 $out/lib")
+      (pkgs.runCommand "steamrun-lib" { } "mkdir $out; ln -s ${pkgs.steam-run.fhsenv}/usr/lib64 $out/lib")
     ];
   };
 
@@ -215,4 +219,4 @@
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "24.11"; # Did you read the comment?
 
-}
\ No newline at end of file
+}
diff --git a/homemanager/bashrc b/homemanager/bashrc
index b9e9c0f..d5324d9 100644
--- a/homemanager/bashrc
+++ b/homemanager/bashrc
@@ -5,7 +5,12 @@ alias hibernate='systemctl hybrid-sleep'
 alias restart='systemctl reboot'
 alias shutdown='systemctl poweroff'
 rebuild() {
-    sudo nixos-rebuild switch --flake ~/dea-files#"$1"
+    if [ -z "$1" ]
+        then
+            sudo nixos-rebuild switch --flake ~/dea-files#"$(hostname)"
+    else
+        sudo nixos-rebuild switch --flake ~/dea-files#"$1"
+    fi
 }
 # alias rebuild='sudo nixos-rebuild switch --flake ~/dea-files'
 [ -f "/home/dea/.ghcup/env" ] && . "/home/dea/.ghcup/env" # ghcup-env
\ No newline at end of file
diff --git a/hosts/nahemah/configuration.nix b/hosts/nahemah/configuration.nix
new file mode 100644
index 0000000..667cba3
--- /dev/null
+++ b/hosts/nahemah/configuration.nix
@@ -0,0 +1,12 @@
+{
+  pkgs,
+  ...
+}:
+
+{
+  networking.hostName = "nahemah";
+
+  environment.systemPackages = with pkgs; [
+
+  ];
+}
diff --git a/hosts/sandalphon/configuration.nix b/hosts/sandalphon/configuration.nix
new file mode 100644
index 0000000..884d68d
--- /dev/null
+++ b/hosts/sandalphon/configuration.nix
@@ -0,0 +1,12 @@
+{
+  pkgs,
+  ...
+}:
+
+{
+  networking.hostName = "sandalphon";
+
+  environment.systemPackages = with pkgs; [
+
+  ];
+}