hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 15:25:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Nix modules: fix imports

Browse source
This commit is contained in:
Mihai Fufezan 2022-09-03 02:20:20 +03:00
parent 0ea96e87c0
commit eee0cad4d0
No known key found for this signature in database
GPG key ID: 5899325F2F120900
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
nix/hm-module.nix
View file

@ -10,6 +10,14 @@ self: {
hidpiXWayland = cfg.xwayland.hidpi; hidpiXWayland = cfg.xwayland.hidpi;
}; };
in { in {
imports = [
(
lib.mkRenamedOptionModule
["wayland" "windowManager" "hyprland" "xwayland"]
["wayland" "windowManager" "hyprland" "xwayland" "enable"]
)
];
options.wayland.windowManager.hyprland = { options.wayland.windowManager.hyprland = {
enable = lib.mkEnableOption "hyprland wayland compositor"; enable = lib.mkEnableOption "hyprland wayland compositor";
package = lib.mkOption { package = lib.mkOption {
@ -66,14 +74,6 @@ in {
Extra configuration lines to add to ~/.config/hypr/hyprland.conf. Extra configuration lines to add to ~/.config/hypr/hyprland.conf.
''; '';
}; };
imports = [
(
lib.mkRenamedOptionModule
["wayland" "windowManager" "hyprland" "xwayland"]
["wayland" "windowManager" "hyprland" "xwayland" "enable"]
)
];
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
@ -84,7 +84,6 @@ in {
xdg.configFile."hypr/hyprland.conf" = { xdg.configFile."hypr/hyprland.conf" = {
text = text =
(lib.optionalString cfg.systemdIntegration '' (lib.optionalString cfg.systemdIntegration ''
exec-once=export XDG_SESSION_TYPE=wayland
exec-once=${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP exec-once=${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP
exec-once=systemctl --user start hyprland-session.target exec-once=systemctl --user start hyprland-session.target
'') '')

8
nix/module.nix
View file

@ -8,6 +8,10 @@ self: {
with lib; let with lib; let
cfg = config.programs.hyprland; cfg = config.programs.hyprland;
in { in {
imports = [
(mkRemovedOptionModule ["programs" "hyprland" "extraPackages"] "extraPackages has been removed. Use environment.systemPackages instead.")
];
options.programs.hyprland = { options.programs.hyprland = {
enable = mkEnableOption '' enable = mkEnableOption ''
Hyprland, the dynamic tiling Wayland compositor that doesn't sacrifice on its looks. Hyprland, the dynamic tiling Wayland compositor that doesn't sacrifice on its looks.
@ -26,10 +30,6 @@ in {
Hyprland package to use. Hyprland package to use.
''; '';
}; };
imports = [
(mkRemovedOptionModule ["programs" "hyprland" "extraPackages"] "extraPackages has been removed. Use environment.systemPackages instead.")
];
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {