From a98ca2bbfc9383eea0d98fa51079798c001397bd Mon Sep 17 00:00:00 2001 From: SuperSuslik312 Date: Thu, 28 Mar 2024 17:54:15 +0300 Subject: [PATCH 1/2] exported useFlag from statusicons to user_options --- .config/ags/modules/.commonwidgets/statusicons.js | 2 +- .config/ags/modules/.configuration/user_options.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.config/ags/modules/.commonwidgets/statusicons.js b/.config/ags/modules/.commonwidgets/statusicons.js index c8f1f6d70..d5fb06417 100644 --- a/.config/ags/modules/.commonwidgets/statusicons.js +++ b/.config/ags/modules/.commonwidgets/statusicons.js @@ -273,7 +273,7 @@ const HyprlandXkbKeyboardLayout = async ({ useFlag } = {}) => { const OptionalKeyboardLayout = async () => { try { - return await HyprlandXkbKeyboardLayout({ useFlag: false }); + return await HyprlandXkbKeyboardLayout({ useFlag: userOptions.layout.useFlag }); } catch { return null; } diff --git a/.config/ags/modules/.configuration/user_options.js b/.config/ags/modules/.configuration/user_options.js index 0f8f3bb7e..929284b2a 100644 --- a/.config/ags/modules/.configuration/user_options.js +++ b/.config/ags/modules/.configuration/user_options.js @@ -100,6 +100,10 @@ let configOptions = { 'prevTab': "Ctrl+Page_Up", }, }, + 'layout': { + // Use or not country flags instead of text in default hyprland kb_layout option + 'useFlag': false + } } // Override defaults with user's options From dfbfa28e8a58586e9fe26240d00e069de6153d3f Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Thu, 28 Mar 2024 22:07:42 +0700 Subject: [PATCH 2/2] move flag config option to "appearance" --- .config/ags/modules/.commonwidgets/statusicons.js | 2 +- .config/ags/modules/.configuration/user_options.js | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.config/ags/modules/.commonwidgets/statusicons.js b/.config/ags/modules/.commonwidgets/statusicons.js index d5fb06417..4ca88eb21 100644 --- a/.config/ags/modules/.commonwidgets/statusicons.js +++ b/.config/ags/modules/.commonwidgets/statusicons.js @@ -273,7 +273,7 @@ const HyprlandXkbKeyboardLayout = async ({ useFlag } = {}) => { const OptionalKeyboardLayout = async () => { try { - return await HyprlandXkbKeyboardLayout({ useFlag: userOptions.layout.useFlag }); + return await HyprlandXkbKeyboardLayout({ useFlag: userOptions.appearance.keyboardUseFlag }); } catch { return null; } diff --git a/.config/ags/modules/.configuration/user_options.js b/.config/ags/modules/.configuration/user_options.js index 929284b2a..60b45d2f0 100644 --- a/.config/ags/modules/.configuration/user_options.js +++ b/.config/ags/modules/.configuration/user_options.js @@ -16,6 +16,9 @@ let configOptions = { 'durationSmall': 110, 'durationLarge': 180, }, + 'appearance': { + 'keyboardUseFlag': false, // Use flag emoji instead of abbreviation letters + }, 'apps': { 'imageViewer': "loupe", 'terminal': "foot", // This is only for shell actions @@ -100,10 +103,6 @@ let configOptions = { 'prevTab': "Ctrl+Page_Up", }, }, - 'layout': { - // Use or not country flags instead of text in default hyprland kb_layout option - 'useFlag': false - } } // Override defaults with user's options