diff --git a/vim/.vim/after/ftplugin/gdscript.vim b/config/.config/nvim/after/ftplugin/gdscript.vim
similarity index 51%
rename from vim/.vim/after/ftplugin/gdscript.vim
rename to config/.config/nvim/after/ftplugin/gdscript.vim
index a86808f..9c17c55 100644
--- a/vim/.vim/after/ftplugin/gdscript.vim
+++ b/config/.config/nvim/after/ftplugin/gdscript.vim
@@ -1,4 +1,6 @@
 set autoindent
-set noexpandtab
+set nowrap
 set tabstop=4
+set softtabstop=4
 set shiftwidth=4
+set expandtab
diff --git a/vim/.vim/after/syntax/markdown.vim b/config/.config/nvim/after/syntax/markdown.vim
similarity index 100%
rename from vim/.vim/after/syntax/markdown.vim
rename to config/.config/nvim/after/syntax/markdown.vim
diff --git a/vim/.vimrc b/vim/.vimrc
index 4c83b95..b630983 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -32,15 +32,8 @@ set autoindent
 
 set wrap
 set linebreak
-set textwidth=79
 set showbreak=⇇
 
-" use intelligent indentation for C
-" configure tabwidth and insert spaces instead of tabs
-set tabstop=4        " tab width is 4 spaces
-set shiftwidth=4     " indent also with 4 spaces
-set expandtab        " expand tabs to spaces
-
 set number
 set showcmd
 set cursorline