diff --git a/packages/default.nix b/packages/default.nix
index aaa0846..5c654df 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -4,104 +4,95 @@
   system,
   ...
 }:
+let
+  callPackage = pkgs.lib.callPackageWith { inherit pkgs inputs system; };
+in
 {
-  darktable-ghost-cms-publish = import ./darktable/ghost-cms-publish { inherit pkgs; };
-  darktable-hald-clut = import ./darktable/hald-clut { inherit pkgs; };
-  darktable-lua-scripts = import ./darktable/lua-scripts { inherit pkgs; };
+  darktable-ghost-cms-publish = callPackage ./darktable/ghost-cms-publish { };
+  darktable-hald-clut = callPackage ./darktable/hald-clut { };
+  darktable-lua-scripts = callPackage ./darktable/lua-scripts { };
 
-  docker-adguardhome = import ./docker/adguardhome { inherit pkgs; };
-  docker-authelia = import ./docker/authelia { inherit pkgs; };
-  docker-base = import ./docker/base { inherit pkgs; };
-  docker-flaresolverr = import ./docker/flaresolverr { inherit pkgs; };
-  docker-gitea = import ./docker/gitea { inherit pkgs; };
-  docker-gitea-act-runner = import ./docker/gitea-act-runner { inherit pkgs; };
-  docker-grafana = import ./docker/grafana { inherit pkgs; };
-  docker-grafana-image-renderer = import ./docker/grafana-image-renderer { inherit pkgs; };
-  docker-jellyfin = import ./docker/jellyfin { inherit pkgs inputs system; };
-  docker-jellyseerr = import ./docker/jellyseerr { inherit pkgs; };
-  docker-littlelink-server = import ./docker/littlelink-server { inherit pkgs inputs system; };
-  docker-mariadb = import ./docker/mariadb { inherit pkgs; };
-  docker-mysql = import ./docker/mysql { inherit pkgs; };
-  docker-nextcloud = import ./docker/nextcloud { inherit pkgs; };
-  docker-nginx = import ./docker/nginx { inherit pkgs; };
-  docker-ntfy = import ./docker/ntfy { inherit pkgs; };
-  docker-oidcwarden = import ./docker/oidcwarden { inherit pkgs inputs system; };
-  docker-outline = import ./docker/outline { inherit pkgs; };
-  docker-postgresql = import ./docker/postgresql { inherit pkgs; };
-  docker-prometheus = import ./docker/prometheus { inherit pkgs; };
-  docker-prometheus-fail2ban-exporter = import ./docker/prometheus-fail2ban-exporter {
-    inherit pkgs inputs system;
-  };
-  docker-prometheus-node-exporter = import ./docker/prometheus-node-exporter { inherit pkgs; };
-  docker-prometheus-podman-exporter = import ./docker/prometheus-podman-exporter {
-    inherit pkgs inputs system;
-  };
-  docker-prometheus-smartctl-exporter = import ./docker/prometheus-smartctl-exporter {
-    inherit pkgs;
-  };
-  docker-prowlarr = import ./docker/prowlarr { inherit pkgs; };
-  docker-radarr = import ./docker/radarr { inherit pkgs; };
-  docker-recyclarr = import ./docker/recyclarr { inherit pkgs; };
-  docker-redis = import ./docker/redis { inherit pkgs; };
-  docker-shlink = import ./docker/shlink { inherit pkgs inputs system; };
-  docker-shlink-web-client = import ./docker/shlink-web-client { inherit pkgs inputs system; };
-  docker-sish = import ./docker/sish { inherit pkgs; };
-  docker-sonarr = import ./docker/sonarr { inherit pkgs; };
-  docker-traefik = import ./docker/traefik { inherit pkgs; };
-  docker-transmission-protonvpn = import ./docker/transmission-protonvpn { inherit pkgs; };
-  docker-whoami = import ./docker/whoami { inherit pkgs; };
+  docker-adguardhome = callPackage ./docker/adguardhome { };
+  docker-authelia = callPackage ./docker/authelia { };
+  docker-base = callPackage ./docker/base { };
+  docker-flaresolverr = callPackage ./docker/flaresolverr { };
+  docker-gitea = callPackage ./docker/gitea { };
+  docker-gitea-act-runner = callPackage ./docker/gitea-act-runner { };
+  docker-grafana = callPackage ./docker/grafana { };
+  docker-grafana-image-renderer = callPackage ./docker/grafana-image-renderer { };
+  docker-jellyfin = callPackage ./docker/jellyfin { };
+  docker-jellyseerr = callPackage ./docker/jellyseerr { };
+  docker-littlelink-server = callPackage ./docker/littlelink-server { };
+  docker-mariadb = callPackage ./docker/mariadb { };
+  docker-mysql = callPackage ./docker/mysql { };
+  docker-nextcloud = callPackage ./docker/nextcloud { };
+  docker-nginx = callPackage ./docker/nginx { };
+  docker-ntfy = callPackage ./docker/ntfy { };
+  docker-oidcwarden = callPackage ./docker/oidcwarden { };
+  docker-outline = callPackage ./docker/outline { };
+  docker-postgresql = callPackage ./docker/postgresql { };
+  docker-prometheus = callPackage ./docker/prometheus { };
+  docker-prometheus-fail2ban-exporter = callPackage ./docker/prometheus-fail2ban-exporter { };
+  docker-prometheus-node-exporter = callPackage ./docker/prometheus-node-exporter { };
+  docker-prometheus-podman-exporter = callPackage ./docker/prometheus-podman-exporter { };
+  docker-prometheus-smartctl-exporter = callPackage ./docker/prometheus-smartctl-exporter { };
+  docker-prowlarr = callPackage ./docker/prowlarr { };
+  docker-radarr = callPackage ./docker/radarr { };
+  docker-recyclarr = callPackage ./docker/recyclarr { };
+  docker-redis = callPackage ./docker/redis { };
+  docker-shlink = callPackage ./docker/shlink { };
+  docker-shlink-web-client = callPackage ./docker/shlink-web-client { };
+  docker-sish = callPackage ./docker/sish { };
+  docker-sonarr = callPackage ./docker/sonarr { };
+  docker-traefik = callPackage ./docker/traefik { };
+  docker-transmission-protonvpn = callPackage ./docker/transmission-protonvpn { };
+  docker-whoami = callPackage ./docker/whoami { };
+  ghost = callPackage ./ghost { };
+  jellyfin-plugin-bookshelf-bin = callPackage ./jellyfin/plugins/bookshelf { };
+  jellyfin-plugin-intro-skipper-bin = callPackage ./jellyfin/plugins/intro-skipper { };
+  jellyfin-plugin-opensubtitles-bin = callPackage ./jellyfin/plugins/opensubtitles { };
+  jellyfin-plugin-playbackreporting-bin = callPackage ./jellyfin/plugins/playbackreporting { };
+  jellyfin-plugin-reports-bin = callPackage ./jellyfin/plugins/reports { };
+  jellyfin-plugin-sso-bin = callPackage ./jellyfin/plugins/sso { };
+  jellyfin-plugin-subtitleextract-bin = callPackage ./jellyfin/plugins/subtitleextract { };
+  jellyfin-plugin-tmdbboxsets-bin = callPackage ./jellyfin/plugins/tmdbboxsets { };
+  jellyfin-plugin-tvdb-bin = callPackage ./jellyfin/plugins/tvdb { };
 
-  ghost = import ./ghost { inherit pkgs; };
+  littlelink-server = callPackage ./littlelink-server { };
 
-  jellyfin-plugin-bookshelf-bin = import ./jellyfin/plugins/bookshelf { inherit pkgs; };
-  jellyfin-plugin-intro-skipper-bin = import ./jellyfin/plugins/intro-skipper { inherit pkgs; };
-  jellyfin-plugin-opensubtitles-bin = import ./jellyfin/plugins/opensubtitles { inherit pkgs; };
-  jellyfin-plugin-playbackreporting-bin = import ./jellyfin/plugins/playbackreporting {
-    inherit pkgs;
-  };
-  jellyfin-plugin-reports-bin = import ./jellyfin/plugins/reports { inherit pkgs; };
-  jellyfin-plugin-sso-bin = import ./jellyfin/plugins/sso { inherit pkgs; };
-  jellyfin-plugin-subtitleextract-bin = import ./jellyfin/plugins/subtitleextract { inherit pkgs; };
-  jellyfin-plugin-tmdbboxsets-bin = import ./jellyfin/plugins/tmdbboxsets { inherit pkgs; };
-  jellyfin-plugin-tvdb-bin = import ./jellyfin/plugins/tvdb { inherit pkgs; };
+  obsidian-plugin-better-word-count = callPackage ./obsidian/plugins/better-word-count { };
+  obsidian-plugin-dataview = callPackage ./obsidian/plugins/dataview { };
+  obsidian-plugin-excalidraw = callPackage ./obsidian/plugins/excalidraw { };
+  obsidian-plugin-kanban = callPackage ./obsidian/plugins/kanban { };
+  obsidian-plugin-languagetool = callPackage ./obsidian/plugins/languagetool { };
+  obsidian-plugin-linter = callPackage ./obsidian/plugins/linter { };
+  obsidian-plugin-map-view = callPackage ./obsidian/plugins/map-view { };
+  obsidian-plugin-minimal-settings = callPackage ./obsidian/plugins/minimal-settings { };
+  obsidian-plugin-outliner = callPackage ./obsidian/plugins/outliner { };
+  obsidian-plugin-style-settings = callPackage ./obsidian/plugins/style-settings { };
+  obsidian-plugin-tasks = callPackage ./obsidian/plugins/tasks { };
+  obsidian-plugin-url-into-selection = callPackage ./obsidian/plugins/url-into-selection { };
 
-  littlelink-server = import ./littlelink-server { inherit pkgs; };
+  obsidian-theme-minimal = callPackage ./obsidian/themes/minimal { };
 
-  obsidian-plugin-better-word-count = import ./obsidian/plugins/better-word-count { inherit pkgs; };
-  obsidian-plugin-dataview = import ./obsidian/plugins/dataview { inherit pkgs; };
-  obsidian-plugin-excalidraw = import ./obsidian/plugins/excalidraw { inherit pkgs; };
-  obsidian-plugin-kanban = import ./obsidian/plugins/kanban { inherit pkgs; };
-  obsidian-plugin-languagetool = import ./obsidian/plugins/languagetool { inherit pkgs; };
-  obsidian-plugin-linter = import ./obsidian/plugins/linter { inherit pkgs; };
-  obsidian-plugin-map-view = import ./obsidian/plugins/map-view { inherit pkgs; };
-  obsidian-plugin-minimal-settings = import ./obsidian/plugins/minimal-settings { inherit pkgs; };
-  obsidian-plugin-outliner = import ./obsidian/plugins/outliner { inherit pkgs; };
-  obsidian-plugin-style-settings = import ./obsidian/plugins/style-settings { inherit pkgs; };
-  obsidian-plugin-tasks = import ./obsidian/plugins/tasks { inherit pkgs; };
-  obsidian-plugin-url-into-selection = import ./obsidian/plugins/url-into-selection { inherit pkgs; };
+  oidcwarden = callPackage ./oidcwarden { };
 
-  obsidian-theme-minimal = import ./obsidian/themes/minimal { inherit pkgs; };
+  prometheus-fail2ban-exporter = callPackage ./prometheus-fail2ban-exporter { };
+  prometheus-podman-exporter = callPackage ./prometheus-podman-exporter { };
 
-  oidcwarden = import ./oidcwarden { inherit pkgs; };
+  shlink = callPackage ./shlink { };
+  shlink-web-client = callPackage ./shlink-web-client { };
 
-  prometheus-fail2ban-exporter = import ./prometheus-fail2ban-exporter { inherit pkgs; };
-  prometheus-podman-exporter = import ./prometheus-podman-exporter { inherit pkgs; };
+  ssh-known-hosts-github = callPackage ./ssh/known-hosts/github { };
 
-  shlink = import ./shlink { inherit pkgs; };
-  shlink-web-client = import ./shlink-web-client { inherit pkgs; };
-
-  ssh-known-hosts-github = import ./ssh/known-hosts/github { inherit pkgs inputs system; };
-
-  yazi-plugin-custom-shell = import ./yazi/plugins/custom-shell { inherit pkgs; };
+  yazi-plugin-custom-shell = callPackage ./yazi/plugins/custom-shell { };
 
   # SAS
-  ssh-known-hosts-sas-artifact = import ./ssh/known-hosts/sas/artifact {
-    inherit pkgs inputs system;
-  };
-  ssh-known-hosts-sas-cldlgn = import ./ssh/known-hosts/sas/cldlgn { inherit pkgs inputs system; };
-  ssh-known-hosts-sas-gerrit = import ./ssh/known-hosts/sas/gerrit { inherit pkgs inputs system; };
-  ssh-known-hosts-sas-gitlab = import ./ssh/known-hosts/sas/gitlab { inherit pkgs inputs system; };
+  ssh-known-hosts-sas-artifact = callPackage ./ssh/known-hosts/sas/artifact { };
+  ssh-known-hosts-sas-cldlgn = callPackage ./ssh/known-hosts/sas/cldlgn { };
+  ssh-known-hosts-sas-gerrit = callPackage ./ssh/known-hosts/sas/gerrit { };
+  ssh-known-hosts-sas-gitlab = callPackage ./ssh/known-hosts/sas/gitlab { };
 
-  sas-cacert = import ./sas/cacert { inherit pkgs; };
-  viya4-orders-cli = import ./sas/viya4-orders-cli { inherit pkgs; };
+  sas-cacert = callPackage ./sas/cacert { };
+  viya4-orders-cli = callPackage ./sas/viya4-orders-cli { };
 }