From ebcd46ace46999766747106b62ee591b0b982ba3 Mon Sep 17 00:00:00 2001
From: Andreas <andreas@subsonics.nl>
Date: Tue, 24 Sep 2024 03:15:51 +0000
Subject: [PATCH] move packages and reformat

---
 flake.nix                      | 66 +++++++++++++++++-----------------
 installed-packages/default.nix | 10 +++++-
 2 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/flake.nix b/flake.nix
index 60fa8b5..ce8db98 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,41 +1,43 @@
 {
   description = "Nixos config flake test";
-  
+
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
   };
-  outputs = { self, nixpkgs, nixos-wsl, nix, ...}@inputs:
-  let system = if builtins ? currentSystem
-    then builtins.currentSystem
-    else "x86_64-linux";
-  pkgs = import nixpkgs { inherit system; };
-  installedPackages = (import ./installed-packages { inherit pkgs; });
-  in
-  {
-    nixosConfigurations = {
-      nixos = nixpkgs.lib.nixosSystem {
-        inherit system;
-        modules = [
-          nixos-wsl.nixosModules.default
-          ./configuration.nix
-          {
-            system.stateVersion = "24.05";
-            wsl.enable = true;
-            nix.settings.experimental-features = ["nix-command" "flakes" ];
-            environment.systemPackages = [
-              pkgs.wget
-              pkgs.git
-              pkgs.curl
-            ]++installedPackages.mkBasePackages.packages;
-            programs.nix-ld = {
-              enable = true;
-              package = pkgs.nix-ld-rs;
-            };
-          }
-        ];
-        specialArgs = { inherit inputs; };
+  outputs = { self, nixpkgs, nixos-wsl, nix, ... }@inputs:
+    let
+      system =
+        if builtins ? currentSystem
+        then builtins.currentSystem
+        else "x86_64-linux";
+      pkgs = import nixpkgs { inherit system; };
+      installedPackages = (import ./installed-packages { inherit pkgs; });
+    in
+    {
+      nixosConfigurations = {
+        nixos = nixpkgs.lib.nixosSystem {
+          inherit system;
+          modules = [
+            nixos-wsl.nixosModules.default
+            ./configuration.nix
+            {
+              system.stateVersion = "24.05";
+              wsl.enable = true;
+              nix.settings.experimental-features = [ "nix-command" "flakes" ];
+              environment.systemPackages = [
+
+              ]
+              ++ installedPackages.mkBasePackages.packages
+              ++ installedPackages.mkHaxeDevelopmentPackages.packages;
+              programs.nix-ld = {
+                enable = true;
+                package = pkgs.nix-ld-rs;
+              };
+            }
+          ];
+          specialArgs = { inherit inputs; };
+        };
       };
     };
-  };
 }
diff --git a/installed-packages/default.nix b/installed-packages/default.nix
index 36388cf..d3a5cc4 100644
--- a/installed-packages/default.nix
+++ b/installed-packages/default.nix
@@ -3,7 +3,15 @@
   mkBasePackages = {
     packages = [
       pkgs.vim
+      pkgs.wget
+      pkgs.git
+      pkgs.curl
+      pkgs.nixpkgs-fmt
+    ];
+  };
+  mkHaxeDevelopmentPackages = {
+    packages = [
       pkgs.haxe
     ];
   };
-}
\ No newline at end of file
+}