Skip to content

Commit

Permalink
Merge branch 'master' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
martimlobao committed Sep 24, 2024
2 parents 828b9bc + db744de commit 6bf4013
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
os:
- "ubuntu-20.04"
- "ubuntu-22.04"
- "ubuntu-24.04"
python-version:
- "3.8"
- "3.9"
Expand All @@ -30,12 +31,11 @@ jobs:
strategy:
matrix:
os:
- macos-11
- macos-12
- macos-13
- macos-14
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- run: pip3 install .
- run: pip install .
- run: mackup --help
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,17 @@
- Add support for SketchyBar (via @LarsRefsgaard)
- Add support for nvm (via @Wxh16144)
- Add support for PHPStorm 2023.3 (via @damosse31)
- Add support for Cursor (via @takyshu98)
- Add support for PHPStorm 2024.1 (via @edwinvdpol)
- Add support for WezTerm (via @asm0dey)
- Updated support for git to include .gitattributes (via @martimlobao)

## Mackup 0.8.40

- Add support for Trizen (via @cilenco)
- Added support for Sqitch (via @ra1fee)
- Updated support for GeekTool (via @yuchen-lea)
- Remve support for Apple Preview, problematic on macOS 14.1
- Remove support for Apple Preview, problematic on macOS 14.1
- Added support for Subler (via @EpicKris)
- Added support for SpamSieve (via @michaelgrossklos)
- Added support for Robo 3T (via @captnswing)
Expand Down
17 changes: 14 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# Mackup
# Mackup

Keep your application settings in sync.

## Table of content
## Table of contents

- [Mackup](#mackup)
- [Table of content](#table-of-content)
- [Table of contents](#table-of-contents)
- [WARNING](#warning)
- [Quickstart](#quickstart)
- [Usage](#usage)
- [What does it do](#what-does-it-do)
Expand All @@ -23,6 +24,14 @@ Keep your application settings in sync.
- [What's up with the weird name](#whats-up-with-the-weird-name)
- [Where can I find more information](#where-can-i-find-more-information)

## WARNING

⚠️ Mackup does not work correctly in Macos Sonoma, since it does not support
symlinked files for preferences. Running this code will destroy all user
preferences without a means for recovery. For more information, see issues
[#1924](https://github.com/lra/mackup/issues/1924) and
[2035](https://github.com/lra/mackup/issues/2035).

## Quickstart

If you have [Dropbox](https://www.dropbox.com) installed and want to use it to
Expand Down Expand Up @@ -267,6 +276,7 @@ See the [README](doc/README.md) file in the doc directory for more info.
- [CoRD](http://cord.sourceforge.net/)
- [CotEditor](http://coteditor.com/)
- [Ctags](http://ctags.sourceforge.net/)
- [Cursor](https://cursor.sh/)
- [cVim](https://github.com/1995eaton/chromium-vim)
- [Cyberduck](https://cyberduck.io/)
- [DaisyDisk](https://daisydiskapp.com)
Expand Down Expand Up @@ -700,6 +710,7 @@ See the [README](doc/README.md) file in the doc directory for more info.
- [Warp](https://www.warp.dev)
- [waybar](https://github.com/Alexays/Waybar)
- [WebStorm](https://www.jetbrains.com/webstorm/)
- [WezTerm](https://wezfurlong.org/wezterm/)
- [Wget](https://www.gnu.org/software/wget/)
- [WhatsApp Web](https://web.whatsapp.com/)
- [Wireshark 2](https://www.wireshark.org)
Expand Down
12 changes: 12 additions & 0 deletions mackup/applications/cursor.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[application]
name = Cursor

[configuration_files]
Library/Application Support/Cursor/User/snippets
Library/Application Support/Cursor/User/keybindings.json
Library/Application Support/Cursor/User/settings.json

[xdg_configuration_files]
Cursor/User/snippets
Cursor/User/keybindings.json
Cursor/User/settings.json
1 change: 1 addition & 0 deletions mackup/applications/phpstorm.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Library/Application Support/JetBrains/PhpStorm2022.3
Library/Application Support/JetBrains/PhpStorm2023.1
Library/Application Support/JetBrains/PhpStorm2023.2
Library/Application Support/JetBrains/PhpStorm2023.3
Library/Application Support/JetBrains/PhpStorm2024.1
Library/Application Support/PhpStorm2016.1
Library/Application Support/PhpStorm2016.2
Library/Application Support/PhpStorm2016.3
Expand Down
5 changes: 5 additions & 0 deletions mackup/applications/wezterm.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[application]
name = WezTerm

[xdg_configuration_files]
wezterm

0 comments on commit 6bf4013

Please sign in to comment.