diff --git a/README.md b/README.md index c05af98..d2a5c9e 100644 --- a/README.md +++ b/README.md @@ -171,14 +171,14 @@ Alternatively, if you're using NixOS and/or Home-Manager, you can setup AGS usin outputs = { self, nixpkgs, ... }@inputs: let # ... - system = "x86_64-linux"; # change to whatever your system should be. + system = "x86_64-linux"; # change to whatever your system should be. pkgs = import nixpkgs { - inherit system; - # ... - overlays = [ + inherit system; + # ... + overlays = [ inputs.hyprpanel.overlay - ]; - }; + ]; + }; in { # ... } diff --git a/flake.lock b/flake.lock index a161abe..695fe36 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1735485506, - "narHash": "sha256-7CWr3Q83KnGiLUn0oaboafLMOXQ0X9/fjFRVY1xopbM=", + "lastModified": 1736090999, + "narHash": "sha256-B5CJuHqfJrzPa7tObK0H9669/EClSHpa/P7B9EuvElU=", "owner": "aylur", "repo": "ags", - "rev": "251d39413543264361898b02035775aa3e46fe52", + "rev": "5527c3c07d92c11e04e7fd99d58429493dba7e3c", "type": "github" }, "original": { @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3110342..9bdd585 100644 --- a/flake.nix +++ b/flake.nix @@ -33,6 +33,7 @@ battery bluetooth mpris + cava network notifd powerprofiles diff --git a/scripts/fillThemes.js b/scripts/fillThemes.js index 2d8e3fe..f95876b 100644 --- a/scripts/fillThemes.js +++ b/scripts/fillThemes.js @@ -402,8 +402,11 @@ const main = async () => { const themeFiles = (await fs.readdir(themesDir)).filter((file) => file.endsWith('.json')); const specialKeyMappings = { - 'theme.bar.menus.menu.bluetooth.scroller.color': 'theme.bar.menus.menu.bluetooth.label.color', - 'theme.bar.menus.menu.network.scroller.color': 'theme.bar.menus.menu.network.label.color', + 'theme.bar.buttons.modules.cava.text': 'theme.bar.buttons.modules.submap.text', + 'theme.bar.buttons.modules.cava.background': 'theme.bar.buttons.modules.submap.background', + 'theme.bar.buttons.modules.cava.icon_background': 'theme.bar.buttons.modules.submap.icon_background', + 'theme.bar.buttons.modules.cava.icon': 'theme.bar.buttons.modules.submap.icon', + 'theme.bar.buttons.modules.cava.border': 'theme.bar.buttons.modules.submap.border', }; const queue = [...themeFiles].filter( @@ -412,6 +415,7 @@ const main = async () => { ); const processQueue = async () => { + const concurrencyLimit = 5; while (queue.length > 0) { const promises = []; for (let i = 0; i < concurrencyLimit && queue.length > 0; i++) { diff --git a/src/components/bar/exports.ts b/src/components/bar/exports.ts index 13da913..fc4f9b5 100644 --- a/src/components/bar/exports.ts +++ b/src/components/bar/exports.ts @@ -23,6 +23,7 @@ import { Weather } from '../../components/bar/modules/weather/index'; import { Power } from '../../components/bar/modules/power/index'; import { Hyprsunset } from '../../components/bar/modules/hyprsunset/index'; import { Hypridle } from '../../components/bar/modules/hypridle/index'; +import { Cava } from '../../components/bar/modules/cava/index'; export { Menu, @@ -50,4 +51,5 @@ export { Power, Hyprsunset, Hypridle, + Cava, }; diff --git a/src/components/bar/index.tsx b/src/components/bar/index.tsx index aed8c48..e770c04 100644 --- a/src/components/bar/index.tsx +++ b/src/components/bar/index.tsx @@ -24,6 +24,7 @@ import { Power, Hyprsunset, Hypridle, + Cava, } from './exports'; import { WidgetContainer } from './shared/WidgetContainer'; @@ -62,6 +63,7 @@ const widget = { power: (): JSX.Element => WidgetContainer(Power()), hyprsunset: (): JSX.Element => WidgetContainer(Hyprsunset()), hypridle: (): JSX.Element => WidgetContainer(Hypridle()), + cava: (): JSX.Element => WidgetContainer(Cava()), }; export const Bar = (() => { diff --git a/src/components/bar/modules/bluetooth/index.tsx b/src/components/bar/modules/bluetooth/index.tsx index 473bddc..7f55d80 100644 --- a/src/components/bar/modules/bluetooth/index.tsx +++ b/src/components/bar/modules/bluetooth/index.tsx @@ -11,11 +11,11 @@ import { Astal } from 'astal/gtk3'; const { rightClick, middleClick, scrollDown, scrollUp } = options.bar.bluetooth; const Bluetooth = (): BarBoxChild => { - const btIcon = (isPowered: boolean): JSX.Element => ( + const BluetoothIcon = ({ isPowered }: BluetoothIconProps): JSX.Element => (