diff --git a/.gitmodules b/.gitmodules
index 6cf351e..b7779da 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,3 +28,12 @@
 [submodule "vim/pack/default/start/editorconfig-vim"]
 	path = vim/pack/default/start/editorconfig-vim
 	url = https://github.com/editorconfig/editorconfig-vim.git
+[submodule "vim/pack/snippets/start/ultisnips"]
+	path = vim/pack/snippets/start/ultisnips
+	url = https://github.com/SirVer/ultisnips.git
+[submodule "vim/pack/snippets/start/vim-snippets"]
+	path = vim/pack/snippets/start/vim-snippets
+	url = https://github.com/honza/vim-snippets.git
+[submodule "vim/pack/rust/start/rust.vim"]
+	path = vim/pack/rust/start/rust.vim
+	url = https://github.com/rust-lang/rust.vim.git
diff --git a/starship/starship.toml b/starship/starship.toml
index d04ae8d..8300d8d 100644
--- a/starship/starship.toml
+++ b/starship/starship.toml
@@ -2,11 +2,11 @@ add_newline = true
 prompt_order = [
 	"directory",
 	"git_branch",
-    "git_state",
-    # "git_status",
-    "python",
-    "jobs",
-    "cmd_duration",
+	"git_state",
+	"rust",
+	"python",
+	"jobs",
+	"cmd_duration",
 	"character",
 ]
 
@@ -64,9 +64,6 @@ stashed_count.enabled = false
 style_success = "white"
 style_failure = "red"
 
-[python]
-symbol = ""
-
 [jobs]
 symbol = "!"
 style = "red"
diff --git a/vim/pack/rust/start/rust.vim b/vim/pack/rust/start/rust.vim
new file mode 160000
index 0000000..ce5f2b1
--- /dev/null
+++ b/vim/pack/rust/start/rust.vim
@@ -0,0 +1 @@
+Subproject commit ce5f2b1c881de1b2101924dc5a19046399d74db2
diff --git a/vim/pack/snippets/start/ultisnips b/vim/pack/snippets/start/ultisnips
new file mode 160000
index 0000000..ee31ea1
--- /dev/null
+++ b/vim/pack/snippets/start/ultisnips
@@ -0,0 +1 @@
+Subproject commit ee31ea1c7d08ced8577120b4c1d55c5a05351a75
diff --git a/vim/pack/snippets/start/vim-snippets b/vim/pack/snippets/start/vim-snippets
new file mode 160000
index 0000000..b62dfce
--- /dev/null
+++ b/vim/pack/snippets/start/vim-snippets
@@ -0,0 +1 @@
+Subproject commit b62dfce8449d8a8196720ddd3cfecbca8bb7fe45
diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add
new file mode 100644
index 0000000..0f82192
--- /dev/null
+++ b/vim/spell/en.utf-8.add
@@ -0,0 +1,3 @@
+Microservices
+microservices
+microservice
diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl
new file mode 100644
index 0000000..682bea6
Binary files /dev/null and b/vim/spell/en.utf-8.add.spl differ
diff --git a/vim/spell/pt.utf-8.add b/vim/spell/pt.utf-8.add
new file mode 100644
index 0000000..402dff0
--- /dev/null
+++ b/vim/spell/pt.utf-8.add
@@ -0,0 +1,7 @@
+Python
+Microserviços
+microserviços
+fleet
+frameworks
+microserviço
+framework
diff --git a/vim/spell/pt.utf-8.add.spl b/vim/spell/pt.utf-8.add.spl
new file mode 100644
index 0000000..6e806c1
Binary files /dev/null and b/vim/spell/pt.utf-8.add.spl differ
diff --git a/vim/spell/pt.utf-8.spl b/vim/spell/pt.utf-8.spl
new file mode 100644
index 0000000..b6e9e91
Binary files /dev/null and b/vim/spell/pt.utf-8.spl differ
diff --git a/vim/vimrc b/vim/vimrc
index 369a88a..aa0cbd4 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -57,10 +57,8 @@ set background=dark		" to follow most of the colorschemes I use
 set vb t_vb=            " convert bells to visual bells and do nothing as visual bell
 set t_Co=256			" 256 color terminal
 set modeline 			" Enable modelines
-" set undofile			" saves undo changes in a separate file, so we can undo anytime
 set lcs=tab:¦\ 			" uses a special char at the start of a tab character, uses spaces after that
 set nolist				" ... but don't display them by default
-set path+=**			" glob the search path for files (helps :find)
 set wildmenu			" display all found files
 
 let mapleader=" "       " use space to start user-defined (in plugins) functions
@@ -265,6 +263,11 @@ let g:ale_sign_column_always=1
 " ----------------------------------------------------------------------
 let g:python_highlight_all = 1
 
+" ----------------------------------------------------------------------
+"   Special options for Rust syntax
+" ----------------------------------------------------------------------
+let g:rustfmt_autosave = 1
+
 " ----------------------------------------------------------------------
 "   Tiler keybinds
 " ----------------------------------------------------------------------