diff --git a/flake.lock b/flake.lock index cc85d29..d071069 100644 --- a/flake.lock +++ b/flake.lock @@ -7,17 +7,16 @@ ] }, "locked": { - "lastModified": 1706310192, - "narHash": "sha256-TO1YEMZmKU6cHZgIaxS5Jkj/M9q0kfc0mrmGxq+atrY=", + "lastModified": 1706405338, + "narHash": "sha256-bbhA+GIInRJJzNDf5YnUOOPwfQT/EzBJ1Og4/DjN9+4=", "owner": "Aylur", "repo": "ags", - "rev": "8e94d3b465e76372056c76242e5c013950113be9", + "rev": "f5c2bbe3f68dd7a5316c3cd77e52076af560cd3e", "type": "github" }, "original": { "owner": "Aylur", "repo": "ags", - "rev": "8e94d3b465e76372056c76242e5c013950113be9", "type": "github" } }, @@ -1006,11 +1005,11 @@ }, "nur": { "locked": { - "lastModified": 1706392862, - "narHash": "sha256-B42uOkwM2eykZPssttYKxF2B2B+3pwSMOk1Co+RWjpM=", + "lastModified": 1706395433, + "narHash": "sha256-sNW4Zat3CYh+gLXPWCc4UasXIlXb5JLTeLf8iNn4ykA=", "owner": "nix-community", "repo": "NUR", - "rev": "5209d1f058c7f5c062dd1e9f7c6c6c923ad4f70f", + "rev": "236b614c4c91c07e1239dff02e91377bf305354f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 27264bd..067b6f8 100644 --- a/flake.nix +++ b/flake.nix @@ -207,9 +207,6 @@ owner = "Aylur"; repo = "ags"; - # FIXME: some bugs in latest - rev = "8e94d3b465e76372056c76242e5c013950113be9"; - inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/ags/config/ts/misc/popup.ts b/modules/ags/config/ts/misc/popup.ts index 5cc48ef..c99cab1 100644 --- a/modules/ags/config/ts/misc/popup.ts +++ b/modules/ags/config/ts/misc/popup.ts @@ -131,6 +131,11 @@ export default ({ child: Overlay({ overlays: [Box({ + css: ` + min-height: 1px; + min-width: 1px; + padding: 1px; + `, setup: (self) => { // Make sure child doesn't // get bigger than it should @@ -239,11 +244,10 @@ export default ({ if (ch === overlay) { const alloc = overlay.get_allocation(); - const setAlloc = (v: number) => v - 2 < 0 ? 1 : v; (self.child as AgsBox).css = ` - min-height: ${setAlloc(alloc.height - 2)}px; - min-width: ${setAlloc(alloc.width - 2)}px; + min-height: ${alloc.height}px; + min-width: ${alloc.width}px; `; } }); diff --git a/modules/ags/config/ts/quick-settings/network.ts b/modules/ags/config/ts/quick-settings/network.ts index 9a9c3f3..38ed851 100644 --- a/modules/ags/config/ts/quick-settings/network.ts +++ b/modules/ags/config/ts/quick-settings/network.ts @@ -199,7 +199,8 @@ export const NetworkMenu = () => { APList.delete(ssid); } else { - apWidget.child.reveal_child = false; + apWidget.children[0] + .reveal_child = false; apWidget.toDestroy = true; } }