From 4989a8a7af88ddd6cfc2e745be4024db805f5c2a Mon Sep 17 00:00:00 2001 From: striped-bass Date: Sat, 11 Oct 2025 19:26:04 -0700 Subject: [PATCH 01/12] Fix typo --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 24e0abb..39b0e82 100644 --- a/readme.md +++ b/readme.md @@ -48,7 +48,7 @@ A rice inspired by `NieR:Automata` ui > add this under the `$THEME`` variable in `hyprland.conf` > ``` > $yorha=$THEME/yorha - > source=$nier/theme.conf + > source=$yorha/theme.conf > ``` - hyprtheme From 91701e92445b9d538380034ce5962755cb2fdaad Mon Sep 17 00:00:00 2001 From: striped-bass Date: Sun, 12 Oct 2025 09:37:50 -0700 Subject: [PATCH 02/12] Remove unneeded dependency --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 39b0e82..ec61628 100644 --- a/readme.md +++ b/readme.md @@ -26,7 +26,7 @@ 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 aylurs-gtk-shell-git sassc starship cava imagemagick gnome-bluetooth wl-clipboard libdbusmenu-gtk3 gnome-bluetooth-3.0 xorg-xrandr nerd-fonts cpio cmake git meson gcc > ``` #### STTT > install from https://github.com/flick0/sttt From dd948a1db924c0a91875056591ea193797330b93 Mon Sep 17 00:00:00 2001 From: striped-bass Date: Sun, 12 Oct 2025 14:59:10 -0700 Subject: [PATCH 03/12] Update installation instructions for ags --- readme.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index ec61628..492d969 100644 --- a/readme.md +++ b/readme.md @@ -26,10 +26,12 @@ 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 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 nerd-fonts 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 - ### Install and enable `hyprbars` plugin via `hyprpm` > ```sh > hyprpm update From 35203a6a5ae0f3be1cd12922426fad7d264e1471 Mon Sep 17 00:00:00 2001 From: striped-bass Date: Sun, 12 Oct 2025 15:15:09 -0700 Subject: [PATCH 04/12] Fix typo --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 492d969..389d2a5 100644 --- a/readme.md +++ b/readme.md @@ -47,7 +47,7 @@ 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=$yorha/theme.conf From e853185757a22cec1e15da435315f6e0249d529e Mon Sep 17 00:00:00 2001 From: striped-bass Date: Sun, 12 Oct 2025 19:56:41 -0700 Subject: [PATCH 05/12] Remove unused binding for wofi --- theme.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/theme.conf b/theme.conf index a6cadf4..099cac4 100644 --- a/theme.conf +++ b/theme.conf @@ -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)$ From 146701c5c855f9fa574d0048f5b4e4c305c2c89c Mon Sep 17 00:00:00 2001 From: striped-bass Date: Wed, 15 Oct 2025 20:11:17 -0700 Subject: [PATCH 06/12] Prefer hyrpm notifications for fail events only --- theme.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme.conf b/theme.conf index 099cac4..d9fcac0 100644 --- 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 From beffb0ddf0b3462cc0f47968e935f79dd44eb6f3 Mon Sep 17 00:00:00 2001 From: striped-bass Date: Fri, 17 Oct 2025 22:32:40 -0700 Subject: [PATCH 07/12] Fix grid effect fragment shader for compatiblity with GLES 3.0 syntax (required since Hyprland 0.50.0) --- components/gridlines.frag | 11 ++++------- theme.conf | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/components/gridlines.frag b/components/gridlines.frag index d057c23..8a122b7 100644 --- 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; } \ No newline at end of file diff --git a/theme.conf b/theme.conf index d9fcac0..16e9be2 100644 --- a/theme.conf +++ b/theme.conf @@ -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 { From d5a88cb569340fb107938663ad9b491060c1d36d Mon Sep 17 00:00:00 2001 From: striped-bass Date: Fri, 24 Oct 2025 09:59:31 -0700 Subject: [PATCH 08/12] Removed dependency on nerd-fonts (since the Blex Mono Nerd Font is already installed as a dependency for starship) --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 389d2a5..015fcb1 100644 --- a/readme.md +++ b/readme.md @@ -26,7 +26,7 @@ A rice inspired by `NieR:Automata` ui - ### Dependancies #### Arch > ```sh - > 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 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 From c49a63d77d7dbdf5adbc41f6ad41c010e000458d Mon Sep 17 00:00:00 2001 From: striped-bass Date: Fri, 24 Oct 2025 11:52:20 -0700 Subject: [PATCH 09/12] install unimatrix fork for angelic language --- components/foot.ini | 2 +- readme.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/components/foot.ini b/components/foot.ini index 22fa52f..abede3d 100644 --- 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= # font-italic= # font-bold-italic= diff --git a/readme.md b/readme.md index 015fcb1..7aefeba 100644 --- a/readme.md +++ b/readme.md @@ -32,6 +32,8 @@ A rice inspired by `NieR:Automata` ui > 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 From cb362d89db1bccb547bf072b7f4697fc1d7188e9 Mon Sep 17 00:00:00 2001 From: striped-bass Date: Fri, 24 Oct 2025 21:32:25 -0700 Subject: [PATCH 10/12] Update button labels for consistent capitalization --- components/ags/widgets/bluetooth_group.js | 16 ++++++++-------- components/ags/widgets/info.js | 6 +++++- components/ags/widgets/volume_group.js | 4 ++-- components/ags/widgets/wifi_group.js | 8 ++++---- components/ags/windows/settings/settings.js | 8 ++++---- 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/components/ags/widgets/bluetooth_group.js b/components/ags/widgets/bluetooth_group.js index e7d70ce..e36d030 100644 --- 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,9 +42,9 @@ 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({ @@ -56,7 +56,7 @@ export const BluetoothGroup = ({ [ device_current, (self) => { - if (device_current.value == "CONNECTED") { + if (device_current.value == "Connected") { device.setConnection(false); } else { device.setConnection(true); diff --git a/components/ags/widgets/info.js b/components/ags/widgets/info.js index ccaac3e..21ef52a 100644 --- 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) diff --git a/components/ags/widgets/volume_group.js b/components/ags/widgets/volume_group.js index 272a0d9..2ab214d 100644 --- 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;", diff --git a/components/ags/widgets/wifi_group.js b/components/ags/widgets/wifi_group.js index 9c01ed3..d6e00b9 100644 --- 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, diff --git a/components/ags/windows/settings/settings.js b/components/ags/windows/settings/settings.js index 2ea8dc1..01092c5 100644 --- 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); From e741e83bfcf63c8c76fd738f876e77d99a0719d0 Mon Sep 17 00:00:00 2001 From: striped-bass Date: Fri, 24 Oct 2025 21:35:32 -0700 Subject: [PATCH 11/12] Fix missing asset directory for buttons that show bluetooth device names --- components/ags/widgets/bluetooth_group.js | 1 + 1 file changed, 1 insertion(+) diff --git a/components/ags/widgets/bluetooth_group.js b/components/ags/widgets/bluetooth_group.js index e36d030..d2ad34a 100644 --- a/components/ags/widgets/bluetooth_group.js +++ b/components/ags/widgets/bluetooth_group.js @@ -48,6 +48,7 @@ export const BluetoothGroup = ({ {} ); return NierDropDownButton({ + useAssetsDir: passAssetsDir, label: device.name, current: device_current, options: device_options, From 3bb0fa9861c30477722dd189ee6a422ec9ca4124 Mon Sep 17 00:00:00 2001 From: striped-bass Date: Sat, 25 Oct 2025 21:28:42 -0700 Subject: [PATCH 12/12] Update remaining dark color codes to hexadecimal for consistency --- components/ags/style/color-dark.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/ags/style/color-dark.scss b/components/ags/style/color-dark.scss index 4ef5f27..53e320f 100644 --- 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; \ No newline at end of file