diff --git a/.aliases/aliases.sh b/.aliases/aliases.sh index 4a73a6d..e9b5535 100644 --- a/.aliases/aliases.sh +++ b/.aliases/aliases.sh @@ -1,7 +1,7 @@ -source /Users/marsway/.vvconfig/.aliases/crack.sh -source /Users/marsway/.vvconfig/.aliases/edit.sh -source /Users/marsway/.vvconfig/.aliases/git.sh -source /Users/marsway/.vvconfig/.aliases/mc.sh -source /Users/marsway/.vvconfig/.aliases/quickpath.sh -source /Users/marsway/.vvconfig/.aliases/quickssh.sh -source /Users/marsway/.vvconfig/.aliases/scripts.sh +source /Users/marsway/Library/CloudStorage/OneDrive-个人/Documents/.vvconfig/.aliases/crack.sh +source /Users/marsway/Library/CloudStorage/OneDrive-个人/Documents/.vvconfig/.aliases/editor.sh +source /Users/marsway/Library/CloudStorage/OneDrive-个人/Documents/.vvconfig/.aliases/git.sh +source /Users/marsway/Library/CloudStorage/OneDrive-个人/Documents/.vvconfig/.aliases/mc.sh +source /Users/marsway/Library/CloudStorage/OneDrive-个人/Documents/.vvconfig/.aliases/quickpath.sh +source /Users/marsway/Library/CloudStorage/OneDrive-个人/Documents/.vvconfig/.aliases/quickssh.sh +source /Users/marsway/Library/CloudStorage/OneDrive-个人/Documents/.vvconfig/.aliases/scripts.sh diff --git a/.bin/answer/docker-compose.yml b/.bin/answer/docker-compose.yml deleted file mode 100644 index 58e8ea0..0000000 --- a/.bin/answer/docker-compose.yml +++ /dev/null @@ -1,29 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -version: "3" -services: - answer: - image: apache/answer - ports: - - '9080:80' - restart: on-failure - volumes: - - answer-data:/data - -volumes: - answer-data: diff --git a/.config/Brewfile b/.config/Brewfile index a85102a..bba3d19 100644 --- a/.config/Brewfile +++ b/.config/Brewfile @@ -1,7 +1,15 @@ +tap "joshmedeski/sesh" +brew "aliyunpan" +brew "cocoapods" brew "fish" brew "fzf" +brew "gh" brew "go" +brew "gum" +brew "node" +brew "hexo" brew "htop" +brew "kubernetes-cli" brew "lazygit" brew "lua" brew "mackup" @@ -9,9 +17,11 @@ brew "mas" brew "mysql@8.4", restart_service: :changed brew "neofetch" brew "neovim" -brew "node" +brew "nping" +brew "nvtop" brew "ocrmypdf" brew "pnpm" +brew "rclone" brew "repo" brew "rust" brew "stow" @@ -19,16 +29,18 @@ brew "stylua" brew "tmux" brew "trash" brew "tree" +brew "typioca" brew "wget" brew "xdotool" brew "xprop" brew "xwininfo" +brew "joshmedeski/sesh/sesh" cask "agent-tars" cask "alacritty" cask "bettertouchtool" -cask "capacities" cask "cherry-studio" cask "clash-verge-rev" +cask "clickup" cask "coteditor" cask "cursor" cask "dockdoor" @@ -36,29 +48,62 @@ cask "flutter" cask "font-jetbrains-mono" cask "font-jetbrains-mono-nerd-font" cask "font-maple-mono-nf-cn" +cask "google-chrome" +cask "google-drive" +cask "imhex" +cask "jordanbaird-ice" cask "kando" cask "keka" +cask "listen1" cask "lm-studio" cask "lookaway" cask "lunarbar" cask "lyricsx" cask "maccy" +cask "masscode" cask "miniconda" +cask "musescore" +cask "navicat-premium-lite" +cask "notion" +cask "notion-calendar" +cask "notion-mail" cask "obsidian" cask "only-switch" cask "orbstack" cask "picgo" +cask "qspace-pro" +cask "replit" cask "slack" +cask "slimhud" cask "snipaste" -cask "spacelauncher" cask "spotify" +cask "ssh-config-editor" +cask "superhuman" cask "syncalicious" -cask "tailscale" cask "thor" cask "trae" cask "trae-cn" cask "visual-studio-code" +cask "wechatwebdevtools" +cask "windsurf" cask "wpsoffice-cn" +mas "CapCut", id: 1500855883 +mas "DaVinci Resolve", id: 571213070 +mas "DevCleaner", id: 1388020431 +mas "Developer", id: 640199958 +mas "flomo", id: 1665341561 +mas "Goodnotes", id: 1444383602 +mas "Microsoft To Do", id: 1274495053 +mas "Nex Terminal", id: 6742214286 +mas "NookX", id: 6733240772 +mas "QianJi", id: 1473785373 +mas "SnippetsLab", id: 1006087419 +mas "Wallpaper Monster", id: 6553989287 +mas "Windows App", id: 1295203466 +mas "Xcode", id: 497799835 +mas "豆包", id: 6683305962 +vscode "augment.vscode-augment" +vscode "docker.docker" vscode "github.copilot" vscode "github.copilot-chat" vscode "kevinrose.vsc-python-indent" @@ -71,4 +116,5 @@ vscode "ms-vscode-remote.remote-ssh" vscode "ms-vscode-remote.remote-ssh-edit" vscode "ms-vscode.remote-explorer" vscode "parallelsdesktop.parallels-desktop" +vscode "saoudrizwan.claude-dev" vscode "subframe7536.theme-maple" diff --git a/.config/Qspace 备份.qsdata b/.config/Qspace 备份.qsdata new file mode 100644 index 0000000..31f0219 Binary files /dev/null and b/.config/Qspace 备份.qsdata differ diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 9409e87..a82124a 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -8,3 +8,17 @@ end # Added by OrbStack: command-line tools and integration # This won't be added again if you remove it. source ~/.orbstack/shell/init2.fish 2>/dev/null || : + +# >>> conda initialize >>> +# !! Contents within this block are managed by 'conda init' !! +if test -f /opt/homebrew/Caskroom/miniconda/base/bin/conda + eval /opt/homebrew/Caskroom/miniconda/base/bin/conda "shell.fish" "hook" $argv | source +else + if test -f "/opt/homebrew/Caskroom/miniconda/base/etc/fish/conf.d/conda.fish" + . "/opt/homebrew/Caskroom/miniconda/base/etc/fish/conf.d/conda.fish" + else + set -x PATH "/opt/homebrew/Caskroom/miniconda/base/bin" $PATH + end +end +# <<< conda initialize <<< + diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 8c07605..69fc1fa 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -1,11 +1,11 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 SETUVAR THEME_EDEN_PROMPT_CHAR:\u00bb -SETUVAR --export ZLUA_LUAEXE:/usr/bin/lua -SETUVAR --export ZLUA_SCRIPT:/root/\x2ebin/z\x2elua/z\x2elua +SETUVAR --export ZLUA_LUAEXE:/opt/homebrew/bin/lua +SETUVAR --export ZLUA_SCRIPT:/Users/marsway/\x2ebin/z\x2elua/z\x2elua SETUVAR _ZL_DATA:/Users/marsway/\x2elocal/share/zlua/zlua\x2etxt SETUVAR _ZL_DATA_DIR:/Users/marsway/\x2elocal/share/zlua -SETUVAR __fish_initialized:3400 +SETUVAR __fish_initialized:3800 SETUVAR _fisher_upgraded_to_4_4:\x1d SETUVAR fish_color_autosuggestion:brblack SETUVAR fish_color_cancel:\x2dr diff --git a/.config/singlefile.config b/.config/singlefile.config new file mode 100644 index 0000000..2941ee0 --- /dev/null +++ b/.config/singlefile.config @@ -0,0 +1,185 @@ +{ + "profiles": { + "__Default_Settings__": { + "S3AccessKey": "", + "S3Bucket": "", + "S3Domain": "s3.amazonaws.com", + "S3Region": "", + "S3SecretKey": "", + "_migratedTemplateFormat": true, + "acceptHeaders": { + "audio": "audio/webm,audio/ogg,audio/wav,audio/*;q=0.9,application/ogg;q=0.7,video/*;q=0.6,*/*;q=0.5", + "document": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", + "font": "application/font-woff2;q=1.0,application/font-woff;q=0.9,*/*;q=0.8", + "image": "image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8", + "script": "*/*", + "stylesheet": "text/css,*/*;q=0.1", + "video": "video/webm,video/ogg,video/*;q=0.9,application/ogg;q=0.7,audio/*;q=0.6,*/*;q=0.5" + }, + "addProof": false, + "allowedBookmarkFolders": [ + "" + ], + "applySystemTheme": true, + "autoClose": false, + "autoOpenEditor": false, + "autoSaveDelay": 1, + "autoSaveDiscard": false, + "autoSaveExternalSave": false, + "autoSaveLoad": false, + "autoSaveLoadOrUnload": true, + "autoSaveRemove": false, + "autoSaveRepeat": false, + "autoSaveRepeatDelay": 10, + "autoSaveUnload": false, + "backgroundSave": true, + "blockAlternativeImages": true, + "blockAudios": true, + "blockFonts": false, + "blockImages": false, + "blockMixedContent": false, + "blockScripts": true, + "blockStylesheets": false, + "blockVideos": true, + "browserActionMenuEnabled": true, + "compressCSS": false, + "compressContent": false, + "compressHTML": true, + "confirmFilename": false, + "confirmInfobarContent": false, + "contextMenuEnabled": true, + "createRootDirectory": false, + "defaultEditorMode": "normal", + "delayBeforeProcessing": 0, + "displayInfobar": true, + "displayInfobarInEditor": false, + "displayStats": false, + "extractDataFromPage": false, + "filenameConflictAction": "uniquify", + "filenameMaxLength": "192", + "filenameMaxLengthUnit": "bytes", + "filenameReplacedCharacters": [ + "~", + "+", + "?", + "%", + "*", + ":", + "|", + "\"", + "<", + ">", + "\\\\", + "\u0000-\u001f", + "" + ], + "filenameReplacementCharacter": "_", + "filenameReplacementCharacters": [ + "～", + "＋", + "？", + "％", + "＊", + "：", + "｜", + "＂", + "＜", + "＞", + "＼" + ], + "filenameTemplate": "%if-empty<{page-title}|No title> ({date-locale} {time-locale}).{filename-extension}", + "forceWebAuthFlow": false, + "githubBranch": "main", + "githubRepository": "SingleFile-Archives", + "githubToken": "", + "githubUser": "", + "groupDuplicateImages": true, + "groupDuplicateStylesheets": false, + "ignoredBookmarkFolders": [ + "" + ], + "includeBOM": false, + "includeInfobar": false, + "infobarPositionAbsolute": false, + "infobarPositionBottom": "", + "infobarPositionLeft": "", + "infobarPositionRight": "16px", + "infobarPositionTop": "16px", + "infobarTemplate": "", + "insertEmbeddedImage": false, + "insertEmbeddedScreenshotImage": false, + "insertMetaCSP": true, + "insertMetaNoIndex": false, + "insertSingleFileComment": true, + "insertTextBody": false, + "loadDeferredImages": true, + "loadDeferredImagesBeforeFrames": false, + "loadDeferredImagesBlockCookies": false, + "loadDeferredImagesBlockStorage": false, + "loadDeferredImagesDispatchScrollEvent": false, + "loadDeferredImagesKeepZoomLevel": false, + "loadDeferredImagesMaxIdleTime": 1500, + "logsEnabled": true, + "maxResourceSize": 10, + "maxResourceSizeEnabled": false, + "maxSizeDuplicateImages": 524288, + "moveStylesInHead": false, + "networkTimeout": 0, + "openEditor": false, + "openInfobar": false, + "openSavedPage": false, + "passReferrerOnError": false, + "password": "", + "preventAppendedData": false, + "progressBarEnabled": true, + "removeAlternativeFonts": true, + "removeAlternativeImages": true, + "removeAlternativeMedias": true, + "removeFrames": false, + "removeHiddenElements": true, + "removeSavedDate": false, + "removeUnusedFonts": true, + "removeUnusedStyles": true, + "replaceBookmarkURL": true, + "replaceEmojisInFilename": false, + "resolveFragmentIdentifierURLs": false, + "resolveLinks": true, + "saveCreatedBookmarks": false, + "saveFavicon": true, + "saveFilenameTemplateData": false, + "saveOriginalURLs": false, + "saveRawPage": false, + "saveToClipboard": false, + "saveToDropbox": false, + "saveToGDrive": false, + "saveToGitHub": false, + "saveToRestFormApi": true, + "saveToRestFormApiFileFieldName": "file", + "saveToRestFormApiToken": "5c5278ee133ee238f042d2748e75c84af4772659", + "saveToRestFormApiUrl": "https://star.marsway.red/api/bookmarks/singlefile/", + "saveToRestFormApiUrlFieldName": "url", + "saveToS3": false, + "saveWithCompanion": false, + "saveWithWebDAV": false, + "selfExtractingArchive": false, + "shadowEnabled": true, + "sharePage": false, + "tabMenuEnabled": true, + "userScriptEnabled": false, + "warnUnsavedPage": true, + "webDAVPassword": "", + "webDAVURL": "", + "webDAVUser": "", + "woleetKey": "" + } + }, + "rules": [ + { + "autoSaveProfile": "__Disabled_Settings__", + "profile": "__Default_Settings__", + "url": "file:" + } + ], + "maxParallelWorkers": 10, + "processInForeground": false +} \ No newline at end of file diff --git a/.mackup.cfg b/.mackup.cfg index b79b1fa..ff4e950 100644 --- a/.mackup.cfg +++ b/.mackup.cfg @@ -1,6 +1,6 @@ [storage] engine = file_system -path = .vvconfig +path = Documents/.vvconfig directory = mackup [applications_to_sync] diff --git a/.sync/Sync/marsway-air.local/Backup/com.1password.1password.plist b/.sync/Sync/marsway-air.local/Backup/com.1password.1password.plist new file mode 100644 index 0000000..35ac705 Binary files /dev/null and b/.sync/Sync/marsway-air.local/Backup/com.1password.1password.plist differ diff --git a/.sync/Sync/marsway-air.local/Backup/com.apple.ActivityMonitor.plist b/.sync/Sync/marsway-air.local/Backup/com.apple.ActivityMonitor.plist new file mode 100644 index 0000000..a2b8437 Binary files /dev/null and b/.sync/Sync/marsway-air.local/Backup/com.apple.ActivityMonitor.plist differ diff --git a/.sync/Sync/marsway-air.local/Backup/com.apple.airport.airportutility.plist b/.sync/Sync/marsway-air.local/Backup/com.apple.airport.airportutility.plist new file mode 100644 index 0000000..f8a16c1 Binary files /dev/null and b/.sync/Sync/marsway-air.local/Backup/com.apple.airport.airportutility.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.apple.Notes.plist b/.sync/marsway-air.local/Container/Preferences/com.apple.Notes.plist index a675f9a..755b5f4 100644 Binary files a/.sync/marsway-air.local/Container/Preferences/com.apple.Notes.plist and b/.sync/marsway-air.local/Container/Preferences/com.apple.Notes.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.apple.Photos.plist b/.sync/marsway-air.local/Container/Preferences/com.apple.Photos.plist index 33fd048..ab7af52 100644 Binary files a/.sync/marsway-air.local/Container/Preferences/com.apple.Photos.plist and b/.sync/marsway-air.local/Container/Preferences/com.apple.Photos.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.apple.Preview.plist b/.sync/marsway-air.local/Container/Preferences/com.apple.Preview.plist new file mode 100644 index 0000000..93bd395 Binary files /dev/null and b/.sync/marsway-air.local/Container/Preferences/com.apple.Preview.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.apple.ScreenContinuity.plist b/.sync/marsway-air.local/Container/Preferences/com.apple.ScreenContinuity.plist index 9bab419..c55f8f2 100644 Binary files a/.sync/marsway-air.local/Container/Preferences/com.apple.ScreenContinuity.plist and b/.sync/marsway-air.local/Container/Preferences/com.apple.ScreenContinuity.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.apple.TextEdit.plist b/.sync/marsway-air.local/Container/Preferences/com.apple.TextEdit.plist index 3967e06..b987878 100644 Binary files a/.sync/marsway-air.local/Container/Preferences/com.apple.TextEdit.plist and b/.sync/marsway-air.local/Container/Preferences/com.apple.TextEdit.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.apple.mail.plist b/.sync/marsway-air.local/Container/Preferences/com.apple.mail.plist index 68cd7b1..00540fc 100644 Binary files a/.sync/marsway-air.local/Container/Preferences/com.apple.mail.plist and b/.sync/marsway-air.local/Container/Preferences/com.apple.mail.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.apple.notificationcenterui.plist b/.sync/marsway-air.local/Container/Preferences/com.apple.notificationcenterui.plist index 53420ab..7ae50b3 100644 Binary files a/.sync/marsway-air.local/Container/Preferences/com.apple.notificationcenterui.plist and b/.sync/marsway-air.local/Container/Preferences/com.apple.notificationcenterui.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.apple.reminders.plist b/.sync/marsway-air.local/Container/Preferences/com.apple.reminders.plist new file mode 100644 index 0000000..d19ac83 Binary files /dev/null and b/.sync/marsway-air.local/Container/Preferences/com.apple.reminders.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.coteditor.CotEditor.plist b/.sync/marsway-air.local/Container/Preferences/com.coteditor.CotEditor.plist index 35c8b90..2bfe366 100644 Binary files a/.sync/marsway-air.local/Container/Preferences/com.coteditor.CotEditor.plist and b/.sync/marsway-air.local/Container/Preferences/com.coteditor.CotEditor.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.culturedcode.ThingsMac.plist b/.sync/marsway-air.local/Container/Preferences/com.culturedcode.ThingsMac.plist new file mode 100644 index 0000000..8ccd7fc Binary files /dev/null and b/.sync/marsway-air.local/Container/Preferences/com.culturedcode.ThingsMac.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.kingsoft.wpsoffice.mac.plist b/.sync/marsway-air.local/Container/Preferences/com.kingsoft.wpsoffice.mac.plist index d092fe5..e64c007 100644 Binary files a/.sync/marsway-air.local/Container/Preferences/com.kingsoft.wpsoffice.mac.plist and b/.sync/marsway-air.local/Container/Preferences/com.kingsoft.wpsoffice.mac.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.lemon.lvoverseas.plist b/.sync/marsway-air.local/Container/Preferences/com.lemon.lvoverseas.plist new file mode 100644 index 0000000..49a84b7 Binary files /dev/null and b/.sync/marsway-air.local/Container/Preferences/com.lemon.lvoverseas.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.lukilabs.lukiapp.plist b/.sync/marsway-air.local/Container/Preferences/com.lukilabs.lukiapp.plist index 94e9360..893b1ca 100644 Binary files a/.sync/marsway-air.local/Container/Preferences/com.lukilabs.lukiapp.plist and b/.sync/marsway-air.local/Container/Preferences/com.lukilabs.lukiapp.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.microsoft.to-do-mac.plist b/.sync/marsway-air.local/Container/Preferences/com.microsoft.to-do-mac.plist new file mode 100644 index 0000000..6327371 Binary files /dev/null and b/.sync/marsway-air.local/Container/Preferences/com.microsoft.to-do-mac.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.monsterwl.NookX.plist b/.sync/marsway-air.local/Container/Preferences/com.monsterwl.NookX.plist new file mode 100644 index 0000000..f23d63f Binary files /dev/null and b/.sync/marsway-air.local/Container/Preferences/com.monsterwl.NookX.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.monsterwl.WallpaperMonsterPro.plist b/.sync/marsway-air.local/Container/Preferences/com.monsterwl.WallpaperMonsterPro.plist index 024433c..0527dfe 100644 Binary files a/.sync/marsway-air.local/Container/Preferences/com.monsterwl.WallpaperMonsterPro.plist and b/.sync/marsway-air.local/Container/Preferences/com.monsterwl.WallpaperMonsterPro.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.tencent.WeWorkMac.plist b/.sync/marsway-air.local/Container/Preferences/com.tencent.WeWorkMac.plist index 66b40cd..56d655e 100644 Binary files a/.sync/marsway-air.local/Container/Preferences/com.tencent.WeWorkMac.plist and b/.sync/marsway-air.local/Container/Preferences/com.tencent.WeWorkMac.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/com.tencent.xinWeChat.plist b/.sync/marsway-air.local/Container/Preferences/com.tencent.xinWeChat.plist index b124898..edc6a70 100644 Binary files a/.sync/marsway-air.local/Container/Preferences/com.tencent.xinWeChat.plist and b/.sync/marsway-air.local/Container/Preferences/com.tencent.xinWeChat.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/ddddxxx.LyricsX.plist b/.sync/marsway-air.local/Container/Preferences/ddddxxx.LyricsX.plist new file mode 100644 index 0000000..d104f5c Binary files /dev/null and b/.sync/marsway-air.local/Container/Preferences/ddddxxx.LyricsX.plist differ diff --git a/.sync/marsway-air.local/Container/Preferences/org.p0deje.Maccy.plist b/.sync/marsway-air.local/Container/Preferences/org.p0deje.Maccy.plist index 993a192..2e363f6 100644 Binary files a/.sync/marsway-air.local/Container/Preferences/org.p0deje.Maccy.plist and b/.sync/marsway-air.local/Container/Preferences/org.p0deje.Maccy.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.1password.1password.plist b/.sync/marsway-air.local/Library/Preferences/com.1password.1password.plist index 4a6b25e..35ac705 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.1password.1password.plist and b/.sync/marsway-air.local/Library/Preferences/com.1password.1password.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.DigiDNA.iMazing3Mac.plist b/.sync/marsway-air.local/Library/Preferences/com.DigiDNA.iMazing3Mac.plist new file mode 100644 index 0000000..ca8851c Binary files /dev/null and b/.sync/marsway-air.local/Library/Preferences/com.DigiDNA.iMazing3Mac.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.Snipaste.plist b/.sync/marsway-air.local/Library/Preferences/com.Snipaste.plist index ffdc9b2..52b9325 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.Snipaste.plist and b/.sync/marsway-air.local/Library/Preferences/com.Snipaste.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.TickTick.task.mac.plist b/.sync/marsway-air.local/Library/Preferences/com.TickTick.task.mac.plist index ecc5e89..f6a255f 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.TickTick.task.mac.plist and b/.sync/marsway-air.local/Library/Preferences/com.TickTick.task.mac.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.adobe.acc.AdobeCreativeCloud.plist b/.sync/marsway-air.local/Library/Preferences/com.adobe.acc.AdobeCreativeCloud.plist index 5c7e776..49a40a7 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.adobe.acc.AdobeCreativeCloud.plist and b/.sync/marsway-air.local/Library/Preferences/com.adobe.acc.AdobeCreativeCloud.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.alexpera.SlimHUD.plist b/.sync/marsway-air.local/Library/Preferences/com.alexpera.SlimHUD.plist new file mode 100644 index 0000000..6869350 Binary files /dev/null and b/.sync/marsway-air.local/Library/Preferences/com.alexpera.SlimHUD.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.apple.ActivityMonitor.plist b/.sync/marsway-air.local/Library/Preferences/com.apple.ActivityMonitor.plist index 04c2229..a2b8437 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.apple.ActivityMonitor.plist and b/.sync/marsway-air.local/Library/Preferences/com.apple.ActivityMonitor.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.apple.AppStore.plist b/.sync/marsway-air.local/Library/Preferences/com.apple.AppStore.plist index 3b1e222..41382df 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.apple.AppStore.plist and b/.sync/marsway-air.local/Library/Preferences/com.apple.AppStore.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.apple.MobileSMS.plist b/.sync/marsway-air.local/Library/Preferences/com.apple.MobileSMS.plist index c6e160e..5f2752c 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.apple.MobileSMS.plist and b/.sync/marsway-air.local/Library/Preferences/com.apple.MobileSMS.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.apple.Spotlight.plist b/.sync/marsway-air.local/Library/Preferences/com.apple.Spotlight.plist index c77c1aa..cb398bf 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.apple.Spotlight.plist and b/.sync/marsway-air.local/Library/Preferences/com.apple.Spotlight.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.apple.SystemProfiler.plist b/.sync/marsway-air.local/Library/Preferences/com.apple.SystemProfiler.plist new file mode 100644 index 0000000..6346307 Binary files /dev/null and b/.sync/marsway-air.local/Library/Preferences/com.apple.SystemProfiler.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.apple.Terminal.plist b/.sync/marsway-air.local/Library/Preferences/com.apple.Terminal.plist index b3211fe..c687f75 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.apple.Terminal.plist and b/.sync/marsway-air.local/Library/Preferences/com.apple.Terminal.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.apple.WindowManager.plist b/.sync/marsway-air.local/Library/Preferences/com.apple.WindowManager.plist index bc85d75..73a2c5f 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.apple.WindowManager.plist and b/.sync/marsway-air.local/Library/Preferences/com.apple.WindowManager.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.apple.controlcenter.plist b/.sync/marsway-air.local/Library/Preferences/com.apple.controlcenter.plist index d3d600f..d18f544 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.apple.controlcenter.plist and b/.sync/marsway-air.local/Library/Preferences/com.apple.controlcenter.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.apple.dock.plist b/.sync/marsway-air.local/Library/Preferences/com.apple.dock.plist index 26c9444..e8e45d5 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.apple.dock.plist and b/.sync/marsway-air.local/Library/Preferences/com.apple.dock.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.apple.dt.Xcode.plist b/.sync/marsway-air.local/Library/Preferences/com.apple.dt.Xcode.plist index ac0ff5b..6a23767 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.apple.dt.Xcode.plist and b/.sync/marsway-air.local/Library/Preferences/com.apple.dt.Xcode.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.apple.finder.plist b/.sync/marsway-air.local/Library/Preferences/com.apple.finder.plist index c9881fc..8d47aeb 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.apple.finder.plist and b/.sync/marsway-air.local/Library/Preferences/com.apple.finder.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.baidu.BaiduNetdisk-mac.plist b/.sync/marsway-air.local/Library/Preferences/com.baidu.BaiduNetdisk-mac.plist index f823ec2..edc6ec9 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.baidu.BaiduNetdisk-mac.plist and b/.sync/marsway-air.local/Library/Preferences/com.baidu.BaiduNetdisk-mac.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.dexterleng.ProNotes.plist b/.sync/marsway-air.local/Library/Preferences/com.dexterleng.ProNotes.plist index f2d9fd6..f7c109f 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.dexterleng.ProNotes.plist and b/.sync/marsway-air.local/Library/Preferences/com.dexterleng.ProNotes.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.ephod.Viso.plist b/.sync/marsway-air.local/Library/Preferences/com.ephod.Viso.plist index cbdebdc..f7b103b 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.ephod.Viso.plist and b/.sync/marsway-air.local/Library/Preferences/com.ephod.Viso.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.exafunction.windsurf.plist b/.sync/marsway-air.local/Library/Preferences/com.exafunction.windsurf.plist new file mode 100644 index 0000000..fc7dcbc Binary files /dev/null and b/.sync/marsway-air.local/Library/Preferences/com.exafunction.windsurf.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.google.Chrome.plist b/.sync/marsway-air.local/Library/Preferences/com.google.Chrome.plist new file mode 100644 index 0000000..48b18b5 Binary files /dev/null and b/.sync/marsway-air.local/Library/Preferences/com.google.Chrome.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.hegenberg.BetterTouchTool.plist b/.sync/marsway-air.local/Library/Preferences/com.hegenberg.BetterTouchTool.plist index 6c080b8..b639a64 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.hegenberg.BetterTouchTool.plist and b/.sync/marsway-air.local/Library/Preferences/com.hegenberg.BetterTouchTool.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.listen1.listen1.plist b/.sync/marsway-air.local/Library/Preferences/com.listen1.listen1.plist new file mode 100644 index 0000000..3250613 Binary files /dev/null and b/.sync/marsway-air.local/Library/Preferences/com.listen1.listen1.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.microsoft.OneDrive.plist b/.sync/marsway-air.local/Library/Preferences/com.microsoft.OneDrive.plist index 09d89a0..3c8d26f 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.microsoft.OneDrive.plist and b/.sync/marsway-air.local/Library/Preferences/com.microsoft.OneDrive.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.microsoft.VSCode.plist b/.sync/marsway-air.local/Library/Preferences/com.microsoft.VSCode.plist index ebef7aa..fa76f73 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.microsoft.VSCode.plist and b/.sync/marsway-air.local/Library/Preferences/com.microsoft.VSCode.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.mysticalbits.lookaway.plist b/.sync/marsway-air.local/Library/Preferences/com.mysticalbits.lookaway.plist new file mode 100644 index 0000000..69595e5 Binary files /dev/null and b/.sync/marsway-air.local/Library/Preferences/com.mysticalbits.lookaway.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.nektony.App-Cleaner-SIII.plist b/.sync/marsway-air.local/Library/Preferences/com.nektony.App-Cleaner-SIII.plist index 219d214..01dd648 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.nektony.App-Cleaner-SIII.plist and b/.sync/marsway-air.local/Library/Preferences/com.nektony.App-Cleaner-SIII.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.netease.163music.plist b/.sync/marsway-air.local/Library/Preferences/com.netease.163music.plist index 6d85dba..1e6f06a 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.netease.163music.plist and b/.sync/marsway-air.local/Library/Preferences/com.netease.163music.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.oray.sunlogin.macclient.plist b/.sync/marsway-air.local/Library/Preferences/com.oray.sunlogin.macclient.plist index 46f6e69..4b97912 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.oray.sunlogin.macclient.plist and b/.sync/marsway-air.local/Library/Preferences/com.oray.sunlogin.macclient.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.quark.desktop.plist b/.sync/marsway-air.local/Library/Preferences/com.quark.desktop.plist new file mode 100644 index 0000000..6148979 Binary files /dev/null and b/.sync/marsway-air.local/Library/Preferences/com.quark.desktop.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.raycast.macos.plist b/.sync/marsway-air.local/Library/Preferences/com.raycast.macos.plist index c4442d1..ef4c02f 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.raycast.macos.plist and b/.sync/marsway-air.local/Library/Preferences/com.raycast.macos.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.rogueamoeba.Piezo.plist b/.sync/marsway-air.local/Library/Preferences/com.rogueamoeba.Piezo.plist index 997aa0b..102e7b7 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.rogueamoeba.Piezo.plist and b/.sync/marsway-air.local/Library/Preferences/com.rogueamoeba.Piezo.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.sibersystems.goodsyncmac2000.plist b/.sync/marsway-air.local/Library/Preferences/com.sibersystems.goodsyncmac2000.plist index 7331dc0..25d4cbd 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.sibersystems.goodsyncmac2000.plist and b/.sync/marsway-air.local/Library/Preferences/com.sibersystems.goodsyncmac2000.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.spotify.client.plist b/.sync/marsway-air.local/Library/Preferences/com.spotify.client.plist new file mode 100644 index 0000000..1478e71 Binary files /dev/null and b/.sync/marsway-air.local/Library/Preferences/com.spotify.client.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.surteesstudios.Bartender.plist b/.sync/marsway-air.local/Library/Preferences/com.surteesstudios.Bartender.plist index 7f93159..7e44000 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.surteesstudios.Bartender.plist and b/.sync/marsway-air.local/Library/Preferences/com.surteesstudios.Bartender.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.timpler.screenstudio.plist b/.sync/marsway-air.local/Library/Preferences/com.timpler.screenstudio.plist index f48ce2b..b650a93 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.timpler.screenstudio.plist and b/.sync/marsway-air.local/Library/Preferences/com.timpler.screenstudio.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.todesktop.230313mzl4w4u92.plist b/.sync/marsway-air.local/Library/Preferences/com.todesktop.230313mzl4w4u92.plist index c58f3d1..82ff76d 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.todesktop.230313mzl4w4u92.plist and b/.sync/marsway-air.local/Library/Preferences/com.todesktop.230313mzl4w4u92.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.trae.app.plist b/.sync/marsway-air.local/Library/Preferences/com.trae.app.plist index 803a835..3f49529 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.trae.app.plist and b/.sync/marsway-air.local/Library/Preferences/com.trae.app.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.twopeoplesoftware.breaksforeyes-devmate.plist b/.sync/marsway-air.local/Library/Preferences/com.twopeoplesoftware.breaksforeyes-devmate.plist index a5cbb46..d088d58 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.twopeoplesoftware.breaksforeyes-devmate.plist and b/.sync/marsway-air.local/Library/Preferences/com.twopeoplesoftware.breaksforeyes-devmate.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/com.ugreen.pro.client.plist b/.sync/marsway-air.local/Library/Preferences/com.ugreen.pro.client.plist index c3b70a6..b8a418e 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/com.ugreen.pro.client.plist and b/.sync/marsway-air.local/Library/Preferences/com.ugreen.pro.client.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/company.thebrowser.Browser.plist b/.sync/marsway-air.local/Library/Preferences/company.thebrowser.Browser.plist index c910311..d46c81f 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/company.thebrowser.Browser.plist and b/.sync/marsway-air.local/Library/Preferences/company.thebrowser.Browser.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/cools.wins.main.plist b/.sync/marsway-air.local/Library/Preferences/cools.wins.main.plist index b316f97..3c40836 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/cools.wins.main.plist and b/.sync/marsway-air.local/Library/Preferences/cools.wins.main.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/dev.kdrag0n.MacVirt.plist b/.sync/marsway-air.local/Library/Preferences/dev.kdrag0n.MacVirt.plist index 8ebd8e8..13c78f9 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/dev.kdrag0n.MacVirt.plist and b/.sync/marsway-air.local/Library/Preferences/dev.kdrag0n.MacVirt.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/io.github.clash-verge-rev.clash-verge-rev.plist b/.sync/marsway-air.local/Library/Preferences/io.github.clash-verge-rev.clash-verge-rev.plist index d3df5e6..b02566f 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/io.github.clash-verge-rev.clash-verge-rev.plist and b/.sync/marsway-air.local/Library/Preferences/io.github.clash-verge-rev.clash-verge-rev.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/io.tailscale.ipn.macsys.plist b/.sync/marsway-air.local/Library/Preferences/io.tailscale.ipn.macsys.plist index 42d8561..28e008f 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/io.tailscale.ipn.macsys.plist and b/.sync/marsway-air.local/Library/Preferences/io.tailscale.ipn.macsys.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/jacklandrin.OnlySwitch.plist b/.sync/marsway-air.local/Library/Preferences/jacklandrin.OnlySwitch.plist index c6f4721..6914e44 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/jacklandrin.OnlySwitch.plist and b/.sync/marsway-air.local/Library/Preferences/jacklandrin.OnlySwitch.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/me.alvinzhu.Thor.plist b/.sync/marsway-air.local/Library/Preferences/me.alvinzhu.Thor.plist index aad0527..3d0bf02 100644 Binary files a/.sync/marsway-air.local/Library/Preferences/me.alvinzhu.Thor.plist and b/.sync/marsway-air.local/Library/Preferences/me.alvinzhu.Thor.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/notion.id.plist b/.sync/marsway-air.local/Library/Preferences/notion.id.plist new file mode 100644 index 0000000..d663973 Binary files /dev/null and b/.sync/marsway-air.local/Library/Preferences/notion.id.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/notion.mail.id.plist b/.sync/marsway-air.local/Library/Preferences/notion.mail.id.plist new file mode 100644 index 0000000..f651003 Binary files /dev/null and b/.sync/marsway-air.local/Library/Preferences/notion.mail.id.plist differ diff --git a/.sync/marsway-air.local/Library/Preferences/tech.5km.HiPixel.plist b/.sync/marsway-air.local/Library/Preferences/tech.5km.HiPixel.plist new file mode 100644 index 0000000..6044381 Binary files /dev/null and b/.sync/marsway-air.local/Library/Preferences/tech.5km.HiPixel.plist differ diff --git a/.zshrc b/.zshrc index 4dfafe1..958ec46 100755 --- a/.zshrc +++ b/.zshrc @@ -178,6 +178,9 @@ alias p='python3' alias tree='tree -C' # PATH -export PATH=/Users/$USER/Coding/Tools/git-repo:$PATH +export PATH=/Users/$USER/Coding/Tools/git-repo:/opt/homebrew/bin:$PATH eval "$(lua ~/.vvconfig/scripts/z.lua/z.lua --init zsh)" -source ~/.vvconfig/.aliases/aliases.sh +source ~/.aliases/aliases.sh + +# Added by Windsurf +export PATH="/Users/marsway/.codeium/windsurf/bin:$PATH" diff --git a/mackup/Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/clash-verge-check.yaml b/mackup/Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/clash-verge-check.yaml index f1992c8..cc3ba6a 100644 --- a/mackup/Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/clash-verge-check.yaml +++ b/mackup/Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/clash-verge-check.yaml @@ -11,7 +11,6 @@ external-controller-cors: allow-private-network: true allow-origins: - '*' -bind-address: '*' dns: enable: true listen: :53 @@ -60,8 +59,7 @@ dns: - +.google.com - +.facebook.com - +.youtube.com -profile: - store-selected: true +bind-address: '*' tun: enable: false stack: gvisor @@ -583,9 +581,9 @@ proxies: ws-path: /images ws-headers: Host: v.qq.com -- name: 🎮 ①广港游戏专用(限速4Mb) x8.0{Ver5} +- name: 🎮 ①广港游戏专用(限速4Mb) x8.0{Ver6} type: ss - server: gzhk-iplc-hyoc-1.akijp.cloud + server: ga.akpl.cloud port: 19007 cipher: chacha20-ietf-poly1305 password: b7879a0f-c140-43df-ba7b-e5993a0e331e @@ -643,7 +641,7 @@ proxy-groups: - 🇸🇬 SGP | Direct Access [海外用户] x1.2{Ver5} - 🇹🇼 TWN | Direct Access [海外用户] x1.2{Ver5} - 🇺🇸 USA | Direct Access [海外用户] x1.2{Ver5} - - 🎮 ①广港游戏专用(限速4Mb) x8.0{Ver5} + - 🎮 ①广港游戏专用(限速4Mb) x8.0{Ver6} - '●最新官网地址: https://www.v2aky.net' - ●建议每周更新一次订阅以及定期检查设备当前时间是否已准确到分钟 rules: diff --git a/mackup/Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/clash-verge.yaml b/mackup/Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/clash-verge.yaml index f1992c8..cc3ba6a 100644 --- a/mackup/Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/clash-verge.yaml +++ b/mackup/Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/clash-verge.yaml @@ -11,7 +11,6 @@ external-controller-cors: allow-private-network: true allow-origins: - '*' -bind-address: '*' dns: enable: true listen: :53 @@ -60,8 +59,7 @@ dns: - +.google.com - +.facebook.com - +.youtube.com -profile: - store-selected: true +bind-address: '*' tun: enable: false stack: gvisor @@ -583,9 +581,9 @@ proxies: ws-path: /images ws-headers: Host: v.qq.com -- name: 🎮 ①广港游戏专用(限速4Mb) x8.0{Ver5} +- name: 🎮 ①广港游戏专用(限速4Mb) x8.0{Ver6} type: ss - server: gzhk-iplc-hyoc-1.akijp.cloud + server: ga.akpl.cloud port: 19007 cipher: chacha20-ietf-poly1305 password: b7879a0f-c140-43df-ba7b-e5993a0e331e @@ -643,7 +641,7 @@ proxy-groups: - 🇸🇬 SGP | Direct Access [海外用户] x1.2{Ver5} - 🇹🇼 TWN | Direct Access [海外用户] x1.2{Ver5} - 🇺🇸 USA | Direct Access [海外用户] x1.2{Ver5} - - 🎮 ①广港游戏专用(限速4Mb) x8.0{Ver5} + - 🎮 ①广港游戏专用(限速4Mb) x8.0{Ver6} - '●最新官网地址: https://www.v2aky.net' - ●建议每周更新一次订阅以及定期检查设备当前时间是否已准确到分钟 rules: diff --git a/mackup/Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/profiles.yaml b/mackup/Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/profiles.yaml index 428c64d..ee4a862 100644 --- a/mackup/Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/profiles.yaml +++ b/mackup/Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/profiles.yaml @@ -1,62 +1,52 @@ # Profiles Config for Clash Verge -current: RoYtUvrMCxF7 +current: Rf0vekATnMXK items: -- uid: Merge +- uid: m1lvlw8NQbkJ type: merge name: null - file: Merge.yaml - updated: 1742972135 -- uid: Script - type: script - name: null - file: Script.js - updated: 1742972135 -- uid: m2jcm8sRQPvm + file: m1lvlw8NQbkJ.yaml + updated: 1744791969 +- uid: mhQfXShbFL9J type: merge name: null - file: m2jcm8sRQPvm.yaml - updated: 1742972168 -- uid: s1cP0zOEBkP5 + file: mhQfXShbFL9J.yaml + updated: 1744792102 +- uid: snLkJmXHPaBT type: script name: null - file: s1cP0zOEBkP5.js - updated: 1742972168 -- uid: rD6SmDizAwB7 + file: snLkJmXHPaBT.js + updated: 1744792102 +- uid: r64L2J9znqqX type: rules name: null - file: rD6SmDizAwB7.yaml - updated: 1742972168 -- uid: psk9x7ukgnfn + file: r64L2J9znqqX.yaml + updated: 1744792102 +- uid: pMHD8yYjsBQZ type: proxies name: null - file: psk9x7ukgnfn.yaml - updated: 1742972168 -- uid: g9n81JmX5NEV + file: pMHD8yYjsBQZ.yaml + updated: 1744792102 +- uid: grIy4r7kfeM8 type: groups name: null - file: g9n81JmX5NEV.yaml - updated: 1742972168 -- uid: RoYtUvrMCxF7 + file: grIy4r7kfeM8.yaml + updated: 1744792102 +- uid: Rf0vekATnMXK type: remote name: AKY-JAPAN - file: RoYtUvrMCxF7.yaml - url: https://47.76.32.11/api/v1/client/subscribe?token=d4bc0b5e5fb870215bab09aaf9a4d87a - selected: - - name: AKY-JAPAN - now: 🇹🇼 ①台湾 | TWN [解锁/GPT] x1.2{Ver5} - - name: GLOBAL - now: 🇯🇵 ②日本 | JPN [NF解锁/GPT] x1.2{Ver5} + file: Rf0vekATnMXK.yaml + url: https://47.76.32.11/api/v1/client/subscribe?token=d4bc0b5e5fb870215bab09aaf9a4d87a&name=AKY-JAPAN extra: - upload: 9496106458 - download: 20758059167 - total: 59055800320 - expire: 0 - updated: 1744083135 + upload: 7216 + download: 23654 + total: 268435456000 + expire: 1747383663 + updated: 1744792102 option: update_interval: 1440 - merge: m2jcm8sRQPvm - script: s1cP0zOEBkP5 - rules: rD6SmDizAwB7 - proxies: psk9x7ukgnfn - groups: g9n81JmX5NEV + merge: mhQfXShbFL9J + script: snLkJmXHPaBT + rules: r64L2J9znqqX + proxies: pMHD8yYjsBQZ + groups: grIy4r7kfeM8 diff --git a/mackup/Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/verge.yaml b/mackup/Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/verge.yaml index 227204c..fb52051 100644 --- a/mackup/Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/verge.yaml +++ b/mackup/Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/verge.yaml @@ -16,8 +16,8 @@ menu_icon: monochrome sysproxy_tray_icon: false tun_tray_icon: false enable_tun_mode: null -enable_auto_launch: true -enable_silent_start: true +enable_auto_launch: false +enable_silent_start: false enable_system_proxy: true enable_proxy_guard: false enable_dns_settings: true @@ -42,19 +42,19 @@ default_latency_timeout: null enable_builtin_enhanced: true proxy_layout_column: null test_list: -- uid: yNggBTan27khzS0aCkxzo +- uid: XpbCepl_4-4XyV2g_q9gk name: Apple icon: url: https://www.apple.com -- uid: 3pdc9VSEw76ukoEw7vd9k +- uid: yBNyYNUwiNnWcJzG9LZyk name: GitHub icon: url: https://www.github.com -- uid: nfPM5nQ81xiq19Eqln7Cl +- uid: yTNyfXH9UKZA7_Mgo8PW6 name: Google icon: url: https://www.google.com -- uid: R5GsR92ue1EPDpGOuJyBa +- uid: 9h1U_JyCKNl0rAzZMk4DI name: Youtube icon: url: https://www.youtube.com @@ -71,8 +71,4 @@ enable_tray_speed: true enable_tray_icon: true enable_auto_light_weight_mode: false auto_light_weight_minutes: 10 -service_state: - last_install_time: 1742972139 - install_count: 1 - last_check_time: 0 - last_error: null +service_state: null diff --git a/scripts/Seblius_2024.3_Trail_Reset.command b/scripts/crack/Seblius_2024.3_Trail_Reset.command similarity index 100% rename from scripts/Seblius_2024.3_Trail_Reset.command rename to scripts/crack/Seblius_2024.3_Trail_Reset.command diff --git a/scripts/pd-crack.sh b/scripts/crack/pd-crack.sh similarity index 100% rename from scripts/pd-crack.sh rename to scripts/crack/pd-crack.sh