diff --git a/modules/system/hardware/nix-ld/default.nix b/modules/system/hardware/nix-ld/default.nix
index 9acd3c7..ef4b775 100644
--- a/modules/system/hardware/nix-ld/default.nix
+++ b/modules/system/hardware/nix-ld/default.nix
@@ -22,10 +22,10 @@ in
 
     programs.nix-ld.libraries = [
       # Empty for now but used for default packages
-    ] ++ lib.optionals cfg.enableKdeDevelopmentEnvironment (import ./kde-dev-packages.nix { inherit pkgs; });
+    ] ++ lib.optionals cfg.enableKdeDevelopmentEnvironment (import ./kde/libs.nix { inherit pkgs; });
   } // mkIf cfg.enableKdeDevelopmentEnvironment {
     environment.systemPackages = [
       (import ../../../../pkgs/kde-builder.nix { inherit pkgs; })
-    ];
+    ] ++ (import ./kde/programs.nix { inherit pkgs; });
   };
 }
\ No newline at end of file
diff --git a/modules/system/hardware/nix-ld/kde-dev-packages.nix b/modules/system/hardware/nix-ld/kde/libs.nix
similarity index 86%
rename from modules/system/hardware/nix-ld/kde-dev-packages.nix
rename to modules/system/hardware/nix-ld/kde/libs.nix
index e3fa436..a129157 100644
--- a/modules/system/hardware/nix-ld/kde-dev-packages.nix
+++ b/modules/system/hardware/nix-ld/kde/libs.nix
@@ -3,36 +3,6 @@
 with pkgs; [
   # From https://invent.kde.org/sysadmin/repo-metadata/-/blob/6ddda1e450fdbc093ca0138cf1c850e7b7e75044/distro-dependencies/arch.ini
 
-  # .. gnu
-  autoconf
-  automake
-  bison
-  flex
-  gcc
-  gperf
-  gnumake
-  texinfo
-
-  # .. llvm
-  clang
-  cmake
-
-  # .. build systems
-  meson
-  ninja
-
-  # .. rust
-  corrosion
-
-  # .. others
-  boost
-  docbook_xsl
-  doxygen
-  gi-docgen
-  git
-  intltool
-  pkg-config
-
   # Qt-related
   kdePackages.accounts-qt
 
@@ -137,4 +107,4 @@ with pkgs; [
 
   # kpipewire
   pipewire
-]
\ No newline at end of file
+] ++ (import ./programs.nix { inherit pkgs; })
\ No newline at end of file
diff --git a/modules/system/hardware/nix-ld/kde/programs.nix b/modules/system/hardware/nix-ld/kde/programs.nix
new file mode 100644
index 0000000..5562ea9
--- /dev/null
+++ b/modules/system/hardware/nix-ld/kde/programs.nix
@@ -0,0 +1,33 @@
+{ pkgs }:
+
+with pkgs; [
+  # .. gnu
+  autoconf
+  automake
+  bison
+  flex
+  gcc
+  gperf
+  gnumake
+  texinfo
+
+  # .. llvm
+  clang
+  cmake
+
+  # .. build systems
+  meson
+  ninja
+
+  # .. rust
+  corrosion
+
+  # .. others
+  boost
+  docbook_xsl
+  doxygen
+  gi-docgen
+  git
+  intltool
+  pkg-config
+]
\ No newline at end of file