1
1
Fork 0

nix: use module packages instead of overlay

Signed-off-by: Myned <dev@bjork.tech>
This commit is contained in:
Myned 2025-01-04 12:15:28 -06:00
parent 435887f016
commit 2be4c7cfbd
Signed by: Myned
GPG key ID: C7224454F7881A34
2 changed files with 4 additions and 2 deletions

View file

@ -11,6 +11,8 @@ in {
config.home-manager.users.${config.custom.username} = mkIf cfg.enable { config.home-manager.users.${config.custom.username} = mkIf cfg.enable {
# https://github.com/WillPower3309/swayfx # https://github.com/WillPower3309/swayfx
programs.sway.package = pkgs.swayfx;
wayland.windowManager.sway = { wayland.windowManager.sway = {
# BUG: DRM build failure # BUG: DRM build failure
# https://github.com/nix-community/home-manager/issues/5379 # https://github.com/nix-community/home-manager/issues/5379
@ -19,7 +21,7 @@ in {
# Polyfill home-manager wrappers # Polyfill home-manager wrappers
# https://github.com/nix-community/home-manager/blob/master/modules/services/window-managers/i3-sway/sway.nix#L334 # 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; package = with config.home-manager.users.${config.custom.username}.wayland.windowManager.sway;
pkgs.sway.override { config.programs.sway.package.override {
extraSessionCommands = extraSessionCommands; extraSessionCommands = extraSessionCommands;
extraOptions = extraOptions; extraOptions = extraOptions;
withBaseWrapper = wrapperFeatures.base; withBaseWrapper = wrapperFeatures.base;

View file

@ -5,7 +5,7 @@
... ...
}: }:
with lib; let 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"; onlyoffice-desktopeditors = "${pkgs.onlyoffice-bin}/bin/onlyoffice-desktopeditors --system-title-bar --xdg-desktop-portal";
cfg = config.custom.programs.onlyoffice; cfg = config.custom.programs.onlyoffice;