diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index b94e4e8..71e90a1 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -11,45 +11,6 @@
   
   networking.hostName = "zeph-desktop";
 
-  # Users configuration
-  users.users.zeph = { # Change "yourusername" to your actual username
-    isNormalUser = true;
-    description = "Zephrynis"; # Change this
-    extraGroups = [ "networkmanager" "wheel" "video" "audio" ];
-    shell = pkgs.zsh; # or pkgs.bash
-  };
-
-  # Enable zsh system-wide
-  programs.zsh.enable = true;
-
-  # Display manager and desktop environment / window manager
-  services.xserver = {
-    enable = true;
-    
-    # Display manager
-    #  displayManager.gdm.enable = true;
-    
-    # Desktop environment (choose one, or comment all for a standalone WM)
-    # desktopManager.gnome.enable = true;
-    # desktopManager.plasma5.enable = true;
-    
-    # Window manager (uncomment if you want a standalone WM)
-    # windowManager.i3.enable = true;
-    # windowManager.bspwm.enable = true;
-  };
-
-  # Optional: Enable Wayland compositor
-  programs.hyprland = { 
-    enable = true;
-    xwayland.enable = true;
-    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
-  };
-  
-  services.displayManager.sddm = {
-    enable = true;
-    wayland.enable = true;
-  };
-
   # Desktop-specific packages (gaming, streaming, etc.)
   environment.systemPackages = with pkgs; [
     # Add desktop-specific packages here
@@ -66,17 +27,4 @@
   # Gaming support (uncomment if needed)
   # programs.steam.enable = true;
   # programs.gamemode.enable = true;
-
-  # Fonts
-  fonts.packages = with pkgs; [
-    noto-fonts
-    noto-fonts-cjk-sans
-    noto-fonts-emoji
-    liberation_ttf
-    fira-code
-    fira-code-symbols
-    nerd-fonts.fira-code
-    nerd-fonts.jetbrains-mono
-    nerd-fonts.iosevka
-  ];
 }
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index 1a2ad92..49a1ce7 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -9,35 +9,6 @@
   
   networking.hostName = "zeph-laptop";
 
-  # Users configuration
-  users.users.zeph = {
-    isNormalUser = true;
-    description = "Zephrynis";
-    extraGroups = [ "networkmanager" "wheel" "video" "audio" ];
-    shell = pkgs.zsh;
-  };
-
-  # Enable zsh system-wide
-  programs.zsh.enable = true;
-
-  # Hyprland - Tiling Wayland compositor
-  programs.hyprland = {
-    enable = true;
-    xwayland.enable = true;
-    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
-  };
-  
-  # Enable X11 for XWayland support
-  services.xserver = {
-    enable = true;
-  };
-  
-  # Use SDDM for login (works with Wayland)
-  services.displayManager.sddm = {
-    enable = true;
-    wayland.enable = true;
-  };
-
   # Laptop-specific power management
   # Choose either TLP or power-profiles-daemon (not both)
   # TLP is more advanced, power-profiles-daemon is simpler and integrates better with KDE
@@ -85,17 +56,4 @@
       disableWhileTyping = true;
     };
   };
-
-  # Fonts
-  fonts.packages = with pkgs; [
-    noto-fonts
-    noto-fonts-cjk-sans
-    noto-fonts-emoji
-    liberation_ttf
-    fira-code
-    fira-code-symbols
-    nerd-fonts.fira-code
-    nerd-fonts.jetbrains-mono
-    nerd-fonts.iosevka
-  ];
 }
diff --git a/system/common.nix b/system/common.nix
index b01d2ea..f3698aa 100644
--- a/system/common.nix
+++ b/system/common.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, inputs, ... }:
 
 {
   imports = [
@@ -7,6 +7,46 @@
 
   # Common system configuration shared across all machines
   
+  # User configuration (shared across all machines)
+  users.users.zeph = {
+    isNormalUser = true;
+    description = "Zephrynis";
+    extraGroups = [ "networkmanager" "wheel" "video" "audio" ];
+    shell = pkgs.zsh;
+  };
+
+  # Enable zsh system-wide
+  programs.zsh.enable = true;
+
+  # Hyprland - Tiling Wayland compositor (shared configuration)
+  programs.hyprland = {
+    enable = true;
+    xwayland.enable = true;
+    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+  };
+  
+  # Enable X11 for XWayland support
+  services.xserver.enable = true;
+  
+  # Display manager - SDDM with Wayland support
+  services.displayManager.sddm = {
+    enable = true;
+    wayland.enable = true;
+  };
+
+  # Fonts (shared across all machines)
+  fonts.packages = with pkgs; [
+    noto-fonts
+    noto-fonts-cjk-sans
+    noto-fonts-emoji
+    liberation_ttf
+    fira-code
+    fira-code-symbols
+    nerd-fonts.fira-code
+    nerd-fonts.jetbrains-mono
+    nerd-fonts.iosevka
+  ];
+  
   # Bootloader
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;