From 4d2bd499599230d143f58fb60bf40f66dffe7820 Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Tue, 5 Dec 2023 22:32:52 +1100 Subject: [PATCH 1/6] Remove -3 from filenames, update to work without ActualVim (unmaintained) --- .stow-no-folding | 2 +- .../Packages/User/ActualVim.sublime-settings | 68 ------------------- .../User/Package Control.sublime-settings | 9 +-- .../User/Preferences.sublime-settings | 9 ++- 4 files changed, 10 insertions(+), 78 deletions(-) delete mode 100644 dot-config/sublime-text-3/Packages/User/ActualVim.sublime-settings rename dot-config/{sublime-text-3 => sublime-text}/Packages/User/Package Control.sublime-settings (81%) rename dot-config/{sublime-text-3 => sublime-text}/Packages/User/Preferences.sublime-settings (67%) diff --git a/.stow-no-folding b/.stow-no-folding index 4a500bd..1df8bf2 100644 --- a/.stow-no-folding +++ b/.stow-no-folding @@ -1 +1 @@ -.config/sublime-text-3/Packages/.sublime-packages +.config/sublime-text/Packages/.sublime-packages diff --git a/dot-config/sublime-text-3/Packages/User/ActualVim.sublime-settings b/dot-config/sublime-text-3/Packages/User/ActualVim.sublime-settings deleted file mode 100644 index 9a36473..0000000 --- a/dot-config/sublime-text-3/Packages/User/ActualVim.sublime-settings +++ /dev/null @@ -1,68 +0,0 @@ -{ - "bufopts": - { - "completefunc": "ActualVimComplete" - }, - "enabled": true, - "large_file_disable": - { - "bytes": 52428800, - "lines": 50000 - }, - "neovim_args": - [ - "--cmd", - "let g:actualvim = 1" - ], - "neovim_path": "", - "settings": - { - "sublime": - { - "inverse_caret_state": false - }, - "vim": - { - "bell": - { - "color_scheme": "Packages/ActualVim/Bell.tmTheme", - "duration": 0.001 - }, - "inverse_caret_state": false, - "modes": - { - "all insert": - { - }, - "all visual": - { - }, - "command": - { - "inverse_caret_state": true - }, - "insert": - { - }, - "normal": - { - "inverse_caret_state": true - }, - "replace": - { - }, - "visual": - { - }, - "visual block": - { - }, - "visual line": - { - } - } - } - }, - "settings_priority": "sublime", - "smooth_scroll": false -} diff --git a/dot-config/sublime-text-3/Packages/User/Package Control.sublime-settings b/dot-config/sublime-text/Packages/User/Package Control.sublime-settings similarity index 81% rename from dot-config/sublime-text-3/Packages/User/Package Control.sublime-settings rename to dot-config/sublime-text/Packages/User/Package Control.sublime-settings index 94cb50b..d97ce1d 100644 --- a/dot-config/sublime-text-3/Packages/User/Package Control.sublime-settings +++ b/dot-config/sublime-text/Packages/User/Package Control.sublime-settings @@ -5,7 +5,6 @@ ], "installed_packages": [ - "ActualVim", "Better CoffeeScript", "CodeKit Commands", "DashDoc", @@ -13,10 +12,10 @@ "Git", "GitGutter", "JSON Key-Value", - "LESS", + "Less", + "NeoVintageous", "Origami", "Package Control", - "PHP-Twig", "Ruby Slim", "Sass", "SideBarEnhancements", @@ -24,8 +23,6 @@ "SublimeLinter-contrib-sass-lint", "SublimeLinter-contrib-slim-lint", "SublimeLinter-eslint", - "tern_for_sublime", - "TypeScript", - "WordCount", + "WordingStatus", ], } diff --git a/dot-config/sublime-text-3/Packages/User/Preferences.sublime-settings b/dot-config/sublime-text/Packages/User/Preferences.sublime-settings similarity index 67% rename from dot-config/sublime-text-3/Packages/User/Preferences.sublime-settings rename to dot-config/sublime-text/Packages/User/Preferences.sublime-settings index 37e5921..21c7dc6 100644 --- a/dot-config/sublime-text-3/Packages/User/Preferences.sublime-settings +++ b/dot-config/sublime-text/Packages/User/Preferences.sublime-settings @@ -3,12 +3,13 @@ {"characters": "<", "selector": "text.html",}, {"characters": ".", "selector": "source.js",} ], - "color_scheme": "Packages/Color Scheme - Default/Monokai.tmTheme", + "color_scheme": "Monokai.sublime-color-scheme", "default_line_ending": "unix", "enable_tab_scrolling": false, "ensure_newline_at_eof_on_save": true, - "font_face": "JetBrains Mono", - "font_size": 13, + "trim_trailing_white_space_on_save": true, + "font_face": "JuliaMono", + "font_size": 14, "ignored_packages": [ "Vintage", ], @@ -17,4 +18,6 @@ "spacegray_fileicons": true, "tab_size": 2, "theme": "Adaptive.sublime-theme", + "index_files": false, + "vintageous_i_escape_jj": true, } From 81897a7f6a8e8bb61fb46003667f988b9ae0f837 Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Tue, 5 Dec 2023 22:52:22 +1100 Subject: [PATCH 2/6] Drop packages I wasn't using, switch the visuals around :) --- .../User/Package Control.sublime-settings | 15 ++------------- .../Packages/User/Preferences.sublime-settings | 5 ++--- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dot-config/sublime-text/Packages/User/Package Control.sublime-settings b/dot-config/sublime-text/Packages/User/Package Control.sublime-settings index d97ce1d..c7abb7c 100644 --- a/dot-config/sublime-text/Packages/User/Package Control.sublime-settings +++ b/dot-config/sublime-text/Packages/User/Package Control.sublime-settings @@ -5,24 +5,13 @@ ], "installed_packages": [ - "Better CoffeeScript", - "CodeKit Commands", + "A File Icon", + "Catppuccin color schemes", "DashDoc", "EditorConfig", - "Git", "GitGutter", "JSON Key-Value", - "Less", "NeoVintageous", - "Origami", "Package Control", - "Ruby Slim", - "Sass", - "SideBarEnhancements", - "SublimeLinter", - "SublimeLinter-contrib-sass-lint", - "SublimeLinter-contrib-slim-lint", - "SublimeLinter-eslint", - "WordingStatus", ], } diff --git a/dot-config/sublime-text/Packages/User/Preferences.sublime-settings b/dot-config/sublime-text/Packages/User/Preferences.sublime-settings index 21c7dc6..f511743 100644 --- a/dot-config/sublime-text/Packages/User/Preferences.sublime-settings +++ b/dot-config/sublime-text/Packages/User/Preferences.sublime-settings @@ -3,7 +3,8 @@ {"characters": "<", "selector": "text.html",}, {"characters": ".", "selector": "source.js",} ], - "color_scheme": "Monokai.sublime-color-scheme", + "color_scheme": "Catppuccin Mocha.sublime-color-scheme", + "theme": "Adaptive.sublime-theme", "default_line_ending": "unix", "enable_tab_scrolling": false, "ensure_newline_at_eof_on_save": true, @@ -17,7 +18,5 @@ "show_line_endings": true, "spacegray_fileicons": true, "tab_size": 2, - "theme": "Adaptive.sublime-theme", - "index_files": false, "vintageous_i_escape_jj": true, } From c5ce73641b8a766308331c68e9a9ef9d6983b224 Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Tue, 5 Dec 2023 23:12:58 +1100 Subject: [PATCH 3/6] Commit automatically set prefs ? --- .../sublime-text/Packages/User/Preferences.sublime-settings | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dot-config/sublime-text/Packages/User/Preferences.sublime-settings b/dot-config/sublime-text/Packages/User/Preferences.sublime-settings index f511743..95bf4f1 100644 --- a/dot-config/sublime-text/Packages/User/Preferences.sublime-settings +++ b/dot-config/sublime-text/Packages/User/Preferences.sublime-settings @@ -19,4 +19,6 @@ "spacegray_fileicons": true, "tab_size": 2, "vintageous_i_escape_jj": true, + "index_files": true, + "neovintageous_build_version": 13200, } From 211e144438489c4b817e70b068e6b7dc81e293f1 Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Tue, 5 Dec 2023 23:14:36 +1100 Subject: [PATCH 4/6] Set 'keywordprg' to open Dash docs --- dot-config/sublime-text/Packages/User/.neovintageousrc | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 dot-config/sublime-text/Packages/User/.neovintageousrc diff --git a/dot-config/sublime-text/Packages/User/.neovintageousrc b/dot-config/sublime-text/Packages/User/.neovintageousrc new file mode 100644 index 0000000..86d659e --- /dev/null +++ b/dot-config/sublime-text/Packages/User/.neovintageousrc @@ -0,0 +1,2 @@ +" inoremap jj is a built-in feature in Neovintageous so we don't need to do it here. +nnoremap K :DashDoc From e9d0a2b0fe0f7f6552307ded91071695cafed068 Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Tue, 5 Dec 2023 23:15:52 +1100 Subject: [PATCH 5/6] Swap out GitGutter for GitSavvy, which does a lot more --- .../sublime-text/Packages/User/Package Control.sublime-settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot-config/sublime-text/Packages/User/Package Control.sublime-settings b/dot-config/sublime-text/Packages/User/Package Control.sublime-settings index c7abb7c..7991b2b 100644 --- a/dot-config/sublime-text/Packages/User/Package Control.sublime-settings +++ b/dot-config/sublime-text/Packages/User/Package Control.sublime-settings @@ -9,7 +9,7 @@ "Catppuccin color schemes", "DashDoc", "EditorConfig", - "GitGutter", + "GitSavvy", "JSON Key-Value", "NeoVintageous", "Package Control", From 62faf92c61773ab08c2cb2a269773fd10d3c0bcc Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Tue, 5 Dec 2023 23:16:02 +1100 Subject: [PATCH 6/6] Add TOML syntax package --- .../sublime-text/Packages/User/Package Control.sublime-settings | 1 + 1 file changed, 1 insertion(+) diff --git a/dot-config/sublime-text/Packages/User/Package Control.sublime-settings b/dot-config/sublime-text/Packages/User/Package Control.sublime-settings index 7991b2b..2fc0688 100644 --- a/dot-config/sublime-text/Packages/User/Package Control.sublime-settings +++ b/dot-config/sublime-text/Packages/User/Package Control.sublime-settings @@ -13,5 +13,6 @@ "JSON Key-Value", "NeoVintageous", "Package Control", + "TOML", ], }