From a8a1022c77671af2f4a82ae3473105b99de4184e Mon Sep 17 00:00:00 2001
From: Javier Feliz <javier0eduardo@hotmail.com>
Date: Sun, 7 Sep 2025 20:16:41 -0400
Subject: [PATCH] Flake attempt #30

---
 flake.lock                       | 37 +++++++++++++++++++++++++++++++-
 flake.nix                        | 22 +++++++++++--------
 modules/home-manager/waycast.nix | 14 +++++-------
 result                           |  1 +
 4 files changed, 55 insertions(+), 19 deletions(-)
 create mode 120000 result

diff --git a/flake.lock b/flake.lock
index e89ce79..bca7a4c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,7 +18,41 @@
         "type": "github"
       }
     },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1757256385,
+        "narHash": "sha256-WK7tOhWwr15mipcckhDg2no/eSpM1nIh4C9le8HgHhk=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "f35703b412c67b48e97beb6e27a6ab96a084cd37",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1757068644,
+        "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1756787288,
         "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
@@ -37,7 +71,8 @@
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "systems": {
diff --git a/flake.nix b/flake.nix
index a812752..7a8b31d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
+    home-manager.url = "github:nix-community/home-manager";
   };
 
   outputs =
@@ -11,14 +12,14 @@
       self,
       nixpkgs,
       flake-utils,
+      home-manager,
     }:
-    flake-utils.lib.eachDefaultSystem (
+    (flake-utils.lib.eachDefaultSystem (
       system:
       let
         # pkgs = nixpkgs.legacyPackages.${system};
         pkgs = import nixpkgs {
           inherit system;
-          overlays = [ self.overlay ];
         };
       in
       {
@@ -93,12 +94,15 @@
             adwaita-icon-theme
           ];
         };
+
+        overlays.default = final: prev: {
+          waycast = self.packages.${system}.default;
+        };
       }
-    );
-
-  overlay = final: prev: {
-    waycast = self.packages.${final.system}.default;
-  };
-
-  homeManagerModules.waycast = import ./modules/home-manager/waycast.nix;
+    )) // {
+      homeManagerModules.default = { pkgs, ... }: import ./modules/home-manager/waycast.nix {
+        inherit pkgs;
+        waycastPackage = self.packages.${pkgs.stdenv.hostPlatform.system}.default;
+      };
+    };
 }
diff --git a/modules/home-manager/waycast.nix b/modules/home-manager/waycast.nix
index 56eb31b..93fbb1c 100644
--- a/modules/home-manager/waycast.nix
+++ b/modules/home-manager/waycast.nix
@@ -1,9 +1,5 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ pkgs, waycastPackage }:
+{ config, lib, ... }:
 
 with lib;
 
@@ -20,7 +16,7 @@ in
 
     package = mkOption {
       type = types.package;
-      default = pkgs.waycast or (throw "waycast package not found in pkgs");
+      default = waycastPackage;
       description = "The waycast package to use";
     };
 
@@ -73,8 +69,8 @@ in
     home.packages = [ cfg.package ];
 
     xdg.configFile = mkMerge [
-      (mkIf (cfg.config != { }) {
-        "waycast/waycast.toml".source = toToml cfg.config;
+      (mkIf (cfg.settings != { }) {
+        "waycast/waycast.toml".source = toToml cfg.settings;
       })
 
       (mkIf (cfg.css != null) {
diff --git a/result b/result
new file mode 120000
index 0000000..50a9a37
--- /dev/null
+++ b/result
@@ -0,0 +1 @@
+/nix/store/rvkvjz9b92dd4qx4l78q31bb18lflz70-waycast-0.0.1
\ No newline at end of file