diff --git a/hosts/othalan/default.nix b/hosts/othalan/default.nix
index ab3765b..7a93ac0 100644
--- a/hosts/othalan/default.nix
+++ b/hosts/othalan/default.nix
@@ -9,7 +9,7 @@
     restic
     docker
   ];
-  nixpkgs.overlays = [inputs.pinix.overlays.default];
+
   cli.enable = true;
   desktop.enable = true;
 
diff --git a/lib/default.nix b/lib/default.nix
index 2e3f341..2a36d20 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -32,9 +32,16 @@ in rec {
   mkSystem = hostname:
     nixosSystem {
       system = "x86_64-linux";
-      modules =
-        [../modules/common.nix]
+      modules = [
+          ../modules/common.nix
+
+          # ({...}: nixpkgs.overlays = [ import ../overlays {}; ])
+          (_:
+            { nixpkgs.overlays = import ../overlays _ ++
+              [inputs.pinix.overlays.default]; })
+        ]
         ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostname}"));
+
       specialArgs = {inherit inputs mkRune;};
     };
   mapHosts = dir: mapAttrs (name: _: mkSystem name) (readDir dir);
diff --git a/modules/langs/nim.nix b/modules/langs/nim.nix
index 3481bb5..78da2e0 100644
--- a/modules/langs/nim.nix
+++ b/modules/langs/nim.nix
@@ -10,15 +10,10 @@
 in {
   options.languages.nim = mkEnableOption "nim";
   config = mkIf cfg.nim {
-    nixpkgs.overlays = [
-      (import ../../overlays/nimlsp {})
-      (import ../../overlays/nimble {})
-      (import ../../overlays/nim-atlas {})
-    ];
-
     environment.systemPackages = with pkgs; [
-      nim-atlas
       nim
+
+      nim-atlas
       nimble
       nimlsp
     ];
diff --git a/overlays/hyprland/default.nix b/overlays/hyprland/default.nix
deleted file mode 100644
index fc0c5ae..0000000
--- a/overlays/hyprland/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{...}: (_final: prev: {
-  hyprland = prev.hyprland.overrideAttrs {
-    src = prev.fetchFromGitHub {
-      version = "main-20240121";
-      owner = "hyprwm";
-      repo = "Hyprland";
-      rev = "3c964a9fdc220250a85b1c498e5b6fad9390272f";
-      hash = "sha256-oIt4bUVXRR7qnBPizcPA7fTiZl4xz9QaSdzLNukjtkw=";
-    };
-  };
-})