From e976ce89c1df9750a5ee1a355bd9f409efe49d91 Mon Sep 17 00:00:00 2001 From: Christopher Narowski Date: Tue, 19 Dec 2023 01:48:32 -0700 Subject: [PATCH] fix: correct theme memory display template for byte-to-gigabyte conversion Updated conversion factor from 1000000000 to 1073741824. This change ensures memory usage is correctly displayed as a gigabyte (2^30 bytes). --- themes/1_shell.omp.json | 6 ++---- themes/di4am0nd.omp.json | 2 +- themes/easy-term.omp.json | 2 +- themes/if_tea.omp.json | 2 +- themes/illusi0n.omp.json | 2 +- themes/tokyo.omp.json | 2 +- themes/wholespace.omp.json | 2 +- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/themes/1_shell.omp.json b/themes/1_shell.omp.json index 0e8f7d45..0fbc0a27 100644 --- a/themes/1_shell.omp.json +++ b/themes/1_shell.omp.json @@ -69,7 +69,7 @@ { "foreground": "#94ffa2", "style": "diamond", - "template": " <#ffffff>MEM: {{ round .PhysicalPercentUsed .Precision }}% ({{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1000000000.0) }}/{{ (div .PhysicalTotalMemory 1000000000.0) }}GB)", + "template": " <#ffffff>MEM: {{ round .PhysicalPercentUsed .Precision }}% ({{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1073741824.0) }}/{{ (div .PhysicalTotalMemory 1073741824.0) }}GB)", "type": "sysinfo" } ], @@ -95,9 +95,7 @@ }, { "foreground": "#A9FFB4", - "foreground_templates": [ - "{{ if gt .Code 0 }}#ef5350{{ end }}" - ], + "foreground_templates": ["{{ if gt .Code 0 }}#ef5350{{ end }}"], "properties": { "always_enabled": true }, diff --git a/themes/di4am0nd.omp.json b/themes/di4am0nd.omp.json index 49bee834..efdfca3f 100644 --- a/themes/di4am0nd.omp.json +++ b/themes/di4am0nd.omp.json @@ -46,7 +46,7 @@ { "foreground": "#85C980", "style": "diamond", - "template": "RAM:{{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1000000000.0) }}/{{ (div .PhysicalTotalMemory 1000000000.0) }}GB ", + "template": "RAM:{{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1073741824.0) }}/{{ (div .PhysicalTotalMemory 1073741824.0) }}GB ", "trailing_diamond": " ", "type": "sysinfo" }, diff --git a/themes/easy-term.omp.json b/themes/easy-term.omp.json index f0353e0f..af025e5b 100644 --- a/themes/easy-term.omp.json +++ b/themes/easy-term.omp.json @@ -79,7 +79,7 @@ { "foreground": "#81ff91", "style": "diamond", - "template": "<#cc7eda> \u007C <#7eb8da>RAM: {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1000000000.0) }}/{{ (div .PhysicalTotalMemory 1000000000.0) }}GB", + "template": "<#cc7eda> \u007C <#7eb8da>RAM: {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1073741824.0) }}/{{ (div .PhysicalTotalMemory 1073741824.0) }}GB", "type": "sysinfo" }, { diff --git a/themes/if_tea.omp.json b/themes/if_tea.omp.json index 0260dc33..ceb753f7 100644 --- a/themes/if_tea.omp.json +++ b/themes/if_tea.omp.json @@ -44,7 +44,7 @@ "background": "#00c7fc", "foreground": "#000000", "style": "diamond", - "template": "RAM: {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1000000000.0) }}/{{ (div .PhysicalTotalMemory 1000000000.0) }}GB \ue266 ", + "template": "RAM: {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1073741824.0) }}/{{ (div .PhysicalTotalMemory 1073741824.0) }}GB \ue266 ", "trailing_diamond": "\ue0b2", "type": "sysinfo" }, diff --git a/themes/illusi0n.omp.json b/themes/illusi0n.omp.json index 758287ff..89304faa 100644 --- a/themes/illusi0n.omp.json +++ b/themes/illusi0n.omp.json @@ -12,7 +12,7 @@ { "foreground": "#ff8800", "style": "diamond", - "template": "{{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1000000000.0) }}/{{ (div .PhysicalTotalMemory 1000000000.0) }}GB ", + "template": "{{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1073741824.0) }}/{{ (div .PhysicalTotalMemory 1073741824.0) }}GB ", "type": "sysinfo" } ], diff --git a/themes/tokyo.omp.json b/themes/tokyo.omp.json index 36d6a91b..cbfb599b 100644 --- a/themes/tokyo.omp.json +++ b/themes/tokyo.omp.json @@ -31,7 +31,7 @@ { "foreground": "#be9ddf", "style": "diamond", - "template": "[<#ffffff>\ue266 RAM: {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1000000000.0) }}/{{ (div .PhysicalTotalMemory 1000000000.0) }}GB]", + "template": "[<#ffffff>\ue266 RAM: {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1073741824.0) }}/{{ (div .PhysicalTotalMemory 1073741824.0) }}GB]", "type": "sysinfo" }, { diff --git a/themes/wholespace.omp.json b/themes/wholespace.omp.json index a875d6a0..0c2a8bb1 100644 --- a/themes/wholespace.omp.json +++ b/themes/wholespace.omp.json @@ -42,7 +42,7 @@ "background": "#516BEB", "foreground": "#ffffff", "style": "diamond", - "template": "RAM: {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1000000000.0) }}/{{ (div .PhysicalTotalMemory 1068786176.0) }}GB \ue266 ", + "template": "RAM: {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1073741824.0) }}/{{ (div .PhysicalTotalMemory 1073741824.0) }}GB \ue266 ", "trailing_diamond": "\ue0b2", "type": "sysinfo" },