diff --git a/README.md b/README.md
index cedb557..1cfbddf 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,6 @@ Build Command:
 | :---------: | :------------------------: | :--------------: | :-------: |
 |  `twilight` |      Desktop Computer      |      Leyla       |  Desktop  |
 |  `horizon`  |  13 inch Framework Laptop  |      Leyla       |  Laptop   |
-|  `defiant`  |         Steam Desk         |      Leyla       |  Handheld |
+|  `defiant`  |         NAS Server         |      Leyla       |  Service  |
 |  `emergent` |      Desktop Computer      |       Eve        |  Laptop   |
 | `threshold` |           Laptop           |       Eve        |  Desktop  |
diff --git a/enviroments/client/default.nix b/enviroments/client/default.nix
index 060e51f..fba0edd 100644
--- a/enviroments/client/default.nix
+++ b/enviroments/client/default.nix
@@ -45,31 +45,10 @@
     #media-session.enable = true;
   };
 
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "en_US.UTF-8";
-    LC_IDENTIFICATION = "en_US.UTF-8";
-    LC_MEASUREMENT = "en_US.UTF-8";
-    LC_MONETARY = "en_US.UTF-8";
-    LC_NAME = "en_US.UTF-8";
-    LC_NUMERIC = "en_US.UTF-8";
-    LC_PAPER = "en_US.UTF-8";
-    LC_TELEPHONE = "en_US.UTF-8";
-    LC_TIME = "en_US.UTF-8";
-  };
-
   environment.systemPackages = with pkgs; [
-    # version control
-    git
-    
     # helvetica font
     aileron
 
-    # system debuging tools
-    iputils
-    dnsutils
-
     cachefilesd
   ];
 }
\ No newline at end of file
diff --git a/enviroments/common/default.nix b/enviroments/common/default.nix
index 3115625..6aeeb97 100644
--- a/enviroments/common/default.nix
+++ b/enviroments/common/default.nix
@@ -9,8 +9,29 @@
   # Set your time zone.
   time.timeZone = "America/Chicago";
 
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_US.UTF-8";
+    LC_IDENTIFICATION = "en_US.UTF-8";
+    LC_MEASUREMENT = "en_US.UTF-8";
+    LC_MONETARY = "en_US.UTF-8";
+    LC_NAME = "en_US.UTF-8";
+    LC_NUMERIC = "en_US.UTF-8";
+    LC_PAPER = "en_US.UTF-8";
+    LC_TELEPHONE = "en_US.UTF-8";
+    LC_TIME = "en_US.UTF-8";
+  };
+
   # List packages installed in system profile.
   environment.systemPackages = with pkgs; [
     wget
+
+    # version control
+    git
+
+    # system debuging tools
+    iputils
+    dnsutils
   ];
 }
\ No newline at end of file
diff --git a/enviroments/server/default.nix b/enviroments/server/default.nix
new file mode 100644
index 0000000..861f142
--- /dev/null
+++ b/enviroments/server/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  imports = [
+    ../common
+  ];
+
+}
\ No newline at end of file
diff --git a/flake.nix b/flake.nix
index 3902062..5d86bae 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,7 +25,7 @@
       nixosConfigurations = {
       	# Leyla Laptop
         horizon = nixpkgs.lib.nixosSystem {
-          specialArgs = {inherit inputs;};
+          specialArgs = { inherit inputs; };
           modules = [ 
             ./hosts/horizon/configuration.nix
             inputs.home-manager.nixosModules.default
@@ -34,12 +34,19 @@
         };
         # Leyla Desktop
         twilight = nixpkgs.lib.nixosSystem {
-          specialArgs = {inherit inputs;};
+          specialArgs = { inherit inputs; };
           modules = [ 
             ./hosts/twilight/configuration.nix
             inputs.home-manager.nixosModules.default
           ];
         };
+        # NAS Service
+        defiant = nixpkgs.lib.nixosSystem {
+          specialArgs = { inherit inpits; }
+          modules = [
+            ./hosts/defiant/configuration.nix
+          ]
+        };
       };
     };
 }
diff --git a/hosts/defiant/configuration.nix b/hosts/defiant/configuration.nix
new file mode 100644
index 0000000..c148f94
--- /dev/null
+++ b/hosts/defiant/configuration.nix
@@ -0,0 +1,12 @@
+# server nas
+{ config, pkgs, inputs, ... }:
+{
+  imports =
+    [
+      inputs.sops-nix.nixosModules.sops
+
+      ./hardware-configuration.nix
+      
+      ../../enviroments/server
+    ];
+}
\ No newline at end of file
diff --git a/hosts/defiant/hardware-configuration.nix b/hosts/defiant/hardware-configuration.nix
new file mode 100644
index 0000000..f7efd4b
--- /dev/null
+++ b/hosts/defiant/hardware-configuration.nix
@@ -0,0 +1,11 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+  
+}
\ No newline at end of file