From 0c70dbd86687182995ee0c7ba14475f89cdf60ea Mon Sep 17 00:00:00 2001 From: matt1432 Date: Tue, 5 Mar 2024 19:36:25 -0500 Subject: [PATCH] feat(ags): add nixos-logo icon and move into separate file --- .../ags/config/ts/bar/items/quick-settings.ts | 4 +-- modules/ags/default.nix | 36 ++++++++----------- modules/ags/icons.nix | 35 ++++++++++++++++++ 3 files changed, 51 insertions(+), 24 deletions(-) create mode 100644 modules/ags/icons.nix diff --git a/modules/ags/config/ts/bar/items/quick-settings.ts b/modules/ags/config/ts/bar/items/quick-settings.ts index 681967b..3dc189c 100644 --- a/modules/ags/config/ts/bar/items/quick-settings.ts +++ b/modules/ags/config/ts/bar/items/quick-settings.ts @@ -1,4 +1,4 @@ -const { Box, Label } = Widget; +const { Box, Icon } = Widget; import Audio from '../hovers/audio.ts'; import Bluetooth from '../hovers/bluetooth.ts'; @@ -70,7 +70,7 @@ export default () => { ...hoverRevealers, - Label(' '), + Icon('nixos-logo-symbolic'), Separator(SPACING), ], diff --git a/modules/ags/default.nix b/modules/ags/default.nix index 91a5bda..37c92c7 100644 --- a/modules/ags/default.nix +++ b/modules/ags/default.nix @@ -28,30 +28,22 @@ in { programs.ags.enable = true; home = { - file = { - ".config/ags".source = symlink /home/${mainUser}/.nix/modules/ags/config; + file = + { + ".config/ags".source = symlink /home/${mainUser}/.nix/modules/ags/config; - # Icons - "${agsConfigDir}/icons/mouse-razer-symbolic.svg".source = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/bithatch/razer-icon-font/main/src/devices/mouse.svg"; - hash = "sha256-A1+eIp2VEFDyY23GIHKhbnByHXrnVS3QgIJ9sjjtuZw="; - }; - "${agsConfigDir}/icons/down-large-symbolic.svg".source = pkgs.fetchurl { - url = "https://www.svgrepo.com/download/158537/down-chevron.svg"; - hash = "sha256-mOfNjgZh0rt6XosKA2kpLY22lJldSS1XCphgrnvZH1s="; - }; + "${agsConfigDir}/types".source = agsTypes.source; + "${agsConfigDir}/config.js".text = + /* + javascript + */ + '' + import { transpileTypeScript } from './js/utils.js'; - "${agsConfigDir}/types".source = agsTypes.source; - "${agsConfigDir}/config.js".text = - /* - javascript - */ - '' - import { transpileTypeScript } from './js/utils.js'; - - export default (await transpileTypeScript('${hostName}')).default; - ''; - }; + export default (await transpileTypeScript('${hostName}')).default; + ''; + } + // (import ./icons.nix {inherit pkgs agsConfigDir;}); packages = [config.customPkgs.coloryou] diff --git a/modules/ags/icons.nix b/modules/ags/icons.nix new file mode 100644 index 0000000..092856b --- /dev/null +++ b/modules/ags/icons.nix @@ -0,0 +1,35 @@ +{ + agsConfigDir, + pkgs, + ... +}: { + "${agsConfigDir}/icons/mouse-razer-symbolic.svg".source = pkgs.fetchurl { + url = "https://raw.githubusercontent.com/bithatch/razer-icon-font/main/src/devices/mouse.svg"; + hash = "sha256-A1+eIp2VEFDyY23GIHKhbnByHXrnVS3QgIJ9sjjtuZw="; + }; + + "${agsConfigDir}/icons/down-large-symbolic.svg".source = pkgs.fetchurl { + url = "https://www.svgrepo.com/download/158537/down-chevron.svg"; + hash = "sha256-mOfNjgZh0rt6XosKA2kpLY22lJldSS1XCphgrnvZH1s="; + }; + + "${agsConfigDir}/icons/nixos-logo-symbolic.svg".text = + /* + xml + */ + '' + + + + + + + + + + + + + + ''; +}