diff --git a/modules/home/files/default.nix b/modules/home/files/default.nix
index 465108f..5a0ff47 100644
--- a/modules/home/files/default.nix
+++ b/modules/home/files/default.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{ pkgs, config, ... }: {
   home.file = {
     "VMs" = {
       source = config.lib.file.mkOutOfStoreSymlink "/etc/libvirt/VMs";
diff --git a/modules/home/programs/misc/avtools/obs/obs.nix b/modules/home/programs/misc/avtools/obs/default.nix
similarity index 89%
rename from modules/home/programs/misc/avtools/obs/obs.nix
rename to modules/home/programs/misc/avtools/obs/default.nix
index 5ee8c4c..164ffe2 100644
--- a/modules/home/programs/misc/avtools/obs/obs.nix
+++ b/modules/home/programs/misc/avtools/obs/default.nix
@@ -1,4 +1,4 @@
-{pkgs, lib, config, ...}:
+{ pkgs, lib, config, ... }:
 {
   programs.obs-studio = {
     enable = true;
diff --git a/modules/home/programs/terminal/git/git.nix b/modules/home/programs/terminal/git/default.nix
similarity index 100%
rename from modules/home/programs/terminal/git/git.nix
rename to modules/home/programs/terminal/git/default.nix
diff --git a/modules/home/programs/terminal/neovim/neovim.nix b/modules/home/programs/terminal/neovim/default.nix
similarity index 100%
rename from modules/home/programs/terminal/neovim/neovim.nix
rename to modules/home/programs/terminal/neovim/default.nix
diff --git a/overlays/default.nix b/overlays/default.nix
index 4f761ea..8ddde1f 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -2,7 +2,8 @@
 {
   nixpkgs.overlays = [
     inputs.blender-bin.overlays.default
+    (final: _prev: import ./packages { pkgs = final; })
     (import ./mpv)
-    (import ./unstable)
+    #(import ./unstable { inherit inputs; })
   ];
 }
diff --git a/overlays/mpv/default.nix b/overlays/mpv/default.nix
index 7538162..306914a 100644
--- a/overlays/mpv/default.nix
+++ b/overlays/mpv/default.nix
@@ -1,5 +1,5 @@
 { ... }:
-(self: super: {
+self: super: {
   mpv = super.mpv.override {
     scripts = with self.mpvScripts; [
       mpris
@@ -7,4 +7,4 @@
       thumbnail
     ];
   };
-})
+}
diff --git a/packages/default.nix b/overlays/packages/default.nix
similarity index 100%
rename from packages/default.nix
rename to overlays/packages/default.nix
diff --git a/packages/hlsdk/default.nix b/overlays/packages/hlsdk/default.nix
similarity index 100%
rename from packages/hlsdk/default.nix
rename to overlays/packages/hlsdk/default.nix
diff --git a/packages/xash3d/change-zip-date.patch b/overlays/packages/xash3d/change-zip-date.patch
similarity index 100%
rename from packages/xash3d/change-zip-date.patch
rename to overlays/packages/xash3d/change-zip-date.patch
diff --git a/packages/xash3d/default.nix b/overlays/packages/xash3d/default.nix
similarity index 100%
rename from packages/xash3d/default.nix
rename to overlays/packages/xash3d/default.nix
diff --git a/overlays/unstable/default.nix b/overlays/unstable/default.nix
index da19bb8..afba743 100644
--- a/overlays/unstable/default.nix
+++ b/overlays/unstable/default.nix
@@ -1,7 +1,7 @@
-{ config, inputs, ... }:
-(final: prev: {
-  unstable = import inputs.nixpkgs-unstable {
+{ inputs, ... }:
+final: prev: {
+  unstable = import inputs.unstable {
     system = final.system;
     config.allowUnfree = true;
   };
-})
+}