diff --git a/system/defaults/gaming.nix b/system/defaults/gaming.nix
new file mode 100644
index 0000000..0882364
--- /dev/null
+++ b/system/defaults/gaming.nix
@@ -0,0 +1,8 @@
+{config, pkgs, ...}:
+
+{
+  programs = {
+    steam.enable = true;
+    gamemode.enable = true;
+  };
+}
diff --git a/system/defaults/users.nix b/system/defaults/users.nix
new file mode 100644
index 0000000..6c7f17e
--- /dev/null
+++ b/system/defaults/users.nix
@@ -0,0 +1,9 @@
+{config, pkgs, ...}:
+
+{
+  users.users.autumn = {
+    isNormalUser = true;
+    description = "Autumn";
+    extraGroups = [ "networkmanager" "wheel" ];
+  };
+}
diff --git a/system/lesbos/configuration.nix b/system/lesbos/configuration.nix
index 0f544c5..26a68e2 100644
--- a/system/lesbos/configuration.nix
+++ b/system/lesbos/configuration.nix
@@ -8,6 +8,16 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+
+      #system configs
+      ../defaults/locale.nix
+      ../defaults/boot.nix
+      ../defaults/services.nix
+      ../defaults/gaming.nix
+
+      #system packages
+      ../packages/sddm/sddm.nix
+
     ];
 
   # Bootloader.
@@ -27,62 +37,15 @@
   # Set your time zone.
   time.timeZone = "${timezone}";
 
-  # Select internationalisation properties.
-  i18n.defaultLocale = "${locale}";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "${locale}";
-    LC_IDENTIFICATION = "${locale}";
-    LC_MEASUREMENT = "${locale}";
-    LC_MONETARY = "${locale}";
-    LC_NAME = "${locale}";
-    LC_NUMERIC = "${locale}";
-    LC_PAPER = "${locale}";
-    LC_TELEPHONE = "${locale}";
-    LC_TIME = "${locale}";
-  };
-
-
-  # Enable the KDE Plasma Desktop Environment.
-  services.displayManager.sddm.enable = true;
-  services.displayManager.sddm.wayland.enable = true;
   services.desktopManager.plasma6.enable = true;
 
-  # Configure keymap in X11
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable sound with pipewire.
-  services.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-  };
 
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.autumn = {
-    isNormalUser = true;
-    description = "autumn";
-    extraGroups = [ "networkmanager" "wheel" ];
-  };
-
   # Install firefox.
   programs = {
     firefox.enable = true;
-    steam.enable = true;
-    gamemode.enable = true;
   };
   # Allow unfree packages
 
@@ -100,31 +63,6 @@
     download-buffer-size = 5245880000;
   };
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "25.05"; # Did you read the comment?
 
 }
diff --git a/system/yukigekko/configuration.nix b/system/yukigekko/configuration.nix
index c6e7173..293f626 100644
--- a/system/yukigekko/configuration.nix
+++ b/system/yukigekko/configuration.nix
@@ -32,21 +32,10 @@
     ];
   };
 
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.autumn= {
-    isNormalUser = true;
-    description = "Autumn";
-    extraGroups = [ "networkmanager" "wheel" ];
-  };
-  
-  # Install firefox.
   programs.firefox.enable = true;
   programs.bash.interactiveShellInit = "fish";
   programs.appimage.enable = true;
-  # programs.openvpn3.enable = true;
+  programs.openvpn3.enable = true;
 
   # Enable OpenGL
   hardware.graphics = {
@@ -84,7 +73,7 @@
   ];
   
   nix.settings.experimental-features = ["nix-command" "flakes"];
-    nix.settings.download-buffer-size = 5242880000;
+  nix.settings.download-buffer-size = 5242880000;
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.