From 725a3ed27ed995c6881432f38ea0db680fb434ca Mon Sep 17 00:00:00 2001 From: cnst Date: Mon, 29 Sep 2025 17:10:38 +0200 Subject: [PATCH] chore(niri): go to nixpkgs niri release --- flake.lock | 210 +++++----------------- flake.nix | 2 - hosts/kima/modules.nix | 2 +- modules/nixos/programs/niri/default.nix | 7 +- modules/nixos/services/greetd/default.nix | 2 +- modules/nixos/system/xdg/default.nix | 10 +- 6 files changed, 57 insertions(+), 176 deletions(-) diff --git a/flake.lock b/flake.lock index 82487b32..39bcf0b6 100644 --- a/flake.lock +++ b/flake.lock @@ -153,11 +153,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1758886919, - "narHash": "sha256-4y+Z3EIIFw61+uGVgsNpWx3STmNbex8rTyHJPsPwyjE=", + "lastModified": 1759155412, + "narHash": "sha256-5JMoXMQt0C1SAHzhHwKLIEZ8/Q8f0vqBGxrMnmuOvJg=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "39a646acc74e720d337edb57cf8473e96f6164ef", + "rev": "ae7eac57b8dfc221270bb4f4752a87fe4f17ca11", "type": "github" }, "original": { @@ -212,11 +212,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1759041587, - "narHash": "sha256-Icdbi+eADlwHIWiP/5Gv8DXrQwSUFqItFG36Xvg64hc=", + "lastModified": 1759128018, + "narHash": "sha256-30KHoIXMgyNQULifR1yQ5Sp0vr4tWpGRJXPOTgEzx1A=", "owner": "nix-community", "repo": "fenix", - "rev": "fbb23b6565adb3f1533f14fbdb48b81bf10997ec", + "rev": "5c342209226275f704ab84d89efc80b2d3963517", "type": "github" }, "original": { @@ -610,11 +610,11 @@ ] }, "locked": { - "lastModified": 1759043321, - "narHash": "sha256-Efi3THvsIS6Qd97s52/PSSHWybDlSbtUZXP8l3AR9Ps=", + "lastModified": 1759106866, + "narHash": "sha256-GjLvAl7qxGxKtop6ghasxjQ1biTT7pA+WU45byzMl/4=", "owner": "nix-community", "repo": "home-manager", - "rev": "c75fd8e300b79502b8eecdacd8a426b12fadb460", + "rev": "619ae569293b6427d23cce4854eb4f3c33af3eec", "type": "github" }, "original": { @@ -652,11 +652,11 @@ ] }, "locked": { - "lastModified": 1758810399, - "narHash": "sha256-bpWoE1tiFX5T1tr5EudkpW9Kk02XR+6olkoSkf3nHZU=", + "lastModified": 1758928860, + "narHash": "sha256-ZqaRdd+KoR54dNJPtd7UX4O0X+02YItnTpQVu28lSVI=", "owner": "nix-community", "repo": "home-manager", - "rev": "39d26c16866260eee6d0487fe9c102ba1c1bf7b2", + "rev": "bc2afee55bc5d3b825287829d6592b9cc1405aad", "type": "github" }, "original": { @@ -803,11 +803,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1759010730, - "narHash": "sha256-Bmdr3SADuZQWfUTyAe3vJK2N3IKMR1kjJqgpza8JAN4=", + "lastModified": 1759148562, + "narHash": "sha256-kPSevFrZv/zmXy0rVhbZr2nQ4nXmt7lnI2/xqGoIVT4=", "owner": "hyprwm", "repo": "hyprland", - "rev": "766acadcf1e6bfc94fa41ea0d47906c9afca8e24", + "rev": "09596725910aab2a9defed250348aebeee40f842", "type": "github" }, "original": { @@ -824,11 +824,11 @@ ] }, "locked": { - "lastModified": 1758531979, - "narHash": "sha256-iRv5afKzuu6SkwztqMwZ33161CzBJsyeRHp0uviN9TI=", + "lastModified": 1759123041, + "narHash": "sha256-O3dfYBYhsdjpELmyE1czkQfG2Jzh+pzsKMhPX3QVz80=", "owner": "hyprwm", "repo": "contrib", - "rev": "de79078fd59140067e53cd00ebdf17f96ce27846", + "rev": "125043bea28e5f988f4e97250213948667a26b1c", "type": "github" }, "original": { @@ -1268,62 +1268,6 @@ "type": "github" } }, - "niri": { - "inputs": { - "niri-stable": "niri-stable", - "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_8", - "nixpkgs-stable": "nixpkgs-stable", - "xwayland-satellite-stable": "xwayland-satellite-stable", - "xwayland-satellite-unstable": "xwayland-satellite-unstable" - }, - "locked": { - "lastModified": 1758901074, - "narHash": "sha256-R7XQL6ixYywDsGkorX05KnTlsIeQr9DzQ3geD9Ba6kU=", - "owner": "sodiboo", - "repo": "niri-flake", - "rev": "397234705a9fa05464107c58286a8308be0c50c2", - "type": "github" - }, - "original": { - "owner": "sodiboo", - "repo": "niri-flake", - "type": "github" - } - }, - "niri-stable": { - "flake": false, - "locked": { - "lastModified": 1756556321, - "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "ref": "v25.08", - "repo": "niri", - "type": "github" - } - }, - "niri-unstable": { - "flake": false, - "locked": { - "lastModified": 1758691861, - "narHash": "sha256-CYgoGrY/Fx+hjzp8graTxJw1M7mn1f2jBkK26M04T0s=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "e837e39623457dc5ad29c34a5ce4d4616e5fbf1e", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, "nix-gaming": { "inputs": { "flake-parts": [ @@ -1334,11 +1278,11 @@ ] }, "locked": { - "lastModified": 1759024631, - "narHash": "sha256-Nubbsc/wql6FOqJXCUmwa7+YPMbUtQjt2YFqqXWMqIU=", + "lastModified": 1759110900, + "narHash": "sha256-fcu/r0ijvaYT2VHGkZGr0wq9uBMNFkiftVBy43/2oig=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "9027055aa1fe6717a3d6e1ce6d46aafa097d803b", + "rev": "2ac6a49266e9159ccb001b4c8cb1f50f67d502ae", "type": "github" }, "original": { @@ -1401,38 +1345,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1758791193, - "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_10": { - "locked": { - "lastModified": 1756696532, - "narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "58dcbf1ec551914c3756c267b8b9c8c86baa1b2f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1758690382, @@ -1451,11 +1363,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1758815401, - "narHash": "sha256-Nj4iA2Msx0qfHPFDc0biubSsaChuZQlJrS3aNIaQ/T8=", + "lastModified": 1759147044, + "narHash": "sha256-3ZPFytJOcLjTChljeaGgoaNj+tOqzgEpqZAvRe3bU90=", "owner": "PedroHLC", "repo": "nixpkgs", - "rev": "0cc09391d851ec12e1dcbb8d105a75ab6344432b", + "rev": "18e83bbe13aa50992777832b52bd0e0d8585fb3b", "type": "github" }, "original": { @@ -1531,11 +1443,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { @@ -1547,16 +1459,16 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", - "owner": "NixOS", + "lastModified": 1756696532, + "narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "58dcbf1ec551914c3756c267b8b9c8c86baa1b2f", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -1566,7 +1478,7 @@ "flake-compat": "flake-compat_5", "flake-parts": "flake-parts_5", "mnw": "mnw", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "systems": "systems_5" }, "locked": { @@ -1702,9 +1614,8 @@ "hyprlock": "hyprlock", "hyprpaper": "hyprpaper", "lanzaboote": "lanzaboote", - "niri": "niri", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "nvf": "nvf", "systems": "systems_6", "treefmt-nix": "treefmt-nix", @@ -1715,11 +1626,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1758918110, - "narHash": "sha256-wxOmbk6MH6qgvShZUrD7pJnM7m2lFaoBeVJjVoNeVT8=", + "lastModified": 1759060464, + "narHash": "sha256-37+iMpZOQ1m9SuOJTBlRK1R0IVPS7e95oQggK82UpLs=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "f5e049d09dc17d0b61de2ec179b3607cf1e431b2", + "rev": "5c0b555a65cadc14a6a16865c3e065c9d30b0bef", "type": "github" }, "original": { @@ -1737,11 +1648,11 @@ ] }, "locked": { - "lastModified": 1758767687, - "narHash": "sha256-znUulOqcL/Kkdr7CkyIi8Z1pTGXpi54Xg2FmlyJmv4A=", + "lastModified": 1758940228, + "narHash": "sha256-sTS04L9LKqzP1oiVXYDwcMzfFSF0DnSJQFzZBpEgLFE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b8bcc09d4f627f4e325408f6e7a85c3ac31f0eeb", + "rev": "5bfedf3fbbf5caf8e39f7fcd62238f54d82aa1e2", "type": "github" }, "original": { @@ -2005,39 +1916,6 @@ "type": "github" } }, - "xwayland-satellite-stable": { - "flake": false, - "locked": { - "lastModified": 1755491097, - "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "388d291e82ffbc73be18169d39470f340707edaa", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "ref": "v0.7", - "repo": "xwayland-satellite", - "type": "github" - } - }, - "xwayland-satellite-unstable": { - "flake": false, - "locked": { - "lastModified": 1758577423, - "narHash": "sha256-sB2GAOjhjoWnjU6A/uHNJiY6O3UeztV5pJAN2g1FkXU=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "03368548ba745e17a85bd631613a59cb2d8469a4", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "type": "github" - } - }, "zen-browser": { "inputs": { "nixpkgs": [ @@ -2045,11 +1923,11 @@ ] }, "locked": { - "lastModified": 1758834519, + "lastModified": 1759072104, "narHash": "sha256-2B5RObgBD/ptcC8rO6jI2o+0LWg3iG300wQlBYiyjec=", "ref": "refs/heads/main", - "rev": "fa1cf014198453427d04401d6781fd3cdb82814e", - "revCount": 132, + "rev": "8db6527b42469df2ffd888e79fe15151888bdc0f", + "revCount": 134, "type": "git", "url": "https://git.sr.ht/~canasta/zen-browser-flake" }, diff --git a/flake.nix b/flake.nix index 2be71e75..112cf7b6 100644 --- a/flake.nix +++ b/flake.nix @@ -147,8 +147,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - niri.url = "github:sodiboo/niri-flake"; - # Custom tuirun = { url = "git+https://git.sr.ht/~canasta/tuirun"; diff --git a/hosts/kima/modules.nix b/hosts/kima/modules.nix index ea6c4542..d32b1604 100644 --- a/hosts/kima/modules.nix +++ b/hosts/kima/modules.nix @@ -215,7 +215,7 @@ flags = "--performance"; }; tailscale = { - enable = true + enable = true; }; udisks = { enable = true; diff --git a/modules/nixos/programs/niri/default.nix b/modules/nixos/programs/niri/default.nix index 4a23d534..065caaaa 100644 --- a/modules/nixos/programs/niri/default.nix +++ b/modules/nixos/programs/niri/default.nix @@ -1,6 +1,5 @@ { config, - inputs, lib, pkgs, ... @@ -14,22 +13,22 @@ in nixos.programs.niri.enable = mkEnableOption "Enables niri"; }; config = mkIf cfg.enable { - nixpkgs.overlays = [ inputs.niri.overlays.niri ]; environment = { variables = { + DISPLAY = ":0"; NIXOS_OZONE_WL = "1"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; }; systemPackages = with pkgs; [ - xwayland-satellite-unstable + xwayland-satellite wl-clipboard wayland-utils + xdg-utils ]; }; systemd.user.services.niri-flake-polkit.enable = false; programs.niri = { enable = true; - package = pkgs.niri-unstable; }; }; } diff --git a/modules/nixos/services/greetd/default.nix b/modules/nixos/services/greetd/default.nix index edb7c1cb..b65bd71a 100644 --- a/modules/nixos/services/greetd/default.nix +++ b/modules/nixos/services/greetd/default.nix @@ -63,7 +63,7 @@ in settings = rec { tuigreet_session = let - session = "${pkgs.niri-unstable}/bin/niri-session"; + session = "${pkgs.niri}/bin/niri-session"; tuigreet = "${lib.getExe pkgs.tuigreet}"; in { diff --git a/modules/nixos/system/xdg/default.nix b/modules/nixos/system/xdg/default.nix index ae8e5e70..a66f3970 100644 --- a/modules/nixos/system/xdg/default.nix +++ b/modules/nixos/system/xdg/default.nix @@ -30,13 +30,19 @@ in enable = true; xdgOpenUsePortal = cfg.xdgOpenUsePortal; config = { - common.default = [ "gtk" ]; + common.default = [ + "gtk" + "gnome" + ]; hyprland.default = [ "gtk" "hyprland" ]; }; - extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + xdg-desktop-portal-gnome + ]; }; }; }