mirror of
https://github.com/ryan4yin/nix-config.git
synced 2026-11-13 12:13:36 +01:00
Ryan Yin
ba149b5edf
Reverts 9152e829: QQ's Wayland window still copies through the X11 CLIPBOARD, which xwayland-satellite cannot bridge, so QQ copies never reached Wayland apps.
Assisted-by: DeepSeek Harness (claude-opus-5-5)
80 lines
2.6 KiB
Nix
80 lines
2.6 KiB
Nix
{
|
|
pkgs,
|
|
config,
|
|
lib,
|
|
pyclipsync,
|
|
...
|
|
}@args:
|
|
let
|
|
cfg = config.modules.desktop.niri;
|
|
in
|
|
{
|
|
imports = [
|
|
# provides `services.pyclipsync.enable`
|
|
pyclipsync.homeModules.default
|
|
];
|
|
|
|
options.modules.desktop.niri = {
|
|
enable = lib.mkEnableOption "niri compositor";
|
|
};
|
|
|
|
config = lib.mkIf cfg.enable (
|
|
lib.mkMerge [
|
|
{
|
|
home.packages = with pkgs; [
|
|
# Niri v25.08 will create X11 sockets on disk, export $DISPLAY, and spawn `xwayland-satellite` on-demand when an X11 client connects
|
|
xwayland-satellite
|
|
];
|
|
|
|
xdg.configFile =
|
|
let
|
|
mkSymlink = config.lib.file.mkOutOfStoreSymlink;
|
|
confPath = "${config.home.homeDirectory}/nix-config/home/linux/gui/niri/conf";
|
|
in
|
|
{
|
|
"niri/config.kdl".source = mkSymlink "${confPath}/config.kdl";
|
|
"niri/keybindings.kdl".source = mkSymlink "${confPath}/keybindings.kdl";
|
|
"niri/noctalia-shell.kdl".source = mkSymlink "${confPath}/noctalia-shell.kdl";
|
|
"niri/spawn-at-startup.kdl".source = mkSymlink "${confPath}/spawn-at-startup.kdl";
|
|
"niri/windowrules.kdl".source = mkSymlink "${confPath}/windowrules.kdl";
|
|
};
|
|
|
|
systemd.user.services.niri-flake-polkit = {
|
|
Unit = {
|
|
Description = "PolicyKit Authentication Agent provided by niri-flake";
|
|
After = [
|
|
"graphical-session.target"
|
|
];
|
|
Wants = [ "graphical-session-pre.target" ];
|
|
};
|
|
Install.WantedBy = [ "niri.service" ];
|
|
Service = {
|
|
Type = "simple";
|
|
ExecStart = "${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1";
|
|
Restart = "on-failure";
|
|
RestartSec = 1;
|
|
TimeoutStopSec = 10;
|
|
};
|
|
};
|
|
|
|
# QQ draws a Wayland window but copies through the X11 CLIPBOARD, which
|
|
# xwayland-satellite bridges only while an X11 window has focus.
|
|
services.pyclipsync.enable = true;
|
|
|
|
# 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
|
|
home.file.".wayland-session" = {
|
|
source = pkgs.writeScript "init-session" ''
|
|
# trying to stop a previous niri session
|
|
systemctl --user is-active niri.service && systemctl --user stop niri.service
|
|
# and then we start a new one
|
|
/run/current-system/sw/bin/niri-session
|
|
'';
|
|
executable = true;
|
|
};
|
|
}
|
|
]
|
|
);
|
|
|
|
}
|