diff --git a/.config/ags/modules/.configuration/user_options.js b/.config/ags/modules/.configuration/user_options.js index 31f2f89ea..be6fa3c45 100644 --- a/.config/ags/modules/.configuration/user_options.js +++ b/.config/ags/modules/.configuration/user_options.js @@ -84,6 +84,19 @@ let configOptions = { 'wsNumMarginScale': 0.07, }, 'sidebar': { + 'ai': { + 'extraGptModels': { + 'oxygen3': { + 'name': 'Oxygen (GPT-3.5)', + 'logo_name': 'ai-oxygen-symbolic', + 'description': 'An API from Tornado Softwares\nPricing: Free: 100/day\nRequires you to join their Discord for a key', + 'base_url': 'https://app.oxyapi.uk/v1/chat/completions', + 'key_get_url': 'https://discord.com/invite/kM6MaCqGKA', + 'key_file': 'oxygen_key.txt', + 'model': 'gpt-3.5-turbo', + }, + } + }, 'image': { 'columns': 2, 'batchCount': 20, @@ -95,7 +108,6 @@ let configOptions = { 'order': ["gemini", "gpt", "waifu", "booru"], } }, - }, 'search': { 'enableFeatures': { @@ -217,7 +229,7 @@ function overrideConfigRecursive(userOverrides, configOptions = {}, check = true optionsOkay = false; } else if (typeof value === 'object' && !(value instanceof Array)) { - if (key === "substitutions" || key === "regexSubstitutions") { + if (key === "substitutions" || key === "regexSubstitutions" || key === "extraGptModels") { overrideConfigRecursive(value, configOptions[key], false); } else overrideConfigRecursive(value, configOptions[key]); } else { diff --git a/.config/ags/services/gpt.js b/.config/ags/services/gpt.js index 6d7f40203..ffd6ce3d9 100644 --- a/.config/ags/services/gpt.js +++ b/.config/ags/services/gpt.js @@ -6,7 +6,7 @@ import GLib from 'gi://GLib'; import Soup from 'gi://Soup?version=3.0'; import { fileExists } from '../modules/.miscutils/files.js'; -const PROVIDERS = { // There's this list hmm https://github.com/zukixa/cool-ai-stuff/ +const PROVIDERS = Object.assign({ // There's this list hmm https://github.com/zukixa/cool-ai-stuff/ 'openai': { 'name': 'OpenAI', 'logo_name': 'openai-symbolic', @@ -43,15 +43,6 @@ const PROVIDERS = { // There's this list hmm https://github.com/zukixa/cool-ai-s 'key_file': 'oxygen_key.txt', 'model': 'gpt-4o', }, - 'oxygen3': { - 'name': 'Oxygen (GPT-3.5)', - 'logo_name': 'ai-oxygen-symbolic', - 'description': 'An API from Tornado Softwares\nPricing: Free: 100/day\nRequires you to join their Discord for a key', - 'base_url': 'https://app.oxyapi.uk/v1/chat/completions', - 'key_get_url': 'https://discord.com/invite/kM6MaCqGKA', - 'key_file': 'oxygen_key.txt', - 'model': 'gpt-3.5-turbo', - }, 'zukijourney': { 'name': 'zukijourney (GPT-3.5)', 'logo_name': 'ai-zukijourney', @@ -61,7 +52,7 @@ const PROVIDERS = { // There's this list hmm https://github.com/zukixa/cool-ai-s 'key_file': 'zuki_key.txt', 'model': 'gpt-3.5-turbo', }, -} +}, userOptions.sidebar.ai.extraGptModels) // Custom prompt const initMessages = diff --git a/.config/chrome-flags.conf b/.config/chrome-flags.conf new file mode 100644 index 000000000..4f1b51862 --- /dev/null +++ b/.config/chrome-flags.conf @@ -0,0 +1,6 @@ +--password-store=gnome-libsecret +--ozone-platform-hint=wayland +--gtk-version=4 +--ignore-gpu-blocklist +--enable-features=TouchpadOverscrollHistoryNavigation +--enable-wayland-ime diff --git a/.config/code-flags.conf b/.config/code-flags.conf index f00a08ee2..0786a0c69 100644 --- a/.config/code-flags.conf +++ b/.config/code-flags.conf @@ -3,3 +3,4 @@ --ignore-gpu-blocklist --enable-features=TouchpadOverscrollHistoryNavigation --enable-wayland-ime +--password-store=gnome-libsecret diff --git a/arch-packages/illogical-impulse-basic/PKGBUILD b/arch-packages/illogical-impulse-basic/PKGBUILD index 5027f7c3f..1b1418e17 100644 --- a/arch-packages/illogical-impulse-basic/PKGBUILD +++ b/arch-packages/illogical-impulse-basic/PKGBUILD @@ -16,6 +16,7 @@ depends=( wget ripgrep gojq + jq npm meson typescript