1 files changed, 10 insertions, 20 deletions
diff --git a/flake.nix b/flake.nix
index 5333f1a2..99cbdd93 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,22 +11,14 @@
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     nh-darwin.url = "github:ToyVo/nh_darwin";
-    secrets = {
-      flake = false;
-      url = "git+file:private";
-    };
     utils.url = "github:numtide/flake-utils";
     agenix.url = "github:ryantm/agenix";
     agenix.inputs.nixpkgs.follows = "nixpkgs";
     deploy-rs.url = "github:serokell/deploy-rs";
-    personal = {
-      url = "git+file:packages";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     searchix.url = "git+https://git.alanpearce.eu/searchix";
     golink = {
       url = "github:tailscale/golink";
-      inputs.nixpkgs.follows = "nixpkgs-small";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
@@ -42,9 +34,7 @@
     , darwin
     , nh-darwin
     , nix-index-database
-    , secrets
     , agenix
-    , personal
     , deploy-rs
     , searchix
     , golink
@@ -69,7 +59,7 @@
             agenix.overlays.default
             emacs-overlay.overlays.default
             (self: super: {
-              personal = personal.packages.${system};
+              personal = import ./packages/overlay.nix self super;
               enchant = super.enchant.override {
                 withHspell = false;
                 withAspell = false;
@@ -114,7 +104,7 @@
           agenix.nixosModules.default
           searchix.nixosModules.web
           golink.nixosModules.default
-          personal.nixosModules.laminar
+          ./packages/modules/nixos/laminar.nix
           ./system/linde.nix
         ];
       };
@@ -123,42 +113,42 @@
         specialArgs = { inherit inputs; };
         modules = [
           ./system/marvin.nix
+          ./packages/modules/darwin/caddy
           nh-darwin.nixDarwinModules.prebuiltin
-          personal.darwinModules.caddy
         ];
       };
       homeConfigurations."alan@marvin" = mkHomeConfiguration {
         system = utils.lib.system.aarch64-darwin;
         modules = [
           ./user/marvin.nix
+          ./private/default.nix
+          ./private/ssh.nix
           nix-index-database.hmModules.nix-index
-          (secrets + "/default.nix")
-          (secrets + "/ssh.nix")
         ];
       };
       homeConfigurations."alan@prefect" = mkHomeConfiguration {
         system = utils.lib.system.x86_64-linux;
         modules = [
           ./user/prefect.nix
+          ./private/default.nix
+          ./private/ssh.nix
           nix-index-database.hmModules.nix-index
-          (secrets + "/default.nix")
-          (secrets + "/ssh.nix")
         ];
       };
       homeConfigurations."alan@nanopi" = mkHomeConfiguration {
         system = utils.lib.system.aarch64-linux;
         modules = [
           ./user/nanopi.nix
+          ./private/default.nix
           nix-index-database.hmModules.nix-index
-          (secrets + "/default.nix")
         ];
       };
       homeConfigurations."alan@linde" = mkHomeConfiguration {
         system = utils.lib.system.aarch64-linux;
         modules = [
           ./user/server.nix
+          ./private/default.nix
           nix-index-database.hmModules.nix-index
-          (secrets + "/default.nix")
         ];
       };