diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1377554
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.swp
diff --git a/.setup_vim.sh.swp b/.setup_vim.sh.swp
deleted file mode 100644
index a22fc16..0000000
Binary files a/.setup_vim.sh.swp and /dev/null differ
diff --git a/.vimrc b/.vimrc
index e510f9e..796852e 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,20 +1,36 @@
+" disable vi compatibility
 set nocompatible
+
+" choose based on filetype
 filetype on
 filetype plugin on
+
+" syntax highlighting
 syntax on
+
+" basic functions
 set number
 set cursorline
 set termguicolors
-set expandtab
-set tabstop=4
-set shiftwidth=4
 set nowrap
-set incsearch
-set ignorecase
-set smartcase
-set hlsearch
 set showcmd
 set history=1000
 set wildmenu
 set wildmode=list:longest
+
+" tabs
+set expandtab
+set tabstop=4
+set shiftwidth=4
+
+" searching
+set incsearch
+set ignorecase
+set smartcase
+set hlsearch
+
+" theme
 colorscheme catppuccin_macchiato
+
+" plugins
+autocmd VimEnter * NERDTree