From 4d2bd499599230d143f58fb60bf40f66dffe7820 Mon Sep 17 00:00:00 2001
From: Danielle McLean <dani@00dani.me>
Date: Tue, 5 Dec 2023 22:32:52 +1100
Subject: [PATCH] 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,
 }