this might actually work on windows

master
Jordan Orelli 2 years ago
parent 2249ffab4b
commit 5beccc1d4b

@ -1,14 +1,26 @@
set nocompatible
map <F12> :source $MYVIMRC<CR>
" Plugins -------------------------------------------------------------------{{{
" set the runtime path to include Vundle and initialize
if !has('nvim')
if has('nvim') && has('win32')
set rtp+=~/AppData/Local/nvim/bundle/Vundle.vim
else
set rtp+=~/.vim/bundle/Vundle.vim
endif
" allegedly this needs to be off to load Vundle
filetype off
call vundle#begin()
" let Vundle manage Vundle, required
Plugin 'VundleVim/Vundle.vim'
if !has('nvim')
Plugin 'dense-analysis/ale' " asynchronous linting engine
endif
Plugin 'tpope/vim-fugitive' " integration with the git cli
Plugin 'tpope/vim-surround' " edits surrounding quotes and parens and the like
Plugin 'tpope/vim-rails' " rails project management stuff
@ -52,7 +64,6 @@ if !has('nvim')
" Plugin 'prabirshrestha/vim-lsp'
" Plugin 'mattn/vim-lsp-settings'
call vundle#end() " required
endif
" enable the filetype plugin
filetype plugin indent on
@ -557,3 +568,8 @@ if executable(s:clip)
endif
" ---------------------------------------------------------------------------}}}
" Neovim Stuff --------------------------------------------------------------{{{
if has('nvim')
set guifont=Cascadia\ Mono:h12
endif
" ---------------------------------------------------------------------------}}}

@ -23,5 +23,6 @@ nvim/init.vim=.config/nvim/init.vim
# items in the map.windows section defines a place where config files will be
# placed on windows, relative to the user's home directory
[map.windows]
nvim/init.vim=AppData/Local/nvim/init.vim
.vimrc=AppData/Local/nvim/init.vim
Vundle.vim=AppData/Local/nvim/bundle/Vundle.vim
.vim/ftplugin=AppData/Local/nvim/ftplugin

@ -8,6 +8,7 @@ import os
import pathlib
import platform
import subprocess
import sys
import shutil
from functools import cached_property
@ -29,7 +30,7 @@ class Installer:
"""
if host.is_windows and not host.is_admin:
print("You are not admin: admin is required on Windows")
os.exit(1)
sys.exit(1)
print("linking in home files")
home = self.options.config['home']
@ -52,7 +53,7 @@ class Installer:
defines all of the places where preferences files will be installed
"""
if host.is_linux:
return [targets.Linux(), targets.WSLHost()]
return [targets.Linux()]
if host.is_windows:
return [targets.Windows()]

@ -1,34 +1,22 @@
set nocompatible
filetype off
map <F12> :source $MYVIMRC<CR>
" Plugins -------------------------------------------------------------------{{{
" set the runtime path to include Vundle and initialize
if has('win32')
set rtp+=~/AppData/Local/nvim/bundle/Vundle.vim
else
" set the runtime path to include Vundle and initialize
set rtp+=~/.vim/bundle/Vundle.vim
endif
filetype off
call vundle#begin()
" let Vundle manage Vundle, required
Plugin 'VundleVim/Vundle.vim'
Plugin 'tpope/vim-fugitive' " integration with the git cli
Plugin 'tpope/vim-surround' " edits surrounding quotes and parens and the like
Plugin 'mhinz/vim-signify'
Plugin 'fatih/vim-go' " all-in-one Go tools
Plugin 'fatih/vim-hclfmt' " nicely formats hcl files
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 'nanotech/jellybeans.vim'
Plugin 'itchyny/lightline.vim' " fancy status line
Plugin 'hashivim/vim-terraform' " hclfmt but for terraform
Plugin 'Glench/Vim-Jinja2-Syntax' " jinja2 syntax stuff
Plugin 'rust-lang/rust.vim' " bare minimum rust syntax stuff
call vundle#end()
set runtimepath^=~/.vim runtimepath+=~/.vim/after
let &packpath = &runtimepath
" enable the filetype plugin
filetype plugin indent on
source ~/.vimrc
" ---------------------------------------------------------------------------}}}

Loading…
Cancel
Save