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

fix(ags4): use my fork with overlays
All checks were successful
Discord / discord commits (push) Has been skipped
Details

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
Show stats Download patch file Download diff file Expand all files Collapse all files

28
flake.lock generated
View file

@ -7,18 +7,22 @@
], ],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
],
"systems": [
"systems"
] ]
}, },
"locked": { "locked": {
"lastModified": 1738087375, "lastModified": 1741472109,
"narHash": "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c=", "narHash": "sha256-jQZ1zXK1yRoSz0+yuPVh/7CpYczfhwybzhnoZ7mPJ50=",
"owner": "Aylur", "owner": "matt1432",
"repo": "ags", "repo": "ags",
"rev": "a6a7a0adb17740f4c34a59902701870d46fbb6a4", "rev": "59e9dbcf32213398ab08d209c483e5d024ed7316",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Aylur", "owner": "matt1432",
"ref": "overlay",
"repo": "ags", "repo": "ags",
"type": "github" "type": "github"
} }
@ -60,18 +64,22 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
],
"systems": [
"systems"
] ]
}, },
"locked": { "locked": {
"lastModified": 1741396597, "lastModified": 1741470966,
"narHash": "sha256-RQYpdggQLWTynaT1ISqbACo8plSTBNunG8rv8+A82g0=", "narHash": "sha256-Ix4WQvwuGE/NmwRDiE1wxyqsD9FUani3NiHD2rRioyM=",
"owner": "Aylur", "owner": "matt1432",
"repo": "astal", "repo": "astal",
"rev": "f38433594051ee75957720d1c36de00896a67eb6", "rev": "ca9df70b99d53926643fb3567e758812b62785a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Aylur", "owner": "matt1432",
"ref": "overlay",
"repo": "astal", "repo": "astal",
"type": "github" "type": "github"
} }

12
flake.nix
View file

@ -5,14 +5,20 @@
inputs = { inputs = {
astal.follows = "astal"; astal.follows = "astal";
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
systems.follows = "systems";
}; };
owner = "Aylur"; owner = "matt1432";
ref = "overlay";
repo = "ags"; repo = "ags";
type = "github"; type = "github";
}; };
astal = { astal = {
inputs.nixpkgs.follows = "nixpkgs"; inputs = {
owner = "Aylur"; nixpkgs.follows = "nixpkgs";
systems.follows = "systems";
};
owner = "matt1432";
ref = "overlay";
repo = "astal"; repo = "astal";
type = "github"; type = "github";
}; };

12
inputs/default.nix
View file

@ -195,14 +195,22 @@ let
agsInputs = { agsInputs = {
astal = mkInput { astal = mkInput {
owner = "Aylur"; # owner = "Aylur";
repo = "astal"; repo = "astal";
# FIXME: https://github.com/Aylur/astal/pull/314
owner = "matt1432";
ref = "overlay";
}; };
ags = mkInput { ags = mkInput {
owner = "Aylur"; # owner = "Aylur";
repo = "ags"; repo = "ags";
# FIXME: https://github.com/Aylur/astal/pull/314
owner = "matt1432";
ref = "overlay";
inputs.astal.follows = "astal"; inputs.astal.follows = "astal";
}; };

4
modules/ags/default.nix
View file

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

13
modules/ags/packages.nix
View file

@ -5,7 +5,7 @@ self: {
pkgs, pkgs,
... ...
}: let }: 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; inherit (lib) attrValues boolToString filter getExe mkIf optionalAttrs optionals;
@ -30,18 +30,13 @@ in {
config = mkIf cfgDesktop.ags.enable { config = mkIf cfgDesktop.ags.enable {
# Make these accessible outside these files # Make these accessible outside these files
programs.ags = { programs.ags = {
# TODO: add overlays to upstream flake package = pkgs.ags.override {
package = ags.packages.${pkgs.system}.ags.override {
extraPackages = cfg.astalLibs; 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 { astalLibs = attrValues {
inherit inherit
(astal.packages.${pkgs.system}) (pkgs.astalLibs)
io io
astal3 astal3
astal4 astal4
@ -67,7 +62,7 @@ in {
# libkompass dependencies # libkompass dependencies
inherit inherit
(astal.packages.${pkgs.system}) (pkgs.astalLibs)
cava cava
river river
; ;