fix: use hyprland from flake instead of pkgs

This commit is contained in:
Ryan Yin
2024-04-12 22:28:08 +08:00
parent c0c9ed21ea
commit 2b75504a22
+5 -3
View File
@@ -4,12 +4,15 @@
hyprland, hyprland,
nur-ryan4yin, nur-ryan4yin,
... ...
}: { }: let
package = hyprland.packages.${pkgs.system}.hyprland;
in {
# NOTE: # NOTE:
# We have to enable hyprland/i3's systemd user service in home-manager, # We have to enable hyprland/i3's systemd user service in home-manager,
# so that gammastep/wallpaper-switcher's user service can be start correctly! # so that gammastep/wallpaper-switcher's user service can be start correctly!
# they are all depending on hyprland/i3's user graphical-session # they are all depending on hyprland/i3's user graphical-session
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
inherit package;
enable = true; enable = true;
settings = { settings = {
source = "${nur-ryan4yin.packages.${pkgs.system}.catppuccin-hyprland}/themes/mocha.conf"; source = "${nur-ryan4yin.packages.${pkgs.system}.catppuccin-hyprland}/themes/mocha.conf";
@@ -25,7 +28,6 @@
"GDK_BACKEND,wayland" "GDK_BACKEND,wayland"
]; ];
}; };
package = hyprland.packages.${pkgs.system}.hyprland;
extraConfig = builtins.readFile ../conf/hyprland.conf; extraConfig = builtins.readFile ../conf/hyprland.conf;
# gammastep/wallpaper-switcher need this to be enabled. # gammastep/wallpaper-switcher need this to be enabled.
systemd.enable = true; systemd.enable = true;
@@ -34,7 +36,7 @@
# NOTE: this executable is used by greetd to start a wayland session when system boot up # NOTE: this executable is used by greetd to start a wayland session when system boot up
# with such a vendor-no-locking script, we can switch to another wayland compositor without modifying greetd's config in NixOS module # with such a vendor-no-locking script, we can switch to another wayland compositor without modifying greetd's config in NixOS module
home.file.".wayland-session" = { home.file.".wayland-session" = {
source = "${pkgs.hyprland}/bin/Hyprland"; source = "${package}/bin/Hyprland";
executable = true; executable = true;
}; };