From 2be4c7cfbd499bc38dd3743418a4656a8507875c Mon Sep 17 00:00:00 2001
From: Myned <dev@bjork.tech>
Date: Sat, 4 Jan 2025 12:15:28 -0600
Subject: [PATCH] nix: use module packages instead of overlay

Signed-off-by: Myned <dev@bjork.tech>
---
 options/custom/desktops/sway/swayfx.nix | 4 +++-
 options/custom/programs/onlyoffice.nix  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/options/custom/desktops/sway/swayfx.nix b/options/custom/desktops/sway/swayfx.nix
index dc53f75..01272bf 100644
--- a/options/custom/desktops/sway/swayfx.nix
+++ b/options/custom/desktops/sway/swayfx.nix
@@ -11,6 +11,8 @@ in {
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {
     # https://github.com/WillPower3309/swayfx
+    programs.sway.package = pkgs.swayfx;
+
     wayland.windowManager.sway = {
       # BUG: DRM build failure
       # https://github.com/nix-community/home-manager/issues/5379
@@ -19,7 +21,7 @@ in {
       # Polyfill home-manager wrappers
       # https://github.com/nix-community/home-manager/blob/master/modules/services/window-managers/i3-sway/sway.nix#L334
       package = with config.home-manager.users.${config.custom.username}.wayland.windowManager.sway;
-        pkgs.sway.override {
+        config.programs.sway.package.override {
           extraSessionCommands = extraSessionCommands;
           extraOptions = extraOptions;
           withBaseWrapper = wrapperFeatures.base;
diff --git a/options/custom/programs/onlyoffice.nix b/options/custom/programs/onlyoffice.nix
index cf85823..7b38ae2 100644
--- a/options/custom/programs/onlyoffice.nix
+++ b/options/custom/programs/onlyoffice.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib; let
-  hyprctl = "${pkgs.hyprland}/bin/hyprctl";
+  hyprctl = "${config.programs.hyprland.package}/bin/hyprctl";
   onlyoffice-desktopeditors = "${pkgs.onlyoffice-bin}/bin/onlyoffice-desktopeditors --system-title-bar --xdg-desktop-portal";
 
   cfg = config.custom.programs.onlyoffice;