diff --git a/.vimrc b/.vimrc index dfb931b..121b436 100644 --- a/.vimrc +++ b/.vimrc @@ -1,4 +1,5 @@ -" genera editing options +" general editing options +set noswapfile set nocompatible set tabstop=4 set expandtab @@ -14,6 +15,7 @@ au BufNewFile,BufRead *Makefile,*.mk set noexpandtab au BufNewFile,BufRead *.py,*.java set tabstop=2 au BufNewFile,BufRead *.app set filetype=erlang au BufNewFile,BufRead .bash_* set filetype=sh +au BufNewFile,BufRead *.sil set filetype=tex au BufNewFile,BufRead *.erl filetype indent off au BufNewFile,BufRead *.hrl filetype indent off @@ -31,5 +33,3 @@ let g:clj_paren_rainbow = 1 let vimclojure#NailgunClient = "/Users/jwall/bin/ng" let g:erlangFoldSplitFunction=0 - -colorscheme desert256 diff --git a/nix/darwin/darwin-configuration.nix b/nix/darwin/darwin-configuration.nix index cdba49b..642f72b 100644 --- a/nix/darwin/darwin-configuration.nix +++ b/nix/darwin/darwin-configuration.nix @@ -33,12 +33,7 @@ programs = with pkgs; { neovim.enable = true; neovim.configure = { - customRC = '' - set noswapfile - set ts=4 - set expandtab - set autoindent - ''; + customRC = (builtins.readFile ../../.vimrc); packages.myVimPackage = with pkgs.vimPlugins; { start = [ coc-nvim @@ -91,6 +86,7 @@ htop colima lima + google-cloud-sdk inputs.sile inputs.runwhen inputs.durnitisp