From 031ada6194278b2cbbab7d9d53ffd4aaa85c38c8 Mon Sep 17 00:00:00 2001
From: Andreas <andreas@subsonics.nl>
Date: Tue, 8 Oct 2024 02:24:30 +0000
Subject: [PATCH] improved readability

---
 flake.nix                      |  3 +--
 installed-packages/default.nix | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index ce8db98..88d0ae0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,8 +28,7 @@
               environment.systemPackages = [
 
               ]
-              ++ installedPackages.mkBasePackages.packages
-              ++ installedPackages.mkHaxeDevelopmentPackages.packages;
+              ++ installedPackages.mkPackages.packages;
               programs.nix-ld = {
                 enable = true;
                 package = pkgs.nix-ld-rs;
diff --git a/installed-packages/default.nix b/installed-packages/default.nix
index d3a5cc4..7c6bb3a 100644
--- a/installed-packages/default.nix
+++ b/installed-packages/default.nix
@@ -1,17 +1,21 @@
 { pkgs }:
-{
-  mkBasePackages = {
-    packages = [
+let 
+    baseBackages = [
       pkgs.vim
-      pkgs.wget
-      pkgs.git
-      pkgs.curl
       pkgs.nixpkgs-fmt
     ];
-  };
-  mkHaxeDevelopmentPackages = {
-    packages = [
+    utilPackages = [
+      pkgs.wget
+      pkgs.curl
+      pkgs.git
+      pkgs.ffmpeg
+    ];
+    haxeDevelopmentPackages = [
       pkgs.haxe
     ];
+in
+{
+  mkPackages = {
+    packages = baseBackages ++ utilPackages ++ haxeDevelopmentPackages;
   };
 }