From bfdc1d9bc4ae4bafd887091a2132805b27857e5b Mon Sep 17 00:00:00 2001
From: Jordan Orelli <jordanorelli@gmail.com>
Date: Tue, 10 Jan 2023 16:08:04 -0600
Subject: [PATCH] nvim windows kinda works now yay

---
 .gitmodules          |  3 +++
 .vimrc               | 15 ++++++++-------
 cargo-config.toml    |  3 +++
 config.ini           |  3 +++
 nvim/lua/plugins.lua | 14 ++++++++++++++
 packer.nvim          |  1 +
 6 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 cargo-config.toml
 create mode 100644 nvim/lua/plugins.lua
 create mode 160000 packer.nvim

diff --git a/.gitmodules b/.gitmodules
index f3e93ae..f4502b7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "Vundle.vim"]
 	path = Vundle.vim
 	url = https://github.com/VundleVim/Vundle.vim.git
+[submodule "packer.nvim"]
+	path = packer.nvim
+	url = https://github.com/wbthomason/packer.nvim
diff --git a/.vimrc b/.vimrc
index 23b75bc..2869769 100644
--- a/.vimrc
+++ b/.vimrc
@@ -5,6 +5,7 @@ map <F12> :source $MYVIMRC<CR>
 " Plugins -------------------------------------------------------------------{{{
 " set the runtime path to include Vundle and initialize
 if has('nvim') && has('win32')
+  lua require('plugins')
   set rtp+=~/AppData/Local/nvim/bundle/Vundle.vim
 else
   set rtp+=~/.vim/bundle/Vundle.vim
@@ -25,6 +26,7 @@ call vundle#begin()
   Plugin 'tpope/vim-surround'       " edits surrounding quotes and parens and the like
   Plugin 'tpope/vim-rails'          " rails project management stuff
   Plugin 'tpope/vim-repeat'         " fixes the . key for ...something
+  Plugin 'scrooloose/nerdtree'      " better file navigation
   " Plugin 'airblade/vim-gitgutter'   " in-file git integration
   Plugin 'mhinz/vim-signify'
   Plugin 'slim-template/vim-slim'   " what in the 2008 is this
@@ -34,7 +36,6 @@ call vundle#begin()
   Plugin 'nanotech/jellybeans.vim'  " the best colorscheme
   Plugin 'ervandew/supertab'        " makes tab better apparently
   Plugin 'scrooloose/nerdcommenter' " no idea if I'm even using this
-  Plugin 'scrooloose/nerdtree'      " better file navigation
   Plugin 'Align'                    " aligns things on demand
   Plugin 'tomtom/tlib_vim'          " dependency of flashdevelop
   Plugin 'endel/flashdevelop.vim'   " this is probably old now
@@ -236,13 +237,13 @@ if has("autocmd")
       \   exe "normal! g`\"" |
       \ endif
 
-    autocmd FileType html set omnifunc=htmlcomplete#CompleteTags
-    autocmd FileType javascript set omnifunc=javascriptcomplete#CompleteJS
-    autocmd FileType xml set omnifunc=xmlcomplete#CompleteTags
-    autocmd FileType php set omnifunc=phpcomplete#CompletePHP
-    autocmd FileType python set omnifunc=pythoncomplete#Complete
-    autocmd FileType css set omnifunc=csscomplete#CompleteCSS
     if !has('nvim')
+      autocmd FileType html set omnifunc=htmlcomplete#CompleteTags
+      autocmd FileType javascript set omnifunc=javascriptcomplete#CompleteJS
+      autocmd FileType xml set omnifunc=xmlcomplete#CompleteTags
+      autocmd FileType php set omnifunc=phpcomplete#CompletePHP
+      autocmd FileType python set omnifunc=pythoncomplete#Complete
+      autocmd FileType css set omnifunc=csscomplete#CompleteCSS
       autocmd FileType rust set omnifunc=ale#completion#OmniFunc
     endif
 
diff --git a/cargo-config.toml b/cargo-config.toml
new file mode 100644
index 0000000..d56de49
--- /dev/null
+++ b/cargo-config.toml
@@ -0,0 +1,3 @@
+[net]
+
+git-fetch-with-cli=true
diff --git a/config.ini b/config.ini
index e472de6..ceb5ae6 100644
--- a/config.ini
+++ b/config.ini
@@ -26,3 +26,6 @@ nvim/init.vim=.config/nvim/init.vim
 .vimrc=AppData/Local/nvim/init.vim
 Vundle.vim=AppData/Local/nvim/bundle/Vundle.vim
 .vim/ftplugin=AppData/Local/nvim/ftplugin
+packer.nvim=AppData/Local/nvim-data/site/pack/packer/start/packer.nvim
+nvim/lua=AppData/Local/nvim/lua
+cargo-config.toml=.cargo/config.toml
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
new file mode 100644
index 0000000..ca5fa75
--- /dev/null
+++ b/nvim/lua/plugins.lua
@@ -0,0 +1,14 @@
+function packer_startup(use)
+  -- Packer can manage itself
+  use 'wbthomason/packer.nvim'
+
+  -- lsp manager
+  -- use 'williamboman/mason.nvim'
+  -- use 'williamboman/mason-lspconfig.nvim'
+  use 'neovim/nvim-lspconfig'
+end
+
+require('packer').startup(packer_startup)
+-- require('mason').setup()
+
+require('lspconfig').rust_analyzer.setup({})
diff --git a/packer.nvim b/packer.nvim
new file mode 160000
index 0000000..dac4088
--- /dev/null
+++ b/packer.nvim
@@ -0,0 +1 @@
+Subproject commit dac4088c70f4337c6c40d1a2751266a324765797