diff --git a/home/packages.nix b/home/packages.nix
index 05d3b96..95c63c6 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -10,16 +10,6 @@ with pkgs; [
   gnome.gnome-screenshot
 
   networkmanager_dmenu
-  # TODO: Create one `./packages/custom/default.nix which includes all other?
-  (callPackage ./packages/custom/dmenu-scripts { })
-  (callPackage ./packages/custom/update-system { })
-  (callPackage ./packages/custom/backup { })
-  (callPackage ./packages/custom/nextcloud-sync/from-local.nix { })
-  (callPackage ./packages/custom/nextcloud-sync/from-remote.nix { })
-  (callPackage ./packages/custom/typo3-documentation-rendering {
-    inherit ownLib;
-  })
-  (callPackage ./packages/custom/build-phpactor { })
   i3blocks
   st
   ncdu
@@ -60,10 +50,6 @@ with pkgs; [
   # Use in conjuncion with https://github.com/autozimu/LanguageClient-neovim
   # rnix-lsp
 
-  (callPackage ./packages/custom/project {
-    inherit ownLib;
-  })
-
   # Communication
   signal-desktop
   thunderbird
@@ -98,4 +84,8 @@ with pkgs; [
   # hikari 2
 
   (callPackage ./packages/custom/update-ubuntu-system { })
-])
+  # TODO: Right now only for Ubuntu (hikari2) system
+  (callPackage ./packages/custom/backup { })
+]) ++ (callPackage ./packages/custom {
+  inherit ownLib;
+})
diff --git a/home/packages/custom/default.nix b/home/packages/custom/default.nix
new file mode 100644
index 0000000..2288904
--- /dev/null
+++ b/home/packages/custom/default.nix
@@ -0,0 +1,18 @@
+{
+  callPackage
+  , ownLib
+}:
+
+[
+  (callPackage ./dmenu-scripts { })
+  (callPackage ./update-system { })
+  (callPackage ./nextcloud-sync/from-local.nix { })
+  (callPackage ./nextcloud-sync/from-remote.nix { })
+  (callPackage ./typo3-documentation-rendering {
+    inherit ownLib;
+  })
+  (callPackage ./build-phpactor { })
+  (callPackage ./project {
+    inherit ownLib;
+  })
+]