Cleanup up overlays

hosts/surgat/default.nix

@@ -2,15 +2,9 @@
 let
   hostName = "surgat";
   this = import ../.. { inherit pkgs; };
-  keys = ../../pkgs/keys/keys;
-  homePage = self: super: { homePage = super.callPackage ../../pkgs/homePage { }; };
 in {
   imports = [ this.profiles.base ];
 
-  nixpkgs.overlays = [
-    homePage
-  ];
-
   networking.hostName = hostName;
 
   services.nginx = {
@@ -26,7 +20,7 @@ in {
   dadada.admin = {
     enable = true;
     users = {
-      "dadada" = [ "${keys}/dadada.pub" ];
+      "dadada" = [ "${pkgs.dadadaKeys}/dadada.pub" ];
     };
   };
 

modules/profiles/base/default.nix

@@ -1,15 +1,14 @@
 { config, pkgs, lib, ... }:
 with lib;
-let
-  dadadaKeys = ../../../pkgs/keys/keys;
-in
 {
+  nixpkgs.overlays = attrValues (import ../../../overlays);
+
   imports = import ../../module-list.nix;
 
   networking.domain = mkDefault "dadada.li";
 
   dadada.admin.users = {
-    "dadada" = [ "${dadadaKeys}/dadada.pub" ];
+    "dadada" = [ "${pkgs.dadadaKeys}/dadada.pub" ];
   };
 
   #dadada.autoUpgrade = mkDefault true;

overlays/default.nix

@@ -1,3 +1,9 @@
 {
   tubslatex = import ./tubslatex.nix;
+  dadadaKeys = self: super: {
+    dadadaKeys = super.callPackage ../pkgs/keys { };
+  };
+  homePage = self: super: {
+    homePage = super.callPackage ../pkgs/homePage { };
+  };
 }

pkgs/keys/default.nix

@@ -1,14 +1,16 @@
 { stdenv }:
 
 stdenv.mkDerivation rec {
-  pname = "infra-keys";
+  name = "dadadaKeys";
   version = "1";
 
   src = ./keys;
 
+  buildPhase = "";
+
   installPhase = ''
       mkdir $out
-      mv * $out
+      cp * $out
   '';
 
   meta = with stdenv.lib; {