From f7171827e053e737e08b5bf672e3dfb1ddae272a Mon Sep 17 00:00:00 2001
From: tobinio <Tobias.frischmann1@gmail.com>
Date: Fri, 16 Aug 2024 13:21:57 +0200
Subject: [PATCH 1/6] feat: keep library settings

---
 .../src/components/GridDisplay.vue            |  6 ++--
 apps/app-frontend/src/pages/Library.vue       | 25 ++++++++++++++--
 ...de8767987e430d47e12232bab5b391362859.json} | 22 ++++++++++++--
 ...cdcf73da199ea6ac05ee3ee798ece80d877cf.json |  2 +-
 ...427a01d47a200c109e9c1e08e1710a268832.json} |  6 ++--
 .../20240816103233_store_library_settings.sql |  6 ++++
 packages/app-lib/src/state/settings.rs        | 29 ++++++++++++++-----
 7 files changed, 78 insertions(+), 18 deletions(-)
 rename packages/app-lib/.sqlx/{query-03d1aeddf7788320530c447a82342aecdb4099ce183dd9106c4bcc47604cb080.json => query-1b46483074db12bbe5090faccc02de8767987e430d47e12232bab5b391362859.json} (85%)
 rename packages/app-lib/.sqlx/{query-d645daf951ff6fead3c86df685d99bacc81cb0a999c0f8d2ff7755b0089a79d8.json => query-fc37b8887bd48354bc479c62b8ae427a01d47a200c109e9c1e08e1710a268832.json} (82%)
 create mode 100644 packages/app-lib/migrations/20240816103233_store_library_settings.sql

diff --git a/apps/app-frontend/src/components/GridDisplay.vue b/apps/app-frontend/src/components/GridDisplay.vue
index 3fe50e72a..ab7653674 100644
--- a/apps/app-frontend/src/components/GridDisplay.vue
+++ b/apps/app-frontend/src/components/GridDisplay.vue
@@ -121,9 +121,9 @@ const handleOptionsClick = async (args) => {
 }
 
 const search = ref('')
-const group = ref('Category')
-const filters = ref('All profiles')
-const sortBy = ref('Name')
+const group = defineModel('group')
+const filters = defineModel('filters')
+const sortBy = defineModel('sortBy')
 
 const filteredResults = computed(() => {
   let instances = props.instances.filter((instance) => {
diff --git a/apps/app-frontend/src/pages/Library.vue b/apps/app-frontend/src/pages/Library.vue
index 03b8970ad..7517dc46d 100644
--- a/apps/app-frontend/src/pages/Library.vue
+++ b/apps/app-frontend/src/pages/Library.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onUnmounted, ref, shallowRef } from 'vue'
+import { onUnmounted, ref, shallowRef, watch } from 'vue'
 import GridDisplay from '@/components/GridDisplay.vue'
 import { list } from '@/helpers/profile.js'
 import { useRoute } from 'vue-router'
@@ -10,6 +10,7 @@ import { Button } from '@modrinth/ui'
 import { PlusIcon } from '@modrinth/assets'
 import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue'
 import { NewInstanceImage } from '@/assets/icons'
+import { get, set } from '@/helpers/settings.js'
 
 const route = useRoute()
 const breadcrumbs = useBreadcrumbs()
@@ -32,10 +33,30 @@ const unlistenProfile = await profile_listener(async () => {
 onUnmounted(() => {
   unlistenProfile()
 })
+
+const fetchSettings = await get()
+const settings = ref(fetchSettings)
+
+watch(
+  settings,
+  async (oldSettings, newSettings) => {
+    const setSettings = JSON.parse(JSON.stringify(newSettings))
+
+    await set(setSettings)
+  },
+  { deep: true },
+)
 </script>
 
 <template>
-  <GridDisplay v-if="instances.length > 0" label="Instances" :instances="instances" />
+  <GridDisplay
+    v-if="instances.length > 0"
+    label="Instances"
+    :instances="instances"
+    v-model:group="settings.library_group"
+    v-model:filters="settings.library_filter"
+    v-model:sortBy="settings.library_sort"
+  />
   <div v-else class="no-instance">
     <div class="icon">
       <NewInstanceImage />
diff --git a/packages/app-lib/.sqlx/query-03d1aeddf7788320530c447a82342aecdb4099ce183dd9106c4bcc47604cb080.json b/packages/app-lib/.sqlx/query-1b46483074db12bbe5090faccc02de8767987e430d47e12232bab5b391362859.json
similarity index 85%
rename from packages/app-lib/.sqlx/query-03d1aeddf7788320530c447a82342aecdb4099ce183dd9106c4bcc47604cb080.json
rename to packages/app-lib/.sqlx/query-1b46483074db12bbe5090faccc02de8767987e430d47e12232bab5b391362859.json
index 8aaef7ba9..d596ffd7f 100644
--- a/packages/app-lib/.sqlx/query-03d1aeddf7788320530c447a82342aecdb4099ce183dd9106c4bcc47604cb080.json
+++ b/packages/app-lib/.sqlx/query-1b46483074db12bbe5090faccc02de8767987e430d47e12232bab5b391362859.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                max_concurrent_writes, max_concurrent_downloads,\n                theme, default_page, collapsed_navigation, advanced_rendering, native_decorations,\n                discord_rpc, developer_mode, telemetry,\n                onboarded,\n                json(extra_launch_args) extra_launch_args, json(custom_env_vars) custom_env_vars,\n                mc_memory_max, mc_force_fullscreen, mc_game_resolution_x, mc_game_resolution_y, hide_on_process_start,\n                hook_pre_launch, hook_wrapper, hook_post_exit,\n                custom_dir, prev_custom_dir, migrated\n            FROM settings\n            ",
+  "query": "\n            SELECT\n                max_concurrent_writes, max_concurrent_downloads,\n                theme, default_page, collapsed_navigation, advanced_rendering, native_decorations,\n                discord_rpc, developer_mode, telemetry,\n                onboarded,\n                json(extra_launch_args) extra_launch_args, json(custom_env_vars) custom_env_vars,\n                mc_memory_max, mc_force_fullscreen, mc_game_resolution_x, mc_game_resolution_y, hide_on_process_start,\n                hook_pre_launch, hook_wrapper, hook_post_exit,\n                custom_dir, prev_custom_dir, migrated,\n                library_sort, library_filter, library_group\n            FROM settings\n            ",
   "describe": {
     "columns": [
       {
@@ -122,6 +122,21 @@
         "name": "migrated",
         "ordinal": 23,
         "type_info": "Int64"
+      },
+      {
+        "name": "library_sort",
+        "ordinal": 24,
+        "type_info": "Text"
+      },
+      {
+        "name": "library_filter",
+        "ordinal": 25,
+        "type_info": "Text"
+      },
+      {
+        "name": "library_group",
+        "ordinal": 26,
+        "type_info": "Text"
       }
     ],
     "parameters": {
@@ -151,8 +166,11 @@
       true,
       true,
       true,
+      false,
+      false,
+      false,
       false
     ]
   },
-  "hash": "03d1aeddf7788320530c447a82342aecdb4099ce183dd9106c4bcc47604cb080"
+  "hash": "1b46483074db12bbe5090faccc02de8767987e430d47e12232bab5b391362859"
 }
diff --git a/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json b/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json
index 84c6f487e..0ff34e909 100644
--- a/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json
+++ b/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json
@@ -41,7 +41,7 @@
       {
         "name": "display_claims!: serde_json::Value",
         "ordinal": 7,
-        "type_info": "Null"
+        "type_info": "Text"
       }
     ],
     "parameters": {
diff --git a/packages/app-lib/.sqlx/query-d645daf951ff6fead3c86df685d99bacc81cb0a999c0f8d2ff7755b0089a79d8.json b/packages/app-lib/.sqlx/query-fc37b8887bd48354bc479c62b8ae427a01d47a200c109e9c1e08e1710a268832.json
similarity index 82%
rename from packages/app-lib/.sqlx/query-d645daf951ff6fead3c86df685d99bacc81cb0a999c0f8d2ff7755b0089a79d8.json
rename to packages/app-lib/.sqlx/query-fc37b8887bd48354bc479c62b8ae427a01d47a200c109e9c1e08e1710a268832.json
index ea3b1ea3c..f21a7126a 100644
--- a/packages/app-lib/.sqlx/query-d645daf951ff6fead3c86df685d99bacc81cb0a999c0f8d2ff7755b0089a79d8.json
+++ b/packages/app-lib/.sqlx/query-fc37b8887bd48354bc479c62b8ae427a01d47a200c109e9c1e08e1710a268832.json
@@ -1,12 +1,12 @@
 {
   "db_name": "SQLite",
-  "query": "\n            UPDATE settings\n            SET\n                max_concurrent_writes = $1,\n                max_concurrent_downloads = $2,\n\n                theme = $3,\n                default_page = $4,\n                collapsed_navigation = $5,\n                advanced_rendering = $6,\n                native_decorations = $7,\n\n                discord_rpc = $8,\n                developer_mode = $9,\n                telemetry = $10,\n\n                onboarded = $11,\n\n                extra_launch_args = jsonb($12),\n                custom_env_vars = jsonb($13),\n                mc_memory_max = $14,\n                mc_force_fullscreen = $15,\n                mc_game_resolution_x = $16,\n                mc_game_resolution_y = $17,\n                hide_on_process_start = $18,\n\n                hook_pre_launch = $19,\n                hook_wrapper = $20,\n                hook_post_exit = $21,\n\n                custom_dir = $22,\n                prev_custom_dir = $23,\n                migrated = $24\n            ",
+  "query": "\n            UPDATE settings\n            SET\n                max_concurrent_writes = $1,\n                max_concurrent_downloads = $2,\n\n                theme = $3,\n                default_page = $4,\n                collapsed_navigation = $5,\n                advanced_rendering = $6,\n                native_decorations = $7,\n\n                discord_rpc = $8,\n                developer_mode = $9,\n                telemetry = $10,\n\n                onboarded = $11,\n\n                extra_launch_args = jsonb($12),\n                custom_env_vars = jsonb($13),\n                mc_memory_max = $14,\n                mc_force_fullscreen = $15,\n                mc_game_resolution_x = $16,\n                mc_game_resolution_y = $17,\n                hide_on_process_start = $18,\n\n                hook_pre_launch = $19,\n                hook_wrapper = $20,\n                hook_post_exit = $21,\n\n                custom_dir = $22,\n                prev_custom_dir = $23,\n                migrated = $24,\n\n                library_sort = $25,\n                library_filter = $26,\n                library_group = $27\n            ",
   "describe": {
     "columns": [],
     "parameters": {
-      "Right": 24
+      "Right": 27
     },
     "nullable": []
   },
-  "hash": "d645daf951ff6fead3c86df685d99bacc81cb0a999c0f8d2ff7755b0089a79d8"
+  "hash": "fc37b8887bd48354bc479c62b8ae427a01d47a200c109e9c1e08e1710a268832"
 }
diff --git a/packages/app-lib/migrations/20240816103233_store_library_settings.sql b/packages/app-lib/migrations/20240816103233_store_library_settings.sql
new file mode 100644
index 000000000..060aa803c
--- /dev/null
+++ b/packages/app-lib/migrations/20240816103233_store_library_settings.sql
@@ -0,0 +1,6 @@
+ALTER TABLE settings
+  ADD library_sort   TEXT NOT NULL DEFAULT 'Name';
+ALTER TABLE settings
+  ADD library_filter TEXT NOT NULL DEFAULT 'All profiles';
+ALTER TABLE settings
+  ADD library_group  TEXT NOT NULL DEFAULT 'Category';
diff --git a/packages/app-lib/src/state/settings.rs b/packages/app-lib/src/state/settings.rs
index 8868ce19f..0351c1145 100644
--- a/packages/app-lib/src/state/settings.rs
+++ b/packages/app-lib/src/state/settings.rs
@@ -31,11 +31,15 @@ pub struct Settings {
     pub custom_dir: Option<String>,
     pub prev_custom_dir: Option<String>,
     pub migrated: bool,
+
+    pub library_sort: String,
+    pub library_filter: String,
+    pub library_group: String,
 }
 
 impl Settings {
     pub async fn get(
-        exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
+        exec: impl sqlx::Executor<'_, Database=sqlx::Sqlite>,
     ) -> crate::Result<Self> {
         let res = sqlx::query!(
             "
@@ -47,7 +51,8 @@ impl Settings {
                 json(extra_launch_args) extra_launch_args, json(custom_env_vars) custom_env_vars,
                 mc_memory_max, mc_force_fullscreen, mc_game_resolution_x, mc_game_resolution_y, hide_on_process_start,
                 hook_pre_launch, hook_wrapper, hook_post_exit,
-                custom_dir, prev_custom_dir, migrated
+                custom_dir, prev_custom_dir, migrated,
+                library_sort, library_filter, library_group
             FROM settings
             "
         )
@@ -91,12 +96,15 @@ impl Settings {
             custom_dir: res.custom_dir,
             prev_custom_dir: res.prev_custom_dir,
             migrated: res.migrated == 1,
+            library_sort: res.library_sort,
+            library_filter: res.library_filter,
+            library_group: res.library_group,
         })
     }
 
     pub async fn update(
         &self,
-        exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
+        exec: impl sqlx::Executor<'_, Database=sqlx::Sqlite>,
     ) -> crate::Result<()> {
         let max_concurrent_writes = self.max_concurrent_writes as i32;
         let max_concurrent_downloads = self.max_concurrent_downloads as i32;
@@ -138,7 +146,11 @@ impl Settings {
 
                 custom_dir = $22,
                 prev_custom_dir = $23,
-                migrated = $24
+                migrated = $24,
+
+                library_sort = $25,
+                library_filter = $26,
+                library_group = $27
             ",
             max_concurrent_writes,
             max_concurrent_downloads,
@@ -163,10 +175,13 @@ impl Settings {
             self.hooks.post_exit,
             self.custom_dir,
             self.prev_custom_dir,
-            self.migrated
+            self.migrated,
+            self.library_sort,
+            self.library_filter,
+            self.library_group,
         )
-        .execute(exec)
-        .await?;
+            .execute(exec)
+            .await?;
 
         Ok(())
     }

From d22412ebbe40fbe6652c5d60f1efe80015e2dbc7 Mon Sep 17 00:00:00 2001
From: tobinio <Tobias.frischmann1@gmail.com>
Date: Fri, 16 Aug 2024 13:37:41 +0200
Subject: [PATCH 2/6] add useSettings

---
 .../src/composables/useSettings.js            | 56 ++++++++++++++++
 apps/app-frontend/src/pages/Library.vue       | 14 +---
 apps/app-frontend/src/pages/Settings.vue      | 64 ++-----------------
 3 files changed, 65 insertions(+), 69 deletions(-)
 create mode 100644 apps/app-frontend/src/composables/useSettings.js

diff --git a/apps/app-frontend/src/composables/useSettings.js b/apps/app-frontend/src/composables/useSettings.js
new file mode 100644
index 000000000..7c4362aa5
--- /dev/null
+++ b/apps/app-frontend/src/composables/useSettings.js
@@ -0,0 +1,56 @@
+import { ref, watch } from 'vue'
+import { get, set } from '@/helpers/settings.js'
+import { mixpanel_opt_in_tracking, mixpanel_opt_out_tracking } from '@/helpers/mixpanel.js'
+import { handleError } from '@/store/state'
+
+export async function useSettings() {
+  const rawSettings = await get().catch(handleError)
+
+  rawSettings.launchArgs = rawSettings.extra_launch_args.join(' ')
+  rawSettings.envVars = rawSettings.custom_env_vars.map((x) => x.join('=')).join(' ')
+
+  const settings = ref(rawSettings)
+
+  watch(
+    settings,
+    async (oldSettings, newSettings) => {
+      if (oldSettings.loaded_config_dir !== newSettings.loaded_config_dir) {
+        return
+      }
+
+      const setSettings = JSON.parse(JSON.stringify(newSettings))
+
+      if (setSettings.telemetry) {
+        mixpanel_opt_out_tracking()
+      } else {
+        mixpanel_opt_in_tracking()
+      }
+
+      setSettings.extra_launch_args = setSettings.launchArgs.trim().split(/\s+/).filter(Boolean)
+      setSettings.custom_env_vars = setSettings.envVars
+        .trim()
+        .split(/\s+/)
+        .filter(Boolean)
+        .map((x) => x.split('=').filter(Boolean))
+
+      if (!setSettings.hooks.pre_launch) {
+        setSettings.hooks.pre_launch = null
+      }
+      if (!setSettings.hooks.wrapper) {
+        setSettings.hooks.wrapper = null
+      }
+      if (!setSettings.hooks.post_exit) {
+        setSettings.hooks.post_exit = null
+      }
+
+      if (!setSettings.custom_dir) {
+        setSettings.custom_dir = null
+      }
+
+      await set(setSettings)
+    },
+    { deep: true },
+  )
+
+  return settings
+}
diff --git a/apps/app-frontend/src/pages/Library.vue b/apps/app-frontend/src/pages/Library.vue
index 7517dc46d..35d5c3cc2 100644
--- a/apps/app-frontend/src/pages/Library.vue
+++ b/apps/app-frontend/src/pages/Library.vue
@@ -11,6 +11,7 @@ import { PlusIcon } from '@modrinth/assets'
 import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue'
 import { NewInstanceImage } from '@/assets/icons'
 import { get, set } from '@/helpers/settings.js'
+import { useSettings } from '@/composables/useSettings.js'
 
 const route = useRoute()
 const breadcrumbs = useBreadcrumbs()
@@ -34,18 +35,9 @@ onUnmounted(() => {
   unlistenProfile()
 })
 
-const fetchSettings = await get()
-const settings = ref(fetchSettings)
+const settings = await useSettings()
 
-watch(
-  settings,
-  async (oldSettings, newSettings) => {
-    const setSettings = JSON.parse(JSON.stringify(newSettings))
-
-    await set(setSettings)
-  },
-  { deep: true },
-)
+console.log('settings', settings)
 </script>
 
 <template>
diff --git a/apps/app-frontend/src/pages/Settings.vue b/apps/app-frontend/src/pages/Settings.vue
index d1ee7606c..60c963acf 100644
--- a/apps/app-frontend/src/pages/Settings.vue
+++ b/apps/app-frontend/src/pages/Settings.vue
@@ -1,18 +1,17 @@
 <script setup>
-import { ref, watch } from 'vue'
-import { LogOutIcon, LogInIcon, BoxIcon, FolderSearchIcon, UpdatedIcon } from '@modrinth/assets'
-import { Card, Slider, DropdownSelect, Toggle, Modal, Button } from '@modrinth/ui'
+import { ref } from 'vue'
+import { LogOutIcon, LogInIcon, BoxIcon, FolderSearchIcon } from '@modrinth/assets'
+import { Card, Slider, DropdownSelect, Toggle, Button } from '@modrinth/ui'
 import { handleError, useTheming } from '@/store/state'
-import { is_dir_writeable, change_config_dir, get, set } from '@/helpers/settings'
 import { get_java_versions, get_max_memory, set_java_version } from '@/helpers/jre'
 import { get as getCreds, logout } from '@/helpers/mr_auth.js'
 import JavaSelector from '@/components/ui/JavaSelector.vue'
 import ModrinthLoginScreen from '@/components/ui/tutorial/ModrinthLoginScreen.vue'
-import { mixpanel_opt_out_tracking, mixpanel_opt_in_tracking } from '@/helpers/mixpanel'
 import { open } from '@tauri-apps/api/dialog'
 import { getOS } from '@/helpers/utils.js'
 import { getVersion } from '@tauri-apps/api/app'
 import { get_user } from '@/helpers/cache.js'
+import { useSettings } from '@/composables/useSettings.js'
 
 const pageOptions = ['Home', 'Library']
 
@@ -20,64 +19,13 @@ const themeStore = useTheming()
 
 const version = await getVersion()
 
-const accessSettings = async () => {
-  const settings = await get()
-
-  settings.launchArgs = settings.extra_launch_args.join(' ')
-  settings.envVars = settings.custom_env_vars.map((x) => x.join('=')).join(' ')
-
-  return settings
-}
-
-const fetchSettings = await accessSettings().catch(handleError)
-
-const settings = ref(fetchSettings)
+const settings = await useSettings()
 // const settingsDir = ref(settings.value.loaded_config_dir)
 
 const maxMemory = ref(Math.floor((await get_max_memory().catch(handleError)) / 1024))
 
-watch(
-  settings,
-  async (oldSettings, newSettings) => {
-    if (oldSettings.loaded_config_dir !== newSettings.loaded_config_dir) {
-      return
-    }
-
-    const setSettings = JSON.parse(JSON.stringify(newSettings))
-
-    if (setSettings.telemetry) {
-      mixpanel_opt_out_tracking()
-    } else {
-      mixpanel_opt_in_tracking()
-    }
-
-    setSettings.extra_launch_args = setSettings.launchArgs.trim().split(/\s+/).filter(Boolean)
-    setSettings.custom_env_vars = setSettings.envVars
-      .trim()
-      .split(/\s+/)
-      .filter(Boolean)
-      .map((x) => x.split('=').filter(Boolean))
-
-    if (!setSettings.hooks.pre_launch) {
-      setSettings.hooks.pre_launch = null
-    }
-    if (!setSettings.hooks.wrapper) {
-      setSettings.hooks.wrapper = null
-    }
-    if (!setSettings.hooks.post_exit) {
-      setSettings.hooks.post_exit = null
-    }
-
-    if (!setSettings.custom_dir) {
-      setSettings.custom_dir = null
-    }
-
-    await set(setSettings)
-  },
-  { deep: true },
-)
-
 const javaVersions = ref(await get_java_versions().catch(handleError))
+
 async function updateJavaVersion(version) {
   if (version?.path === '') {
     version.path = undefined

From 31354ff15a18bfe4a0d928b92056649704e29dc4 Mon Sep 17 00:00:00 2001
From: tobinio <Tobias.frischmann1@gmail.com>
Date: Fri, 16 Aug 2024 13:39:21 +0200
Subject: [PATCH 3/6] fmt

---
 packages/app-lib/src/state/settings.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/app-lib/src/state/settings.rs b/packages/app-lib/src/state/settings.rs
index 0351c1145..181733da0 100644
--- a/packages/app-lib/src/state/settings.rs
+++ b/packages/app-lib/src/state/settings.rs
@@ -39,7 +39,7 @@ pub struct Settings {
 
 impl Settings {
     pub async fn get(
-        exec: impl sqlx::Executor<'_, Database=sqlx::Sqlite>,
+        exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
     ) -> crate::Result<Self> {
         let res = sqlx::query!(
             "
@@ -104,7 +104,7 @@ impl Settings {
 
     pub async fn update(
         &self,
-        exec: impl sqlx::Executor<'_, Database=sqlx::Sqlite>,
+        exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
     ) -> crate::Result<()> {
         let max_concurrent_writes = self.max_concurrent_writes as i32;
         let max_concurrent_downloads = self.max_concurrent_downloads as i32;
@@ -180,8 +180,8 @@ impl Settings {
             self.library_filter,
             self.library_group,
         )
-            .execute(exec)
-            .await?;
+        .execute(exec)
+        .await?;
 
         Ok(())
     }

From 95d11fcd807a386dca1181c1b6388059f95337d1 Mon Sep 17 00:00:00 2001
From: tobinio <Tobias.frischmann1@gmail.com>
Date: Sat, 17 Aug 2024 08:54:47 +0200
Subject: [PATCH 4/6] lint

---
 apps/app-frontend/src/pages/Library.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/app-frontend/src/pages/Library.vue b/apps/app-frontend/src/pages/Library.vue
index 35d5c3cc2..051cb706f 100644
--- a/apps/app-frontend/src/pages/Library.vue
+++ b/apps/app-frontend/src/pages/Library.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onUnmounted, ref, shallowRef, watch } from 'vue'
+import { onUnmounted, ref, shallowRef } from 'vue'
 import GridDisplay from '@/components/GridDisplay.vue'
 import { list } from '@/helpers/profile.js'
 import { useRoute } from 'vue-router'
@@ -10,7 +10,6 @@ import { Button } from '@modrinth/ui'
 import { PlusIcon } from '@modrinth/assets'
 import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue'
 import { NewInstanceImage } from '@/assets/icons'
-import { get, set } from '@/helpers/settings.js'
 import { useSettings } from '@/composables/useSettings.js'
 
 const route = useRoute()

From 8dfcaca3da68a1f4437249eb93e1487e19727eb5 Mon Sep 17 00:00:00 2001
From: tobinio <Tobias.frischmann1@gmail.com>
Date: Sat, 31 Aug 2024 22:04:56 +0200
Subject: [PATCH 5/6] fix merge

---
 .../src/composables/useSettings.js            |  6 +--
 apps/app-frontend/src/pages/Settings.vue      | 42 -------------------
 2 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/apps/app-frontend/src/composables/useSettings.js b/apps/app-frontend/src/composables/useSettings.js
index 7c4362aa5..c10be10c4 100644
--- a/apps/app-frontend/src/composables/useSettings.js
+++ b/apps/app-frontend/src/composables/useSettings.js
@@ -1,6 +1,6 @@
 import { ref, watch } from 'vue'
 import { get, set } from '@/helpers/settings.js'
-import { mixpanel_opt_in_tracking, mixpanel_opt_out_tracking } from '@/helpers/mixpanel.js'
+import { optOutAnalytics, optInAnalytics } from '@/helpers/analytics'
 import { handleError } from '@/store/state'
 
 export async function useSettings() {
@@ -21,9 +21,9 @@ export async function useSettings() {
       const setSettings = JSON.parse(JSON.stringify(newSettings))
 
       if (setSettings.telemetry) {
-        mixpanel_opt_out_tracking()
+        optOutAnalytics()
       } else {
-        mixpanel_opt_in_tracking()
+        optInAnalytics()
       }
 
       setSettings.extra_launch_args = setSettings.launchArgs.trim().split(/\s+/).filter(Boolean)
diff --git a/apps/app-frontend/src/pages/Settings.vue b/apps/app-frontend/src/pages/Settings.vue
index ab0a2ebe8..1a9db2919 100644
--- a/apps/app-frontend/src/pages/Settings.vue
+++ b/apps/app-frontend/src/pages/Settings.vue
@@ -7,7 +7,6 @@ import { get_java_versions, get_max_memory, set_java_version } from '@/helpers/j
 import { get as getCreds, logout } from '@/helpers/mr_auth.js'
 import JavaSelector from '@/components/ui/JavaSelector.vue'
 import ModrinthLoginScreen from '@/components/ui/tutorial/ModrinthLoginScreen.vue'
-import { optOutAnalytics, optInAnalytics } from '@/helpers/analytics'
 import { open } from '@tauri-apps/plugin-dialog'
 import { getOS } from '@/helpers/utils.js'
 import { getVersion } from '@tauri-apps/api/app'
@@ -30,47 +29,6 @@ const settings = await useSettings()
 
 const maxMemory = ref(Math.floor((await get_max_memory().catch(handleError)) / 1024))
 
-watch(
-  settings,
-  async (oldSettings, newSettings) => {
-    if (oldSettings.loaded_config_dir !== newSettings.loaded_config_dir) {
-      return
-    }
-
-    const setSettings = JSON.parse(JSON.stringify(newSettings))
-
-    if (setSettings.telemetry) {
-      optInAnalytics()
-    } else {
-      optOutAnalytics()
-    }
-
-    setSettings.extra_launch_args = setSettings.launchArgs.trim().split(/\s+/).filter(Boolean)
-    setSettings.custom_env_vars = setSettings.envVars
-      .trim()
-      .split(/\s+/)
-      .filter(Boolean)
-      .map((x) => x.split('=').filter(Boolean))
-
-    if (!setSettings.hooks.pre_launch) {
-      setSettings.hooks.pre_launch = null
-    }
-    if (!setSettings.hooks.wrapper) {
-      setSettings.hooks.wrapper = null
-    }
-    if (!setSettings.hooks.post_exit) {
-      setSettings.hooks.post_exit = null
-    }
-
-    if (!setSettings.custom_dir) {
-      setSettings.custom_dir = null
-    }
-
-    await set(setSettings)
-  },
-  { deep: true },
-)
-
 const javaVersions = ref(await get_java_versions().catch(handleError))
 
 async function updateJavaVersion(version) {

From fdedd6d6eca382fc05276bada743278cbf07f602 Mon Sep 17 00:00:00 2001
From: tobinio <Tobias.frischmann1@gmail.com>
Date: Sat, 7 Sep 2024 07:21:44 +0200
Subject: [PATCH 6/6] remove debug console log

---
 apps/app-frontend/src/pages/Library.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/app-frontend/src/pages/Library.vue b/apps/app-frontend/src/pages/Library.vue
index af7b15adc..62351e7a9 100644
--- a/apps/app-frontend/src/pages/Library.vue
+++ b/apps/app-frontend/src/pages/Library.vue
@@ -40,8 +40,6 @@ onUnmounted(() => {
 })
 
 const settings = await useSettings()
-
-console.log('settings', settings)
 </script>
 
 <template>