diff --git a/base-packages/default.nix b/base-packages/default.nix
new file mode 100644
index 0000000..cc784a9
--- /dev/null
+++ b/base-packages/default.nix
@@ -0,0 +1,10 @@
+{ lib, pkgs }:
+{
+  mkBasePackages = {
+    inherit pkgs;
+    packages = [
+      pkgs.vim
+      pkgs.haxe
+    ];
+  };
+}
\ No newline at end of file
diff --git a/configuration.nix b/configuration.nix
index 1de7e10..49771af 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -13,17 +13,8 @@
     #<nixos-wsl/modules>
   ]; 
   environment.systemPackages = with pkgs; [
-    wget
-    git
-    vim
-    wget
-    curl
-    haxe
+    
   ];
-  programs.nix-ld = {
-    enable = true;
-    package = pkgs.nix-ld-rs;
-  };
 
 
   # Enable Experimental Features
diff --git a/flake.nix b/flake.nix
index 52de783..88d0e8b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,10 +6,11 @@
     nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
   };
   outputs = { self, nixpkgs, nixos-wsl, nix, ...}@inputs:
-  let 
-  system =  if builtins ? currentSystem
+  let system = if builtins ? currentSystem
     then builtins.currentSystem
     else "x86_64-linux";
+  pkgs = import nixpkgs { inherit system; };
+  basePackages = (import ./base-packages { inherit pkgs; });
   in
   {
     nixosConfigurations = {
@@ -22,6 +23,15 @@
             system.stateVersion = "24.05";
             wsl.enable = true;
             nix.settings.experimental-features = ["nix-command" "flakes" ];
+            environment.systemPackages = basePackages.mkBasePackages.packages [
+              pkgs.wget
+              pkgs.git
+              pkgs.curl
+            ];
+            programs.nix-ld = {
+              enable = true;
+              package = pkgs.nix-ld-rs;
+            };
           }
         ];
         specialArgs = { inherit inputs; };