punkfairie/marleyos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'xwayland'

Browse source 
* xwayland:
  feat(home/niri): Setup xwayland-satellite on niri
  fix(home/swaybg): Make it so the systemd unit can actually succeed at boot
  feat(home/xwayland-satellite): Write module
This commit is contained in:
punkfairie 2025-03-03 19:30:09 -08:00
commit 42b51ac2f6
Signed by: punkfairie
GPG key ID: B3C5488E9A1A7CA6
3 changed files with 51 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
modules/home/programs/wayland/xwayland-satellite/default.nix Normal file
View file

@ -0,0 +1,39 @@
{
lib,
config,
pkgs,
...
}: let
cfg = config.marleyos.programs.xwayland-satellite;
in {
options.marleyos.programs.xwayland-satellite.enable = lib.mkEnableOption "xwayland-satellite";
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
xwayland-satellite
];
systemd.user.services."xwayland-satellite" = {
Unit = {
Description = "Xwayland outside your Wayland";
BindsTo = ["xdg-desktop-autostart.target"];
PartOf = ["xdg-desktop-autostart.target"];
After = ["xdg-desktop-autostart.target"];
Requisite = ["xdg-desktop-autostart.target"];
};
Service = {
Type = "notify";
NotifyAccess = "all";
ExecStart = lib.getExe pkgs.xwayland-satellite;
StandardOutput = "journal";
};
Install = {
WantedBy = ["xdg-desktop-autostart.target"];
};
};
home.sessionVariables.DISPLAY = ":0";
};
}

9
modules/home/services/swaybg/default.nix
View file

@ -15,14 +15,14 @@ in {
systemd.user.services.swaybg = {
Install = {
WantedBy = ["graphical-session.target"];
WantedBy = ["xdg-desktop-autostart.target"];
};
Unit = {
Description = "Wallpaper tool for Wayland compositors";
Documentation = ["man:swaybg(1)"];
After = ["graphical-session-pre.target"];
PartOf = ["graphical-session.target"];
After = ["graphical-session.target"];
PartOf = ["xdg-desktop-autostart.target"];
};
Service = {
@ -31,6 +31,9 @@ in {
ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -SIGUSR2 $MAINPID";
KillMode = "mixed";
Restart = "on-failure";
RestartSec = "1s";
RestartMaxDelaySec = "30s";
RestartSteps = 10;
};
};
};

6
modules/home/wayland/niri/default.nix
View file

@ -23,6 +23,7 @@ in {
waybar.enable = true;
wlogout.enable = true;
fuzzel.enable = true;
xwayland-satellite.enable = true;
};
services = {
swaybg.enable = true;
@ -40,6 +41,11 @@ in {
prefer-no-csd = true;
hotkey-overlay.skip-at-startup = true;
environment = {
# For some reason this won't set properly from home.sessionVariables.
DISPLAY = ":0";
};
### Startup Programs ###
spawn-at-startup = let
inherit (config.marleyos) apps;