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

fix(ags4): use my fork with overlays

Browse source
This commit is contained in:
matt1432 2025-03-08 17:22:48 -05:00
parent 9a720b2c11
commit 3a55413cae
5 changed files with 44 additions and 25 deletions

4
modules/ags/default.nix
View file

@ -4,7 +4,7 @@ self: {
pkgs,
...
}: let
inherit (self.inputs) virtualkeyboard-adapter;
inherit (self.inputs) ags astal virtualkeyboard-adapter;
inherit (lib) hasPrefix mkIf removePrefix;
# Configs
@ -53,6 +53,8 @@ in {
services.upower.enable = true;
nixpkgs.overlays = [
ags.overlays.default
astal.overlays.default
virtualkeyboard-adapter.overlays.default
# FIXME: https://github.com/NixOS/nixpkgs/pull/377867

13
modules/ags/packages.nix
View file

@ -5,7 +5,7 @@ self: {
pkgs,
...
}: let
inherit (self.inputs) ags astal gtk-session-lock kompass;
inherit (self.inputs) gtk-session-lock kompass;
inherit (lib) attrValues boolToString filter getExe mkIf optionalAttrs optionals;
@ -30,18 +30,13 @@ in {
config = mkIf cfgDesktop.ags.enable {
# Make these accessible outside these files
programs.ags = {
# TODO: add overlays to upstream flake
package = ags.packages.${pkgs.system}.ags.override {
package = pkgs.ags.override {
extraPackages = cfg.astalLibs;
# FIXME: this makes sure we use my overlayed version for gtk4-session-lock
# try to fix this with overlays
gtk4-layer-shell = pkgs.gtk4-layer-shell;
};
astalLibs = attrValues {
inherit
(astal.packages.${pkgs.system})
(pkgs.astalLibs)
io
astal3
astal4
@ -67,7 +62,7 @@ in {
# libkompass dependencies
inherit
(astal.packages.${pkgs.system})
(pkgs.astalLibs)
cava
river
;