1
1
Fork 0

Compare commits

..

No commits in common. "47e98fda704ff26203af95563c31bb17891f025b" and "7d2190a8f0e28e5e9f7992131029947fbd7ef471" have entirely different histories.

2 changed files with 3 additions and 14 deletions

View file

@ -26,9 +26,7 @@ in {
# HACK: Inherit home-manager environment variables in lieu of upstream fix # HACK: Inherit home-manager environment variables in lieu of upstream fix
# https://github.com/nix-community/home-manager/issues/2659 # https://github.com/nix-community/home-manager/issues/2659
# https://github.com/YaLTeR/niri/wiki/Configuration:-Miscellaneous#environment # https://github.com/YaLTeR/niri/wiki/Configuration:-Miscellaneous#environment
environment = environment = mapAttrs (name: value: builtins.toString value) config.home-manager.users.${config.custom.username}.home.sessionVariables;
mapAttrs (name: value: toString value)
config.home-manager.users.${config.custom.username}.home.sessionVariables;
cursor = { cursor = {
hide-after-inactive-ms = 1000 * 15; # Milliseconds hide-after-inactive-ms = 1000 * 15; # Milliseconds

View file

@ -9,10 +9,7 @@ with lib; let
cfg = config.custom.services.xwayland-satellite; cfg = config.custom.services.xwayland-satellite;
in { in {
options.custom.services.xwayland-satellite = { options.custom.services.xwayland-satellite.enable = mkOption {default = false;};
enable = mkOption {default = false;};
display = mkOption {default = ":${toString config.services.xserver.display}";};
};
config = mkIf cfg.enable { config = mkIf cfg.enable {
# HACK: Use official module if added # HACK: Use official module if added
@ -44,13 +41,7 @@ in {
}; };
environment.sessionVariables = { environment.sessionVariables = {
DISPLAY = cfg.display; DISPLAY = ":0"; # Assume first display
};
home-manager.users.${config.custom.username} = {
home.sessionVariables = {
DISPLAY = cfg.display;
};
}; };
}; };
} }