update niri; scroll use flake

This commit is contained in:
EdenQwQ 2025-04-25 22:47:37 +08:00
parent f70f20a9b3
commit d9cd5c6486
3 changed files with 26 additions and 11 deletions

24
flake.lock generated
View file

@ -754,17 +754,16 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1745476742, "lastModified": 1745571618,
"narHash": "sha256-5bfMdGLKqu/hm9QlZKXelcxG4XzwMXN4dF5DLshUtqg=", "narHash": "sha256-yim78eRKNJOvnEDjRAd5iGwulXNpoMJQqcyLmwZ8Ejo=",
"owner": "YalTeR", "owner": "YalTeR",
"repo": "niri", "repo": "niri",
"rev": "9204719cd9c9145f6824bcc75485bcf7f7262468", "rev": "85cd64e83017459f0a6edfd7b91ba31d70b0ef17",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "YalTeR", "owner": "YalTeR",
"repo": "niri", "repo": "niri",
"rev": "9204719cd9c9145f6824bcc75485bcf7f7262468",
"type": "github" "type": "github"
} }
}, },
@ -1195,6 +1194,7 @@
"nixpkgs-wayland": "nixpkgs-wayland_2", "nixpkgs-wayland": "nixpkgs-wayland_2",
"nixvim": "nixvim", "nixvim": "nixvim",
"nur": "nur", "nur": "nur",
"scroll": "scroll",
"stylix": "stylix", "stylix": "stylix",
"treefmt-nix": "treefmt-nix_5" "treefmt-nix": "treefmt-nix_5"
} }
@ -1220,6 +1220,22 @@
"type": "github" "type": "github"
} }
}, },
"scroll": {
"flake": false,
"locked": {
"lastModified": 1745571747,
"narHash": "sha256-K9uRAj3V7/8uvx25rChYnEuA2bitCy/c2irV/ak0tr4=",
"owner": "dawsers",
"repo": "scroll",
"rev": "6322c05624f88dbb8c61cfc4c87dba3122cb1524",
"type": "github"
},
"original": {
"owner": "dawsers",
"repo": "scroll",
"type": "github"
}
},
"stylix": { "stylix": {
"inputs": { "inputs": {
"base16": "base16", "base16": "base16",

View file

@ -54,7 +54,7 @@
}; };
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
niri-unstable = { niri-unstable = {
url = "github:YalTeR/niri/9204719cd9c9145f6824bcc75485bcf7f7262468"; url = "github:YalTeR/niri";
flake = false; flake = false;
}; };
niri = { niri = {
@ -83,5 +83,9 @@
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
maomaowm.url = "github:DreamMaoMao/maomaowm"; maomaowm.url = "github:DreamMaoMao/maomaowm";
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
scroll = {
url = "github:dawsers/scroll";
flake = false;
};
}; };
} }

View file

@ -21,12 +21,7 @@
}); });
sway-unwrapped = sway-unwrapped =
(prev.sway-unwrapped.overrideAttrs (oldAttrs: { (prev.sway-unwrapped.overrideAttrs (oldAttrs: {
src = final.fetchFromGitHub { src = inputs.scroll;
owner = "dawsers";
repo = "scroll";
rev = "1bade4906068873259617f6f41a4ba93a3573fa3";
hash = "sha256-QnCH98x9oRpGbikSHa68R9eqdgwWD/0p0Fai1aA7x+E=";
};
patches = [ ]; patches = [ ];
})).override })).override
{ inherit (inputs.nixpkgs-wayland.packages.${final.system}) wlroots; }; { inherit (inputs.nixpkgs-wayland.packages.${final.system}) wlroots; };