aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMihai Fufezan <[email protected]>2022-09-03 02:20:20 +0300
committerMihai Fufezan <[email protected]>2022-09-03 02:20:20 +0300
commiteee0cad4d0e58f145432bdcd6dde0b070cd73f14 (patch)
tree5b2f241d9ed2c24f4a69f6677cf51f09f4ab8abb
parent0ea96e87c00f15eefbe11916842a4d0bf86c3154 (diff)
downloadHyprland-eee0cad4d0e58f145432bdcd6dde0b070cd73f14.tar.gz
Hyprland-eee0cad4d0e58f145432bdcd6dde0b070cd73f14.zip
Nix modules: fix imports
-rw-r--r--nix/hm-module.nix17
-rw-r--r--nix/module.nix8
2 files changed, 12 insertions, 13 deletions
diff --git a/nix/hm-module.nix b/nix/hm-module.nix
index 44316412..d34d604f 100644
--- a/nix/hm-module.nix
+++ b/nix/hm-module.nix
@@ -10,6 +10,14 @@ self: {
hidpiXWayland = cfg.xwayland.hidpi;
};
in {
+ imports = [
+ (
+ lib.mkRenamedOptionModule
+ ["wayland" "windowManager" "hyprland" "xwayland"]
+ ["wayland" "windowManager" "hyprland" "xwayland" "enable"]
+ )
+ ];
+
options.wayland.windowManager.hyprland = {
enable = lib.mkEnableOption "hyprland wayland compositor";
package = lib.mkOption {
@@ -66,14 +74,6 @@ in {
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 {
@@ -84,7 +84,6 @@ in {
xdg.configFile."hypr/hyprland.conf" = {
text =
(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=systemctl --user start hyprland-session.target
'')
diff --git a/nix/module.nix b/nix/module.nix
index aae16f38..9969d0eb 100644
--- a/nix/module.nix
+++ b/nix/module.nix
@@ -8,6 +8,10 @@ self: {
with lib; let
cfg = config.programs.hyprland;
in {
+ imports = [
+ (mkRemovedOptionModule ["programs" "hyprland" "extraPackages"] "extraPackages has been removed. Use environment.systemPackages instead.")
+ ];
+
options.programs.hyprland = {
enable = mkEnableOption ''
Hyprland, the dynamic tiling Wayland compositor that doesn't sacrifice on its looks.
@@ -26,10 +30,6 @@ in {
Hyprland package to use.
'';
};
-
- imports = [
- (mkRemovedOptionModule ["programs" "hyprland" "extraPackages"] "extraPackages has been removed. Use environment.systemPackages instead.")
- ];
};
config = mkIf cfg.enable {