From d1e8ee7374f771cfb9ad8947670e5406ec177a73 Mon Sep 17 00:00:00 2001 From: dichgrem Date: Sun, 30 Nov 2025 14:15:55 +0800 Subject: [PATCH] fix:niri_screencast MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version 372 -> 373: firefox: 145.0.1 → 145.0.2, +28.3 KiB firefox-unwrapped: 145.0.1 → 145.0.2, +69.9 KiB gpsd: 3.26.1 → 3.27, +250.2 KiB gui-for-singbox: 1.13.0 → 1.15.1, +40.5 KiB hyprutils: 0.10.2 → 0.10.3, +101.0 KiB initrd-linux: +103.9 KiB librime: 1.14.0 → 1.15.0, +31.3 KiB libtraceevent: 1.8.5 → 1.8.6, +15.2 KiB libwacom: 2.16.1 → 2.17.0, +61.2 KiB linux: 6.17.9-modules → ∅, -2881.9 KiB linux-firmware: 20251111 → 20251125, +13275.6 KiB nixos-rebuild-ng: 25.11 → 26.05 nixos-system-dos: 25.11.20251124.5ae3b07 → 26.05.20251127.2fad6ea onlyoffice-desktopeditors: 9.0.0, 9.0.0-fhsenv → 9.1.0, 9.1.0-fhsenv, +27117.5 KiB ruff: 0.14.5 → 0.14.6, +404.5 KiB source: +22.7 KiB vimplugin-luajit2.1-fzf-lua: 0.0.2308-1-unstable-0.0.2308-1 → 0.0.2311-1-unstable-0.0.2311-1 x86_energy_perf_policy: 6.12.58 → 6.12.59 xdg-desktop-portal-gnome.service: ε → ∅ zed-editor: 0.213.3 → 0.214.5, +2388.5 KiB --- flake.lock | 60 ++++++++++++++++++++-------------------- home/wayland/niri.nix | 42 +++++++++++----------------- modules/services/ddm.nix | 6 +++- 3 files changed, 51 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 14194bb..045ae0b 100644 --- a/flake.lock +++ b/flake.lock @@ -77,11 +77,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1764153295, - "narHash": "sha256-Y+Cp19zLo5JZVLSbzpyCTSK1bVYfE3Leuut6nQVkdR4=", + "lastModified": 1764351487, + "narHash": "sha256-7XJcTfz0dPhBd7nfyjcFxT1LIIctJZ2LthiI2Ltd7zY=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "29c49282c9b2e8216004a87086494defe401fee8", + "rev": "2031f4a0507d0f7ab3e1aaff4c027a010feee447", "type": "github" }, "original": { @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1764110879, - "narHash": "sha256-xanUzIb0tf3kJ+PoOFmXEXV1jM3PjkDT/TQ5DYeNYRc=", + "lastModified": 1764350888, + "narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=", "owner": "nix-community", "repo": "disko", - "rev": "aecba248f9a7d68c5d1ed15de2d1c8a4c994a3c5", + "rev": "2055a08fd0e2fd41318279a5355eb8a161accf26", "type": "github" }, "original": { @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1764075860, - "narHash": "sha256-KYEIHCBBw+/lwKsJNRNoUxBB4ZY2LK0G0T8f+0i65q0=", + "lastModified": 1764194569, + "narHash": "sha256-iUM9ktarEzThkayyZrzQ7oycPshAY2XRQqVKz0xX/L0=", "owner": "nix-community", "repo": "home-manager", - "rev": "295d90e22d557ccc3049dc92460b82f372cd3892", + "rev": "9651819d75f6c7ffaf8a9227490ac704f29659f0", "type": "github" }, "original": { @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1764304195, - "narHash": "sha256-bO7FN/bF6gG7TlZpKAZjO3VvfsLaPFkefeUfJJ7F/7w=", + "lastModified": 1764361670, + "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", "owner": "nix-community", "repo": "home-manager", - "rev": "86ff0ef506c209bb397849706e85cc3a913cb577", + "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", "type": "github" }, "original": { @@ -351,11 +351,11 @@ ] }, "locked": { - "lastModified": 1763714684, - "narHash": "sha256-ZNJPAaeSYQTDgvwwE8XHhCz4HiHqYoUyoXdoBE2nxug=", + "lastModified": 1764275117, + "narHash": "sha256-DRcv8Y0BnWm4ZhUQnaYk1dNzC6ZhA2W9Vv5Jl4n0RbE=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "6178d787ee61b8586fdb0ccb8644fbfd5317d0f3", + "rev": "96023dcc9a0febaaa3b91f447b9ae2fbe86f2923", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -433,11 +433,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -473,11 +473,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1764238240, - "narHash": "sha256-7Znm3koZ4sF+O41Y7rJqf651BPEbjIUYF3r9H23GRGw=", + "lastModified": 1764443358, + "narHash": "sha256-bd9I02P/Mp9yYGcSWgLLdI/Zt0JqF8igSTAfUzknVHk=", "owner": "nix-community", "repo": "nixvim", - "rev": "f1e07ba53abd0fb4872a365cba45562144ad6130", + "rev": "6094d2a4396c0ff4e94b22315cc43f55db626c32", "type": "github" }, "original": { @@ -553,11 +553,11 @@ ] }, "locked": { - "lastModified": 1764038373, - "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=", + "lastModified": 1764211126, + "narHash": "sha256-p5y13PnMZYd5WdHk+XCzyUaLGBUCwnz2n4KYKEZM0Pw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9", + "rev": "895935bff08cfcfb663fb9c8263c43596e7cd1ed", "type": "github" }, "original": { @@ -585,11 +585,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1764254063, - "narHash": "sha256-V22JzkaTLF/GAL2LgqvOsJhAr8JbJsKaD8hnHjGwXfE=", + "lastModified": 1764451865, + "narHash": "sha256-d4tfTm3ccp4rx7W1WW1BzSkTgEeMd4cZvhAJ7lP145M=", "owner": "danth", "repo": "stylix", - "rev": "a1451bc40413870f0c7b576b751c1ca92055e323", + "rev": "8a096ccec828c68bfb870295d186ad994ea0ae2c", "type": "github" }, "original": { diff --git a/home/wayland/niri.nix b/home/wayland/niri.nix index 34827a4..4f08cf1 100644 --- a/home/wayland/niri.nix +++ b/home/wayland/niri.nix @@ -8,44 +8,34 @@ in with lib; mkIf (WM == "niri") { - systemd.user.targets.niri-session = { - Unit = { - Description = "niri compositor session"; - Documentation = "man:systemd.special(7)"; - }; - Target = { - After = "graphical-session-pre.target"; - BindsTo = "graphical-session.target"; - Wants = "graphical-session-pre.target"; - DefaultDependencies = false; - }; - }; - systemd.user.services.xdg-desktop-portal-gnome = { - Unit = { - Description = "Portal service (GNOME implementation)"; - }; - Service = { - Type = "dbus"; - BusName = "org.freedesktop.impl.portal.desktop.gnome"; - ExecStart = "${pkgs.xdg-desktop-portal-gnome}/libexec/xdg-desktop-portal-gnome"; - }; - }; home.packages = with pkgs; [ niri xwayland-satellite ]; + systemd.user.targets.niri-session = { + Unit = { + After = "graphical-session-pre.target graphical-session.target"; + BindsTo = "graphical-session.target"; + Conflicts = "shutdown.target"; + DefaultDependencies = false; + Description = "niri compositor session"; + Documentation = "man:systemd.special(7)"; + Wants = "graphical-session-pre.target"; + }; + }; xdg.portal = { config = { common = { - default = [ - "gnome" - "gtk" - ]; + default = ["gtk"]; + "org.freedesktop.impl.portal.RemoteDesktop" = "gnome"; + "org.freedesktop.impl.portal.ScreenCast" = "gnome"; + "org.freedesktop.impl.portal.Screenshot" = "gnome"; }; }; extraPortals = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-gnome ]; + configPackages = [pkgs.niri]; }; } diff --git a/modules/services/ddm.nix b/modules/services/ddm.nix index cff388c..a5871aa 100644 --- a/modules/services/ddm.nix +++ b/modules/services/ddm.nix @@ -8,10 +8,14 @@ in { services = { greetd = { enable = true; + useTextGreeter = true; settings = { default_session = { user = "greeter"; - command = "${pkgs.tuigreet}/bin/tuigreet -c ${WM} -t --user-menu"; + command = + if WM == "niri" + then "${pkgs.tuigreet}/bin/tuigreet -c niri-session -t --user-menu" + else "${pkgs.tuigreet}/bin/tuigreet -c ${WM} -t --user-menu"; }; }; };