matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(ags4): bump gtk4-layer-shell to 1.1.0
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2025-02-24 19:30:54 -05:00
parent 88b0715422
commit 90421c4986
3 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/ags/default.nix
View file

@ -52,14 +52,16 @@ in {
security.pam.services.astal-auth = {}; security.pam.services.astal-auth = {};
services.upower.enable = true; services.upower.enable = true;
# FIXME: https://github.com/NixOS/nixpkgs/pull/377867
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
gtk4-layer-shell = prev.gtk4-layer-shell.overrideAttrs (o: { gtk4-layer-shell = prev.gtk4-layer-shell.overrideAttrs (o: rec {
version = "1.1.0";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "wmww"; owner = "wmww";
repo = "gtk4-layer-shell"; repo = "gtk4-layer-shell";
rev = "e6c958189fcb78894d86db5beead1526084f8755"; rev = "v${version}";
hash = "sha256-QwOzgOJuf8K7v/aTDNw+hYRNa8TIel3Pac/cwCMU8zw="; hash = "sha256-UGhFeaBBIfC4ToWdyoX+oUzLlqJsjF++9U7mtszE0y0=";
}; };
}); });
}) })

15
modules/ags/gtk4/widgets/lockscreen/index.ts
View file

@ -40,7 +40,7 @@ export default () => {
min-width ${transition_duration / 2}ms; min-width ${transition_duration / 2}ms;
}`; }`;
const lock = Gtk4SessionLock.get_singleton(); const lock = Gtk4SessionLock.Instance.new();
const unlock = () => { const unlock = () => {
blurBGs.forEach((b) => { blurBGs.forEach((b) => {
@ -57,7 +57,7 @@ export default () => {
}); });
}); });
timeout(transition_duration, () => { timeout(transition_duration, () => {
Gtk4SessionLock.unlock(); lock.unlock();
Gdk.Display.get_default()?.sync(); Gdk.Display.get_default()?.sync();
App.quit(); App.quit();
}); });
@ -222,21 +222,14 @@ export default () => {
} }
}); });
Gtk4SessionLock.lock(); lock.lock();
windows.forEach((win, monitor) => { windows.forEach((win, monitor) => {
Gtk4SessionLock.assign_window_to_monitor(win, monitor); lock.assign_window_to_monitor(win, monitor);
win.show(); win.show();
}); });
}; };
const on_finished = () => {
Gdk.Display.get_default()?.sync();
App.quit();
};
lock.connect('finished', on_finished);
if (Vars.hasFprintd) { if (Vars.hasFprintd) {
globalThis.authFinger = () => AstalAuth.Pam.authenticate('', (_, task) => { globalThis.authFinger = () => AstalAuth.Pam.authenticate('', (_, task) => {
try { try {

2
modules/ags/packages.nix
View file

@ -33,7 +33,7 @@ in {
package = ags.packages.${pkgs.system}.ags.override { package = ags.packages.${pkgs.system}.ags.override {
extraPackages = cfg.astalLibs; extraPackages = cfg.astalLibs;
# Make sure we use my overlayed version for gtk4-session-lock # FIXME: this makes sure we use my overlayed version for gtk4-session-lock
gtk4-layer-shell = pkgs.gtk4-layer-shell; gtk4-layer-shell = pkgs.gtk4-layer-shell;
}; };