diff --git a/_outputs.nix b/_outputs.nix
index ab5a2710..6549003d 100644
--- a/_outputs.nix
+++ b/_outputs.nix
@@ -8,7 +8,7 @@
     secrets,
     ...
   }: let
-    inherit (self.lib) mkVersion mkNixOS mkNixOnDroid mkPkgs;
+    inherit (self.lib) mkNixOS mkNixOnDroid mkPkgs;
 
     perSystem = attrs:
       nixpkgs.lib.genAttrs (import systems) (system:
@@ -103,13 +103,9 @@
       perSystem (pkgs:
         import ./devShells {inherit pkgs self;});
 
-    packages =
-      perSystem (pkgs:
-        import ./packages {inherit inputs mkVersion pkgs;});
+    packages = perSystem (pkgs: pkgs.selfPackages);
 
-    scopedPackages =
-      perSystem (pkgs:
-        import ./scopedPackages {inherit inputs mkVersion pkgs;});
+    scopedPackages = perSystem (pkgs: pkgs.scopedPackages);
 
     formatter = perSystem (pkgs: pkgs.alejandra);
   };
diff --git a/apps/default.nix b/apps/default.nix
index d7ba62c8..f137bbd7 100644
--- a/apps/default.nix
+++ b/apps/default.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  self,
-  ...
-}: let
+{pkgs, ...}: let
   inherit (pkgs.lib) getExe mapAttrs;
 
   mkApp = pkg: {
@@ -10,4 +6,4 @@
     type = "app";
   };
 in
-  mapAttrs (n: v: mkApp v) self.appsPackages.${pkgs.system}
+  mapAttrs (n: v: mkApp v) pkgs.appsPackages
diff --git a/apps/packages.nix b/apps/packages.nix
index c7424601..85600160 100644
--- a/apps/packages.nix
+++ b/apps/packages.nix
@@ -1,17 +1,15 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: let
-  inherit (pkgs.lib) listToAttrs nameValuePair;
+{inputs, ...}: (final: prev: {
+  appsPackages = let
+    inherit (final.lib) listToAttrs nameValuePair;
 
-  buildApp = attrs: (pkgs.callPackage ./buildApp.nix ({} // inputs // attrs));
-  callPackage = file: pkgs.callPackage file ({inherit buildApp;} // inputs);
-in
-  listToAttrs (map (x: nameValuePair x (callPackage ./${x})) [
-    "extract-subs"
-    "gen-docs"
-    "mc-mods"
-    "pin-inputs"
-    "update-sources"
-  ])
+    buildApp = attrs: (final.callPackage ./buildApp.nix ({} // inputs // attrs));
+    callPackage = file: final.callPackage file ({inherit buildApp;} // inputs);
+  in
+    listToAttrs (map (x: nameValuePair x (callPackage ./${x})) [
+      "extract-subs"
+      "gen-docs"
+      "mc-mods"
+      "pin-inputs"
+      "update-sources"
+    ]);
+})
diff --git a/configurations/bbsteamie/modules/desktop/steam.nix b/configurations/bbsteamie/modules/desktop/steam.nix
index c6dac307..84edd01d 100644
--- a/configurations/bbsteamie/modules/desktop/steam.nix
+++ b/configurations/bbsteamie/modules/desktop/steam.nix
@@ -3,7 +3,6 @@ defaultSession: {
   lib,
   mainUser,
   pkgs,
-  self,
   ...
 }: let
   inherit (lib) attrValues makeSearchPathOutput;
@@ -16,7 +15,7 @@ in {
 
       remotePlay.openFirewall = true;
       extraCompatPackages = [
-        self.packages.${pkgs.system}.proton-ge-latest
+        pkgs.selfPackages.proton-ge-latest
       ];
 
       # https://github.com/NixOS/nixpkgs/issues/25444#issuecomment-1977416787
@@ -75,7 +74,7 @@ in {
       pkgs.steam-rom-manager
       pkgs.r2modman
 
-      self.packages.${pkgs.system}.protonhax
+      pkgs.selfPackages.protonhax
 
       # Ryujinx ACNH crashes on Vulkan
       pkgs.ryujinx
diff --git a/configurations/binto/modules/gpu-replay/default.nix b/configurations/binto/modules/gpu-replay/default.nix
index 549c86a0..352a3ec3 100644
--- a/configurations/binto/modules/gpu-replay/default.nix
+++ b/configurations/binto/modules/gpu-replay/default.nix
@@ -3,11 +3,10 @@
   lib,
   mainUser,
   pkgs,
-  self,
   ...
 }: let
   inherit (lib) concatStringsSep getExe removePrefix;
-  inherit (self.packages.${pkgs.system}) gpu-screen-recorder gsr-kms-server;
+  inherit (pkgs.selfPackages) gpu-screen-recorder gsr-kms-server;
 
   hyprPkgs = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland.finalPackage;
 
diff --git a/configurations/binto/modules/nix-gaming/default.nix b/configurations/binto/modules/nix-gaming/default.nix
index 427f47cf..435942bb 100644
--- a/configurations/binto/modules/nix-gaming/default.nix
+++ b/configurations/binto/modules/nix-gaming/default.nix
@@ -1,7 +1,6 @@
 {
   nix-gaming,
   pkgs,
-  self,
   ...
 }: {
   imports = [
@@ -15,7 +14,7 @@
       remotePlay.openFirewall = true;
 
       extraCompatPackages = [
-        self.packages.${pkgs.system}.proton-ge-latest
+        pkgs.selfPackages.proton-ge-latest
       ];
 
       platformOptimizations.enable = true;
diff --git a/configurations/homie/modules/home-assistant/assist.nix b/configurations/homie/modules/home-assistant/assist.nix
index 639fda44..2552222c 100644
--- a/configurations/homie/modules/home-assistant/assist.nix
+++ b/configurations/homie/modules/home-assistant/assist.nix
@@ -26,7 +26,7 @@
 
       customComponents = builtins.attrValues {
         inherit
-          (self.scopedPackages.${pkgs.system}.hass-components)
+          (pkgs.scopedPackages.hass-components)
           extended-ollama-conversation # url is without subdirectory
           tuya-local
           ;
diff --git a/configurations/homie/modules/home-assistant/default.nix b/configurations/homie/modules/home-assistant/default.nix
index d0517a00..37d43319 100644
--- a/configurations/homie/modules/home-assistant/default.nix
+++ b/configurations/homie/modules/home-assistant/default.nix
@@ -35,7 +35,7 @@
 
     customComponents = builtins.attrValues {
       inherit
-        (self.scopedPackages.${pkgs.system}.hass-components)
+        (pkgs.scopedPackages.hass-components)
         yamaha-soundbar
         ;
     };
diff --git a/configurations/homie/modules/home-assistant/frontend.nix b/configurations/homie/modules/home-assistant/frontend.nix
index 567f8039..1f6dd58d 100644
--- a/configurations/homie/modules/home-assistant/frontend.nix
+++ b/configurations/homie/modules/home-assistant/frontend.nix
@@ -3,13 +3,12 @@
   dracul-ha-src,
   lib,
   pkgs,
-  self,
   ...
 }: let
   inherit (lib) attrValues singleton;
   inherit (pkgs.writers) writeYAML;
 
-  material-rounded-theme-src = self.scopedPackages.${pkgs.system}.lovelace-components.material-rounded-theme.src;
+  material-rounded-theme-src = pkgs.scopedPackages.lovelace-components.material-rounded-theme.src;
 in {
   services.home-assistant = {
     configFiles = {
@@ -84,7 +83,7 @@ in {
 
     customComponents = attrValues {
       inherit
-        (self.scopedPackages.${pkgs.system}.hass-components)
+        (pkgs.scopedPackages.hass-components)
         material-symbols
         ;
     };
@@ -98,7 +97,7 @@ in {
         ;
 
       inherit
-        (self.scopedPackages.${pkgs.system}.lovelace-components)
+        (pkgs.scopedPackages.lovelace-components)
         big-slider-card
         custom-sidebar
         material-rounded-theme
diff --git a/configurations/homie/modules/home-assistant/netdaemon/default.nix b/configurations/homie/modules/home-assistant/netdaemon/default.nix
index 263702ca..9570798a 100644
--- a/configurations/homie/modules/home-assistant/netdaemon/default.nix
+++ b/configurations/homie/modules/home-assistant/netdaemon/default.nix
@@ -34,7 +34,7 @@ in {
   services.home-assistant = {
     customComponents = attrValues {
       inherit
-        (self.scopedPackages.${pkgs.system}.hass-components)
+        (pkgs.scopedPackages.hass-components)
         netdaemon
         ;
     };
diff --git a/configurations/homie/modules/home-assistant/spotify/default.nix b/configurations/homie/modules/home-assistant/spotify/default.nix
index 32e7063b..e315810e 100644
--- a/configurations/homie/modules/home-assistant/spotify/default.nix
+++ b/configurations/homie/modules/home-assistant/spotify/default.nix
@@ -1,13 +1,12 @@
 {
   config,
   pkgs,
-  self,
   ...
 }: {
   services.home-assistant = {
     customComponents = builtins.attrValues {
       inherit
-        (self.scopedPackages.${pkgs.system}.hass-components)
+        (pkgs.scopedPackages.hass-components)
         spotifyplus
         ;
     };
diff --git a/configurations/nos/modules/docker/music/jbots/compose.nix b/configurations/nos/modules/docker/music/jbots/compose.nix
index 8d937fe3..8025bde0 100644
--- a/configurations/nos/modules/docker/music/jbots/compose.nix
+++ b/configurations/nos/modules/docker/music/jbots/compose.nix
@@ -1,9 +1,5 @@
-{configPath, ...}: {
-  pkgs,
-  self,
-  ...
-}: let
-  inherit (self.packages.${pkgs.system}) jmusicbot;
+{configPath, ...}: {pkgs, ...}: let
+  inherit (pkgs.selfPackages) jmusicbot;
 
   rwPath = configPath + "/music/jbots";
   image = pkgs.callPackage ./images/jmusicbot.nix {inherit pkgs jmusicbot;};
diff --git a/configurations/nos/modules/homepage/default.nix b/configurations/nos/modules/homepage/default.nix
index 8ce57124..802d025e 100644
--- a/configurations/nos/modules/homepage/default.nix
+++ b/configurations/nos/modules/homepage/default.nix
@@ -1,13 +1,12 @@
 {
   config,
   pkgs,
-  self,
   ...
 }: {
   services.homepage-dashboard = {
     enable = true;
 
-    package = self.packages.${pkgs.system}.homepage;
+    package = pkgs.selfPackages.homepage;
 
     listenPort = 3020;
 
diff --git a/configurations/nos/modules/subtitles/default.nix b/configurations/nos/modules/subtitles/default.nix
index c06dec80..915fa221 100644
--- a/configurations/nos/modules/subtitles/default.nix
+++ b/configurations/nos/modules/subtitles/default.nix
@@ -2,11 +2,10 @@
   config,
   mainUser,
   pkgs,
-  self,
   ...
 } @ extraArgs: let
-  inherit (self.appsPackages.${pkgs.system}) extract-subs;
-  inherit (self.packages.${pkgs.system}) subscleaner;
+  inherit (pkgs.appsPackages) extract-subs;
+  inherit (pkgs.selfPackages) subscleaner;
 
   convert-mkv = pkgs.callPackage ./convert.nix {};
   bazarr-bulk = pkgs.callPackage ./syncing.nix ({} // extraArgs);
diff --git a/configurations/wim/default.nix b/configurations/wim/default.nix
index ae0048a0..3eabe900 100644
--- a/configurations/wim/default.nix
+++ b/configurations/wim/default.nix
@@ -97,7 +97,7 @@
     enable = true;
     theme = "dracula";
     themePackages = [
-      self.scopedPackages.${pkgs.system}.dracula.plymouth
+      pkgs.scopedPackages.dracula.plymouth
     ];
   };
 
diff --git a/configurations/wim/modules/security/default.nix b/configurations/wim/modules/security/default.nix
index 80cd03c2..89a9cf69 100644
--- a/configurations/wim/modules/security/default.nix
+++ b/configurations/wim/modules/security/default.nix
@@ -1,11 +1,10 @@
 {
   lib,
   pkgs,
-  self,
   ...
 }: let
   inherit (lib) mkDefault mkBefore;
-  inherit (self.packages.${pkgs.system}) pam-fprint-grosshack;
+  inherit (pkgs.selfPackages) pam-fprint-grosshack;
 
   pam_fprintd_grosshackSo = "${pam-fprint-grosshack}/lib/security/pam_fprintd_grosshack.so";
 
diff --git a/devShells/neovim-shells/default.nix b/devShells/neovim-shells/default.nix
index 295a5bb1..98e421f0 100644
--- a/devShells/neovim-shells/default.nix
+++ b/devShells/neovim-shells/default.nix
@@ -9,9 +9,12 @@
         l:
           nameValuePair
           l
-          ((pkgs.callPackage "${self}/homeManagerModules/neovim/langs/${l}/shell.nix" {inherit self;}).overrideAttrs (o: {
-            meta.description = "${l} shell to be loaded by my Neovim config dynamically.";
-          }))
+          ((pkgs.callPackage
+              "${self}/homeManagerModules/neovim/langs/${l}/shell.nix"
+              ({} // pkgs.selfPackages))
+            .overrideAttrs (o: {
+              meta.description = "${l} shell to be loaded by my Neovim config dynamically.";
+            }))
       )
       langs);
 in
diff --git a/homeManagerModules/firefox/default.nix b/homeManagerModules/firefox/default.nix
index 232ab47c..5460d686 100644
--- a/homeManagerModules/firefox/default.nix
+++ b/homeManagerModules/firefox/default.nix
@@ -4,7 +4,7 @@ self: {
   pkgs,
   ...
 }: let
-  inherit (self.scopedPackages.${pkgs.system}) firefoxAddons;
+  inherit (pkgs.scopedPackages) firefoxAddons;
 
   inherit (lib) attrsToList attrValues mkIf mkOption singleton types;
 
diff --git a/homeManagerModules/neovim/langs/web/shell.nix b/homeManagerModules/neovim/langs/web/shell.nix
index 7866b255..bca918e4 100644
--- a/homeManagerModules/neovim/langs/web/shell.nix
+++ b/homeManagerModules/neovim/langs/web/shell.nix
@@ -4,8 +4,7 @@
   nodejs_latest,
   vscode-langservers-extracted,
   nodePackages,
-  self,
-  system,
+  some-sass-language-server,
   ...
 }:
 mkShell {
@@ -16,6 +15,6 @@ mkShell {
 
     nodePackages.npm
 
-    self.packages.${system}.some-sass-language-server
+    some-sass-language-server
   ];
 }
diff --git a/homeManagerModules/shell/default.nix b/homeManagerModules/shell/default.nix
index 4c38fcfc..470350c0 100644
--- a/homeManagerModules/shell/default.nix
+++ b/homeManagerModules/shell/default.nix
@@ -9,10 +9,10 @@ self: {
 in {
   imports = [
     ./starship
+    ./trash
     (import ./git self)
     (import ./misc self)
     (import ./nix-tools self)
-    (import ./trash self)
   ];
 
   options.programs.bash = {
diff --git a/homeManagerModules/shell/git/default.nix b/homeManagerModules/shell/git/default.nix
index d1961ec2..4532cba4 100644
--- a/homeManagerModules/shell/git/default.nix
+++ b/homeManagerModules/shell/git/default.nix
@@ -26,7 +26,7 @@ in {
       signing.format = "ssh";
 
       includes = [
-        {path = toString self.scopedPackages.${pkgs.system}.dracula.git;}
+        {path = toString pkgs.scopedPackages.dracula.git;}
 
         (mkDefaultRemote "https://github.com")
         (mkDefaultRemote "git@github.com")
diff --git a/homeManagerModules/shell/misc/default.nix b/homeManagerModules/shell/misc/default.nix
index 42aa4353..61221c25 100644
--- a/homeManagerModules/shell/misc/default.nix
+++ b/homeManagerModules/shell/misc/default.nix
@@ -48,7 +48,7 @@ in {
       enable = true;
 
       config.theme = "dracula-bat";
-      themes.dracula-bat.src = self.scopedPackages.${pkgs.system}.dracula.bat;
+      themes.dracula-bat.src = pkgs.scopedPackages.dracula.bat;
 
       extraPackages = attrValues {
         inherit (pkgs.bat-extras) batman;
diff --git a/homeManagerModules/shell/trash/default.nix b/homeManagerModules/shell/trash/default.nix
index 50ab2987..22619966 100644
--- a/homeManagerModules/shell/trash/default.nix
+++ b/homeManagerModules/shell/trash/default.nix
@@ -1,4 +1,4 @@
-self: {
+{
   config,
   lib,
   pkgs,
@@ -7,7 +7,7 @@ self: {
   inherit (lib) elem mkIf;
 
   cfg = config.programs.bash;
-  trashPkg = self.packages.${pkgs.system}.trash-d;
+  trashPkg = pkgs.selfPackages.trash-d;
   isCorrectPlatform = elem pkgs.system (trashPkg.meta.platforms or [pkgs.system]);
 in {
   config = mkIf (cfg.enable && isCorrectPlatform) {
@@ -15,7 +15,4 @@ in {
 
     programs.bash.shellAliases.rm = "trash";
   };
-
-  # For accurate stack trace
-  _file = ./default.nix;
 }
diff --git a/lib/flake/default.nix b/lib/flake/default.nix
index 363ef5a1..b6ec7a1b 100644
--- a/lib/flake/default.nix
+++ b/lib/flake/default.nix
@@ -15,6 +15,9 @@ in rec {
         [
           (inputs.self.overlays.nix-version {inherit nix;})
           inputs.self.overlays.misc-fixes
+          inputs.self.overlays.appsPackages
+          inputs.self.overlays.selfPackages
+          inputs.self.overlays.scopedPackages
         ]
         ++ (cfg.overlays or []);
       config =
diff --git a/modules/ags/packages.nix b/modules/ags/packages.nix
index ec95ca95..8407e49d 100644
--- a/modules/ags/packages.nix
+++ b/modules/ags/packages.nix
@@ -34,6 +34,7 @@ in {
         extraPackages = cfg.astalLibs;
 
         # FIXME: this makes sure we use my overlayed version for gtk4-session-lock
+        # try to fix this with overlays
         gtk4-layer-shell = pkgs.gtk4-layer-shell;
       };
 
@@ -116,7 +117,7 @@ in {
             wayfreeze
             ;
           inherit
-            (self.packages.${pkgs.system})
+            (pkgs.selfPackages)
             coloryou
             ;
         })
diff --git a/modules/base/packages/default.nix b/modules/base/packages/default.nix
index 8e0798e9..d4f5fa4a 100644
--- a/modules/base/packages/default.nix
+++ b/modules/base/packages/default.nix
@@ -22,7 +22,7 @@ in {
 
     environment.systemPackages = remove null (attrValues {
       inherit
-        (self.packages.${pkgs.system})
+        (pkgs.selfPackages)
         pokemon-colorscripts
         repl
         ;
diff --git a/modules/desktop/environment/default.nix b/modules/desktop/environment/default.nix
index d5e413af..4d32aa6a 100644
--- a/modules/desktop/environment/default.nix
+++ b/modules/desktop/environment/default.nix
@@ -25,9 +25,9 @@ in {
 
     ./modules/dconf.nix
     ./modules/printer.nix
+    ./modules/ratbag-mice.nix
     (import ./modules/audio.nix self)
     (import ./modules/packages.nix self)
-    (import ./modules/ratbag-mice.nix self)
     (import ./modules/security.nix self)
   ];
 
diff --git a/modules/desktop/environment/home/mpv.nix b/modules/desktop/environment/home/mpv.nix
index 40ac4617..2201b776 100644
--- a/modules/desktop/environment/home/mpv.nix
+++ b/modules/desktop/environment/home/mpv.nix
@@ -4,7 +4,7 @@ self: {
   pkgs,
   ...
 }: let
-  inherit (self.scopedPackages.${pkgs.system}) mpvScripts;
+  inherit (pkgs.scopedPackages) mpvScripts;
 
   inherit (lib) attrValues mkIf;
 
diff --git a/modules/desktop/environment/modules/packages.nix b/modules/desktop/environment/modules/packages.nix
index a0914bdd..1c10eb8b 100644
--- a/modules/desktop/environment/modules/packages.nix
+++ b/modules/desktop/environment/modules/packages.nix
@@ -155,7 +155,7 @@ in {
             startup_commands = "toggle_custom_color";
             ui_font = "JetBrainsMono Nerd Font Mono Regular";
             font_size = "24";
-            source = toString self.scopedPackages.${pkgs.system}.dracula.sioyek;
+            source = toString pkgs.scopedPackages.dracula.sioyek;
           };
         };
       };
diff --git a/modules/desktop/environment/modules/ratbag-mice.nix b/modules/desktop/environment/modules/ratbag-mice.nix
index 61dbcf0a..c788072e 100644
--- a/modules/desktop/environment/modules/ratbag-mice.nix
+++ b/modules/desktop/environment/modules/ratbag-mice.nix
@@ -1,10 +1,10 @@
-self: {
+{
   config,
   lib,
   pkgs,
   ...
 }: let
-  inherit (self.packages.${pkgs.system}) libratbag piper;
+  inherit (pkgs.selfPackages) libratbag piper;
   inherit (lib) mkIf;
 
   cfg = config.roles.desktop;
@@ -20,7 +20,4 @@ in {
       piper
     ];
   };
-
-  # For accurate stack trace
-  _file = ./ratbag-mice.nix;
 }
diff --git a/modules/desktop/theme/cursors/default.nix b/modules/desktop/theme/cursors/default.nix
index 40a09334..cd6a973b 100644
--- a/modules/desktop/theme/cursors/default.nix
+++ b/modules/desktop/theme/cursors/default.nix
@@ -4,7 +4,7 @@ self: {
   pkgs,
   ...
 }: let
-  inherit (self.scopedPackages.${pkgs.system}) dracula;
+  inherit (pkgs.scopedPackages) dracula;
 
   inherit (lib) mkIf;
 
diff --git a/modules/desktop/theme/hyprpaper/default.nix b/modules/desktop/theme/hyprpaper/default.nix
index 53eecc00..1c5f89a6 100644
--- a/modules/desktop/theme/hyprpaper/default.nix
+++ b/modules/desktop/theme/hyprpaper/default.nix
@@ -9,7 +9,7 @@ self: {
   cfg = osConfig.roles.desktop;
 
   hyprpaper = self.inputs.hyprpaper.packages.${pkgs.system}.default;
-  wallpaper = toString self.scopedPackages.${pkgs.system}.dracula.wallpaper;
+  wallpaper = toString pkgs.scopedPackages.dracula.wallpaper;
 in {
   config = mkIf cfg.enable {
     home.packages = [hyprpaper];
diff --git a/modules/desktop/theme/qt/default.nix b/modules/desktop/theme/qt/default.nix
index 44cb6390..e34229ee 100644
--- a/modules/desktop/theme/qt/default.nix
+++ b/modules/desktop/theme/qt/default.nix
@@ -4,7 +4,7 @@ self: {
   pkgs,
   ...
 }: let
-  inherit (self.scopedPackages.${pkgs.system}) dracula;
+  inherit (pkgs.scopedPackages) dracula;
 
   inherit (lib) mkIf;
 
diff --git a/nixFastChecks/apps/default.nix b/nixFastChecks/apps/default.nix
index b4726df0..9b171d08 100644
--- a/nixFastChecks/apps/default.nix
+++ b/nixFastChecks/apps/default.nix
@@ -1,10 +1,7 @@
-{
-  pkgs,
-  self,
-}: let
+pkgs: let
   inherit (pkgs.lib) mapAttrs' nameValuePair;
 in
   mapAttrs'
   (name: app:
     nameValuePair "app_${name}" app)
-  self.appsPackages.${pkgs.system}
+  pkgs.appsPackages
diff --git a/nixFastChecks/default.nix b/nixFastChecks/default.nix
index a9ee048d..8793f4eb 100644
--- a/nixFastChecks/default.nix
+++ b/nixFastChecks/default.nix
@@ -7,10 +7,10 @@
 }: let
   inherit (self.lib.attrs) recursiveUpdateList;
 
-  apps = perSystem (pkgs: import ./apps {inherit pkgs self;});
+  apps = perSystem (import ./apps);
   devices = perSystem (pkgs: import ./devices {inherit pkgs self;});
   devShells = perSystem (pkgs: import ./devShells {inherit pkgs self;});
-  packages = perSystem (pkgs: import ./packages {inherit pkgs self;});
+  packages = perSystem (import ./packages);
 in {
   inherit apps devices devShells packages;
 
diff --git a/nixFastChecks/packages/default.nix b/nixFastChecks/packages/default.nix
index e9615215..6476bf31 100644
--- a/nixFastChecks/packages/default.nix
+++ b/nixFastChecks/packages/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs,
-  self,
-}: let
+pkgs: let
   inherit (pkgs.lib) elem filterAttrs hasAttr mapAttrs' nameValuePair;
 
   packages =
@@ -10,7 +7,7 @@
         !(hasAttr "platforms" v.meta)
         || elem pkgs.system v.meta.platforms
     )
-    self.packages.${pkgs.system};
+    pkgs.selfPackages;
 in
   mapAttrs'
   (name: pkg:
diff --git a/overlays/default.nix b/overlays/default.nix
index 058e5328..fe6307c3 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -2,11 +2,23 @@
   self ? {},
   description ? false,
 }: let
+  inputs = self.inputs // {inherit self;};
+
   overlay = mod: desc:
     if description
     then desc
     else mod;
 in {
+  appsPackages =
+    overlay
+    (import ../apps/packages.nix {
+      inherit inputs;
+    })
+    ''
+      This overlay puts every derivations for apps exposed by this flake
+      under pkgs.appsPackages.
+    '';
+
   misc-fixes =
     overlay
     (import ./misc-fixes)
@@ -22,6 +34,28 @@ in {
       Overrides the nix package for everything so I don't need multiple versions.
     '';
 
+  scopedPackages =
+    overlay
+    (import ../scopedPackages {
+      inherit (self.lib) mkVersion;
+      inherit inputs;
+    })
+    ''
+      This overlay puts every package scopes exposed by this flake
+      under pkgs.scopedPackages.
+    '';
+
+  selfPackages =
+    overlay
+    (import ../packages {
+      inherit (self.lib) mkVersion;
+      inherit inputs;
+    })
+    ''
+      This overlay puts every derivations for packages exposed by this flake
+      under pkgs.selfPackages.
+    '';
+
   xdg-desktop-portal-kde =
     overlay
     (import ./xdg-desktop-portal-kde)
diff --git a/packages/default.nix b/packages/default.nix
index 4d6cf7cc..e4aadb10 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -1,54 +1,55 @@
 {
   inputs,
   mkVersion,
-  pkgs,
   ...
-}: {
-  coloryou = pkgs.callPackage ./coloryou {};
+}: (final: prev: {
+  selfPackages = {
+    coloryou = final.callPackage ./coloryou {};
 
-  gpu-screen-recorder = pkgs.callPackage ./gpu-screen-recorder/gpu-screen-recorder.nix {
-    inherit (inputs) gpu-screen-recorder-src;
+    gpu-screen-recorder = final.callPackage ./gpu-screen-recorder/gpu-screen-recorder.nix {
+      inherit (inputs) gpu-screen-recorder-src;
+    };
+    gsr-kms-server = final.callPackage ./gpu-screen-recorder/gsr-kms-server.nix {
+      inherit (inputs) gpu-screen-recorder-src;
+    };
+
+    homepage = final.callPackage ./homepage {};
+
+    jmusicbot = final.callPackage ./jmusicbot {};
+
+    libratbag = final.callPackage ./libratbag {
+      inherit (inputs) libratbag-src;
+    };
+
+    librespot-auth = final.callPackage ./librespot-auth {};
+
+    pam-fprint-grosshack = final.callPackage ./pam-fprint-grosshack {};
+
+    piper = final.callPackage ./piper {
+      inherit (inputs) piper-src;
+    };
+
+    pokemon-colorscripts = final.callPackage ./pokemon-colorscripts {
+      inherit (inputs) pokemon-colorscripts-src;
+      inherit mkVersion;
+    };
+
+    proton-ge-latest = final.callPackage ./proton-ge-latest {};
+
+    protonhax = final.callPackage ./protonhax {};
+
+    repl = final.callPackage ./repl {};
+
+    some-sass-language-server = final.callPackage ./some-sass-language-server {};
+
+    subscleaner = final.callPackage ./subscleaner {
+      inherit (inputs) poetry2nix subscleaner-src;
+    };
+
+    trash-d = final.callPackage ./trash-d {
+      inherit (inputs) trash-d-src;
+    };
+
+    urllib3 = final.callPackage ./urllib3 {};
   };
-  gsr-kms-server = pkgs.callPackage ./gpu-screen-recorder/gsr-kms-server.nix {
-    inherit (inputs) gpu-screen-recorder-src;
-  };
-
-  homepage = pkgs.callPackage ./homepage {};
-
-  jmusicbot = pkgs.callPackage ./jmusicbot {};
-
-  libratbag = pkgs.callPackage ./libratbag {
-    inherit (inputs) libratbag-src;
-  };
-
-  librespot-auth = pkgs.callPackage ./librespot-auth {};
-
-  pam-fprint-grosshack = pkgs.callPackage ./pam-fprint-grosshack {};
-
-  piper = pkgs.callPackage ./piper {
-    inherit (inputs) piper-src;
-  };
-
-  pokemon-colorscripts = pkgs.callPackage ./pokemon-colorscripts {
-    inherit (inputs) pokemon-colorscripts-src;
-    inherit mkVersion;
-  };
-
-  proton-ge-latest = pkgs.callPackage ./proton-ge-latest {};
-
-  protonhax = pkgs.callPackage ./protonhax {};
-
-  repl = pkgs.callPackage ./repl {};
-
-  some-sass-language-server = pkgs.callPackage ./some-sass-language-server {};
-
-  subscleaner = pkgs.callPackage ./subscleaner {
-    inherit (inputs) poetry2nix subscleaner-src;
-  };
-
-  trash-d = pkgs.callPackage ./trash-d {
-    inherit (inputs) trash-d-src;
-  };
-
-  urllib3 = pkgs.callPackage ./urllib3 {};
-}
+})
diff --git a/scopedPackages/default.nix b/scopedPackages/default.nix
index e0047cc7..947980c1 100644
--- a/scopedPackages/default.nix
+++ b/scopedPackages/default.nix
@@ -1,35 +1,36 @@
 {
   inputs ? {},
   mkVersion ? {},
-  pkgs ? {},
   description ? false,
-}: let
-  inherit (pkgs.lib) recurseIntoAttrs;
+}: (final: prev: let
+  inherit (final.lib) recurseIntoAttrs;
 
   mkScope = file: desc:
     if description
     then desc
     else
       recurseIntoAttrs
-      (pkgs.callPackage file ({inherit mkVersion;} // inputs));
+      (final.callPackage file ({inherit mkVersion;} // inputs));
 in {
-  dracula = mkScope ./dracula ''
-    Custom derivations that each represent an app's Dracula Theme.
-  '';
+  scopedPackages = {
+    dracula = mkScope ./dracula ''
+      Custom derivations that each represent an app's Dracula Theme.
+    '';
 
-  firefoxAddons = mkScope ./firefox-addons ''
-    Every extensions I use in my firefox module.
-  '';
+    firefoxAddons = mkScope ./firefox-addons ''
+      Every extensions I use in my firefox module.
+    '';
 
-  hass-components = mkScope ./hass-components ''
-    Components I use for Home-Assistant that aren't in nixpkgs.
-  '';
+    hass-components = mkScope ./hass-components ''
+      Components I use for Home-Assistant that aren't in nixpkgs.
+    '';
 
-  lovelace-components = mkScope ./lovelace-components ''
-    Lovelace components I use for Home-Assistant that aren't in nixpkgs.
-  '';
+    lovelace-components = mkScope ./lovelace-components ''
+      Lovelace components I use for Home-Assistant that aren't in nixpkgs.
+    '';
 
-  mpvScripts = mkScope ./mpv-scripts ''
-    MPV scripts I use that aren't in nixpkgs.
-  '';
-}
+    mpvScripts = mkScope ./mpv-scripts ''
+      MPV scripts I use that aren't in nixpkgs.
+    '';
+  };
+})
diff --git a/scopedPackages/hass-components/spotifyplus/overrides.nix b/scopedPackages/hass-components/spotifyplus/overrides.nix
index 60cb9210..83b84c79 100644
--- a/scopedPackages/hass-components/spotifyplus/overrides.nix
+++ b/scopedPackages/hass-components/spotifyplus/overrides.nix
@@ -1,5 +1,4 @@
 {
-  self,
   smartinspect-src,
   spotifywebapi-src,
   pkgs,
@@ -11,7 +10,7 @@
   spotifywebapi = pkgs.callPackage ./spotifywebapi.nix {
     inherit python3Packages smartinspect spotifywebapi-src;
   };
-  urllib3 = self.packages.${pkgs.system}.urllib3.override {
+  urllib3 = pkgs.selfPackages.urllib3.override {
     inherit python3Packages;
   };
 }