diff --git a/configuration.nix b/common.nix
similarity index 87%
rename from configuration.nix
rename to common.nix
index f1176c9..feaf63f 100644
--- a/configuration.nix
+++ b/common.nix
@@ -49,20 +49,20 @@
 	boot.kernelPackages = pkgs.linuxPackages_latest;
 
 # Networking settings
-	networking.hostName = "mobile02"; # Define your hostname.
-		networking.networkmanager.enable = true;
+	# networking.hostName = "mobile02"; # Define your hostname.
+	networking.networkmanager.enable = true;
 
 # Enable bluetooth
 	hardware.bluetooth.enable = true;
 
-# Opengl and vulkan
-	hardware.graphics = {
-		enable = true;
-		extraPackages = with pkgs; [
-			intel-vaapi-driver
-				libva-vdpau-driver
-		];
-	};
+# # Opengl and vulkan
+# 	hardware.graphics = {
+# 		enable = true;
+# 		extraPackages = with pkgs; [
+# 			intel-vaapi-driver
+# 				libva-vdpau-driver
+# 		];
+# 	};
 
 # Set your time zone.
 	time.timeZone = "Europe/London";
@@ -84,11 +84,11 @@
 # Windowing Systems
 	services.xserver.enable = true;
 
-	services.displayManager.sddm = {
-		enable = true;
-		theme = "catppuccin-mocha-mauve";
-		package = pkgs.kdePackages.sddm;
-	};
+# 	services.displayManager.sddm = {
+# 		enable = true;
+# 		theme = "catppuccin-mocha-mauve";
+# 		package = pkgs.kdePackages.sddm;
+# 	};
 
 	programs.hyprland.enable = true;
 	security.polkit.enable = true;
@@ -120,7 +120,7 @@
 # Ricing
 			bibata-cursors
 				catppuccin-gtk
-				inputs.way-edges.packages.${pkgs.system}.way-edges
+				# inputs.way-edges.packages.${pkgs.system}.way-edges
 				waybar
 				hyprlock
 				swaynotificationcenter
@@ -135,15 +135,14 @@
 				carapace
 				kitty
 				github-cli
-				light
+				# light
 				bluetuith
 				wget
 				playerctl
 				git
 				fastfetch
 				lsd
-				juce
-				stow
+				doot
 				fzf
 				ripgrep
 				zsh-autocomplete
@@ -208,12 +207,12 @@
 	environment.systemPackages = with pkgs; [
 
 # Catppuccin sddm theme
-		(pkgs.catppuccin-sddm.override {
-		 flavor = "mocha";
-		 font = "Fira Mono Nerd Font";
-		 fontSize = "11";
-		 background = null;
-		 })
+# 		(pkgs.catppuccin-sddm.override {
+# 		 flavor = "mocha";
+# 		 font = "Fira Mono Nerd Font";
+# 		 fontSize = "11";
+# 		 background = null;
+# 		 })
 # Terminal things
 	(pkgs.symlinkJoin {
 	 name = "nvim-with-lsp";
@@ -264,3 +263,4 @@
 	system.stateVersion = "25.05"; # Did you read the comment?
 
 }
+
diff --git a/configuration-laptop.nix b/configuration-laptop.nix
new file mode 100644
index 0000000..64023ae
--- /dev/null
+++ b/configuration-laptop.nix
@@ -0,0 +1,43 @@
+{ config, lib, pkgs, inputs, ... }:
+
+{
+	networking.hostName = "mobile02"; # Define your hostname.
+
+# Opengl and vulkan
+	hardware.graphics = {
+		enable = true;
+		extraPackages = with pkgs; [
+			intel-vaapi-driver
+				libva-vdpau-driver
+		];
+	};
+
+	services.displayManager.sddm = {
+		enable = true;
+		theme = "catppuccin-mocha-mauve";
+		package = pkgs.kdePackages.sddm;
+	};
+
+# Catppuccin sddm theme
+		(pkgs.catppuccin-sddm.override {
+		 flavor = "mocha";
+		 font = "Fira Mono Nerd Font";
+		 fontSize = "11";
+		 background = null;
+		 })
+
+# Local User
+	users.users.user01 = {
+		extraGroups = [ ];
+		packages = with pkgs; [
+# Ricing
+				inputs.way-edges.packages.${pkgs.system}.way-edges
+				inputs.chataigne.packages.${pkgs.system}.chataigne
+
+# Terminal
+				light
+# Apps
+				];
+	};
+
+}
diff --git a/configuration-pc.nix b/configuration-pc.nix
new file mode 100644
index 0000000..b3439c7
--- /dev/null
+++ b/configuration-pc.nix
@@ -0,0 +1,43 @@
+{ config, lib, pkgs, inputs, ... }:
+
+{
+	networking.hostName = "HACKSTATION"; # Define your hostname.
+
+# Opengl and vulkan
+	hardware.graphics = {
+		enable = true;
+		extraPackages = with pkgs; [
+			intel-vaapi-driver
+				libva-vdpau-driver
+		];
+	};
+
+# 	services.displayManager.sddm = {
+# 		enable = true;
+# 		theme = "catppuccin-mocha-mauve";
+# 		package = pkgs.kdePackages.sddm;
+# 	};
+
+services.getty.autologinUser = "user01"
+
+# Catppuccin sddm theme
+#		(pkgs.catppuccin-sddm.override {
+#		 flavor = "mocha";
+#		 font = "Fira Mono Nerd Font";
+#		 fontSize = "11";
+#		 background = null;
+#		 })
+
+# Local User
+	users.users.user01 = {
+		extraGroups = [ ];
+		packages = with pkgs; [
+# Ricing
+
+# Terminal
+
+# Apps
+				];
+	};
+
+}
diff --git a/flake.nix b/flake.nix
index e110cef..7edecd0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "Impure NixOS flake for mobile02";
+  description = "Impure NixOS flake";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -14,7 +14,7 @@
   };
 
   outputs = { self, chataigne, nixpkgs, ... }@inputs: let
-    stdenv.hostPlatform.system = "x86_64-linux";  # adjust if needed
+    stdenv.hostPlatform.system = "x86_64-linux";
     system = stdenv.hostPlatform.system;
     hardwareConfig = import /etc/nixos/hardware-configuration.nix;
   in
@@ -24,7 +24,21 @@
       specialArgs = {inherit inputs;};
 
       modules = [
-        ./configuration.nix
+        ./configuration-laptop.nix
+				./common.nix
+        hardwareConfig
+        {
+          nixpkgs.config.allowUnfree = true;
+        }
+      ];
+    };
+    nixosConfigurations.hackstation = nixpkgs.lib.nixosSystem {
+      inherit system;
+      specialArgs = {inherit inputs;};
+
+      modules = [
+        ./configuration-pc.nix
+				./common.nix
         hardwareConfig
         {
           nixpkgs.config.allowUnfree = true;