Merge pull request #88 from striped-bass/hyprland-yorha

2026-04-06 00:32:09 +02:00 · 2025-12-02 06:55:14 -08:00
parent 594967bf7e 3bb0fa9861
commit 2f09aef5bf
10 changed files with 42 additions and 37 deletions
--- a/components/ags/style/color-dark.scss
+++ b/components/ags/style/color-dark.scss
@@ -1,6 +1,6 @@
-$tan: rgb(87, 84, 74);
-$brown: rgb(218, 212, 187);
-$highlight: rgb(65, 61, 52);
-$darkBrown: rgb(179, 172, 146);
+$tan: #57544a;
+$brown: #dad4bb;
+$highlight: #413d34;
+$darkBrown: #b3ac92;
 $accent: #cd664d;
 $accent2: #a0c490;
--- a/components/ags/widgets/bluetooth_group.js
+++ b/components/ags/widgets/bluetooth_group.js
@@ -8,7 +8,7 @@ const { Label } = Widget;

 export const BluetoothGroup = ({
  go_to = async (buttons, parent_button) => {},
-  enabled = Variable(Bluetooth.enabled ? "YES" : "NO", {}),
+  enabled = Variable(Bluetooth.enabled ? "Yes" : "No", {}),
  passAssetsDir = assetsDir
 }) => {
  return [
@@ -16,15 +16,15 @@ export const BluetoothGroup = ({
    NierDropDownButton({
      useAssetsDir: passAssetsDir,
      font_size: button_label_2,
-      label: "enabled",
+      label: "Enabled",
      current: enabled,
-      options: Variable(["YES", "NO"], {}),
+      options: Variable(["Yes", "No"], {}),
      popup_x_offset: SCREEN_WIDTH / 4,
      connections: [
        [
          enabled,
          (self) => {
-            Bluetooth.enabled = enabled.value == "YES";
+            Bluetooth.enabled = enabled.value == "Yes";
          },
        ],
      ],
@@ -32,7 +32,7 @@ export const BluetoothGroup = ({
    NierButton({
      useAssetsDir: passAssetsDir,
      font_size: button_label_2,
-      label: "devices",
+      label: "Devices",
      handleClick: async (self, event) => {
        go_to(
          [
@@ -42,12 +42,13 @@ export const BluetoothGroup = ({
              classNames: ["heading"],
            }),
            ...Array.from(Bluetooth.devices).map((device) => {
-              let device_options = Variable(["CONNECTED", "DISCONNECTED"], {});
+              let device_options = Variable(["Connected", "Disconnected"], {});
              let device_current = Variable(
-                device.connected ? "CONNECTED" : "DISCONNECTED",
+                device.connected ? "Connected" : "Disconnected",
                {}
              );
              return NierDropDownButton({
+                useAssetsDir: passAssetsDir,
                label: device.name,
                current: device_current,
                options: device_options,
@@ -56,7 +57,7 @@ export const BluetoothGroup = ({
                  [
                    device_current,
                    (self) => {
-                      if (device_current.value == "CONNECTED") {
+                      if (device_current.value == "Connected") {
                        device.setConnection(false);
                      } else {
                        device.setConnection(true);
--- a/components/ags/widgets/info.js
+++ b/components/ags/widgets/info.js
@@ -11,6 +11,10 @@ import { assetsDir,dark } from "../util.js";
 const { Box, Label, Icon, Button } = Widget;
 const { execAsync } = Utils;

+function capitalize_first_letter(val) {
+  return String(val).charAt(0).toUpperCase() + String(val).slice(1);
+}
+
 const SysTray = () =>
  Box({
    hpack: "end",
@@ -61,7 +65,7 @@ export const Info = ({
      }),
      NierButton({
        useAssetsDir,
-        label:dark.value?"dark":"light",
+        label:capitalize_first_letter(dark.value?"dark":"light"),
        handleClick: async (self,event) => {
          execAsync(`ags -b settings -r App.closeWindow("settings")`)
          execAsync(`ags -b bg_settings -r App.closeWindow("bg_settings")`).catch(print).then(print)
--- a/components/ags/widgets/volume_group.js
+++ b/components/ags/widgets/volume_group.js
@@ -51,8 +51,8 @@ export const VolumeGroup = ({
 }) => {
  return [
    Label({ hpack: "start", label: "VOLUME", classNames: ["heading"] ,css:`margin-top: ${settings_title_top}px;margin-bottom: ${settings_title_bottom}px;`}),
-    volume_slider({useAssetsDir: passAssetsDir, type: "speaker", volume_ratio: volume_ratio }),
-    volume_slider({useAssetsDir: passAssetsDir, type: "microphone", volume_ratio: mic_volume_ratio }),
+    volume_slider({useAssetsDir: passAssetsDir, type: "Speaker", volume_ratio: volume_ratio }),
+    volume_slider({useAssetsDir: passAssetsDir, type: "Microphone", volume_ratio: mic_volume_ratio }),
    NierButton({
      useAssetsDir: passAssetsDir,
      container_style: "padding-top: 40px;",
--- a/components/ags/widgets/wifi_group.js
+++ b/components/ags/widgets/wifi_group.js
@@ -6,7 +6,7 @@ import { SCREEN_WIDTH,assetsDir } from "../util.js";
 const { Label } = Widget;

 export const WifiGroup = ({
-  enabled = Variable(Network.wifi.enabled ? "YES" : "NO", {}),
+  enabled = Variable(Network.wifi.enabled ? "Yes" : "No", {}),
  current_ssid = Variable("", {}),
  current_networks = Variable(["loading..."], {}),
  go_to = (buttons, self) => {},
@@ -17,9 +17,9 @@ export const WifiGroup = ({
    NierDropDownButton({
      useAssetsDir: passAssetsDir,
      font_size: button_label_2,
-      label: "enabled",
+      label: "Enabled",
      current: enabled,
-      options: Variable(["YES", "NO"], {}),
+      options: Variable(["Yes", "No"], {}),
      popup_x_offset: SCREEN_WIDTH / 4,
      connections: [
        [
@@ -33,7 +33,7 @@ export const WifiGroup = ({
    NierDropDownButton({
      useAssetsDir: passAssetsDir,
      font_size: button_label_2,
-      label: "connect",
+      label: "Connect",
      current: current_ssid,
      options: current_networks,
      popup_x_offset: SCREEN_WIDTH / 4,
--- a/components/ags/windows/settings/settings.js
+++ b/components/ags/windows/settings/settings.js
@@ -245,7 +245,7 @@ const NierSettingPane = (
            NierButton({
              useAssetsDir: parentAssetsDir,
              font_size: 30,
-              label: "SOUND",
+              label: "Sound",
              handleClick: async (self, event) => {
                page1_selected = ensure_only_selected(self, page1_selected);
                await go_page2(volume_page(go_page3), self).catch((e) => {
@@ -256,7 +256,7 @@ const NierSettingPane = (
            NierButton({
              useAssetsDir: parentAssetsDir,
              font_size: 30,
-              label: "WIFI",
+              label: "Wi-Fi",
              handleClick: async (self, event) => {
                await go_page2(wifi_page(), self).catch((e) => {
                  console.log(e);
@@ -266,7 +266,7 @@ const NierSettingPane = (
            NierButton({
              useAssetsDir: parentAssetsDir,
              font_size: 30,
-              label: "BLUETOOTH",
+              label: "Bluetooth",
              handleClick: async (self, event) => {
                await go_page2(bluetooth_page(go_page3), self).catch(
                  (e) => {
@@ -278,7 +278,7 @@ const NierSettingPane = (
            NierButton({
              useAssetsDir: parentAssetsDir,
              font_size: 30,
-              label: "POWER",
+              label: "Power",
              handleClick: async (self, event) => {
                await go_page2(power_page(), self).catch((e) => {
                  console.log(e);
--- a/components/foot.ini
+++ b/components/foot.ini
@@ -8,7 +8,7 @@
 # title=foot
 # locked-title=no

-font=BlexMono Nerd Font:size=16
+font=BlexMono Nerd Font:size=16, font=Angelic:size=16
 # font-bold=<bold variant of regular font>
 # font-italic=<italic variant of regular font>
 # font-bold-italic=<bold+italic variant of regular font>
--- a/components/gridlines.frag
+++ b/components/gridlines.frag
@@ -1,10 +1,9 @@
-//
-// Example blue light filter shader.
-// 
+#version 300 es

 precision mediump float;
-varying vec2 v_texcoord;
+in vec2 v_texcoord;
 uniform sampler2D tex;
+out vec4 fragColor;

 void main() {
 	vec4 pixColor = texture2D(tex, v_texcoord);
@@ -14,8 +13,6 @@ void main() {
 			pixColor[0] *= 0.97;
 			pixColor[1] *= 0.97;
 			pixColor[2] *= 0.97;
-
-		// pixColor = vec4(0.10980392156,0.10588235294 ,0.09411764705 ,1);
    }
-	gl_FragColor = pixColor;
+	fragColor = pixColor;
 }
--- a/readme.md
+++ b/readme.md
@@ -26,10 +26,14 @@ A rice inspired by `NieR:Automata` ui
    - ### Dependancies
        #### Arch
        > ```sh
-        > paru -S hyprland-git foot grim swww-git fish theme.sh aylurs-gtk-shell-git sassc starship cava imagemagick hyprland-plugin-hyprbars-git gnome-bluetooth wl-clipboard libdbusmenu-gtk3 gnome-bluetooth-3.0 xorg-xrandr nerd-fonts cpio cmake git meson gcc
+        > paru -S hyprland-git foot grim swww-git fish theme.sh sassc starship cava imagemagick gnome-bluetooth wl-clipboard libdbusmenu-gtk3 gnome-bluetooth-3.0 xorg-xrandr cpio cmake git meson gcc
        > ```
        #### STTT
        > install from https://github.com/flick0/sttt
+        #### AGS (fork of v1.8.2 with patches)
+        > install from https://github.com/striped-bass/ags
+        #### Unimatrix (Angelic fork) 
+        > install from https://github.com/striped-bass/unimatrix
    - ### Install and enable `hyprbars` plugin via `hyprpm`
      > ```sh
      > hyprpm update
@@ -45,10 +49,10 @@ A rice inspired by `NieR:Automata` ui
    - ### Apply theme
      
      - manual
-         > add this under the `$THEME`` variable in `hyprland.conf`
+         > add this under the `$THEME` variable in `hyprland.conf`
         > ```
         > $yorha=$THEME/yorha
-         > source=$nier/theme.conf
+         > source=$yorha/theme.conf
         > ```
      
      - hyprtheme
--- a/theme.conf
+++ b/theme.conf
@@ -5,7 +5,7 @@ exec-once=pkill ags
 exec=sleep 1 && ags -c $yorha/components/ags/config.js
 exec=swww-daemon
 exec=sleep 1 && swww img $yorha/wallpapers/nier_light.png --transition-type simple --transition-step 255
-exec-once=hyprpm reload -n
+exec-once=hyprpm reload -nn

 bind=Super,o,exec,$DRUN

@@ -41,8 +41,8 @@ decoration {
    range = 1
    render_power = 1
    offset =5 5
-    # screen_shader = $yorha/components/gridlines.frag
    }
+    screen_shader = $yorha/components/gridlines.frag
 }

 plugin {
@@ -77,7 +77,6 @@ animations {
 }

 bind=Super,v,exec,ags -b player -t player
-bind=Super,o,exec,wofi

 windowrule=move 400 510,title:^(fly_is_foot)$