diff --git a/nix/base-system/.vimrc b/nix/base-system/.vimrc
index a72401d..0482e38 100644
--- a/nix/base-system/.vimrc
+++ b/nix/base-system/.vimrc
@@ -1,26 +1,5 @@
 " general editing options
-set noswapfile
-set nocompatible
-set tabstop=4
-set expandtab
-set paste
-set autoindent
-set linebreak
-syntax on
-filetype plugin indent on
-
 " file specific overrides
-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
-
-let g:BASH_AuthorName   = 'Jeremy Wall'     
-let g:BASH_AuthorRef    = 'jw'                         
-let g:BASH_Email        = 'jeremy@marzhillstudios.com'
 
 " Lua configuration
 source /etc/nvim.lua
diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index 00d8b8a..fb2bdf0 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -55,7 +55,9 @@
           neovim.vimAlias = true;
           neovim.viAlias = true;
           neovim.configure = {
-            customRC = (builtins.readFile ./.vimrc);
+            customRC = "lua << EOF
+${builtins.readFile ./init.lua}
+EOF";
             packages.myVimPackage = with pkgs.vimPlugins; {
               start = [
                 nvim-tree-lua
diff --git a/nix/base-system/init.lua b/nix/base-system/init.lua
index bc3bf75..47aac45 100644
--- a/nix/base-system/init.lua
+++ b/nix/base-system/init.lua
@@ -6,6 +6,44 @@ vim.cmd.colorscheme 'duskfox'
 -- turn on relative line numbers
 vim.opt.relativenumber = true
 vim.opt.number = true
+vim.o.expandtab = false
+vim.o.paste = false
+vim.o.autoindent = true
+vim.o.linebreak = true
+vim.o.mouse = false
+vim.o.tabstop = 4
+
+vim.cmd("noswapfile")
+vim.cmd("syntax on")
+vim.cmd("filetype plugin on")
+
+vim.cmd([[
+au BufNewFile,BufRead *Makefile,*.mk set noexpandtab
+]])
+
+vim.cmd([[
+au BufNewFile,BufRead *.py,*.java set tabstop=2
+]])
+
+vim.cmd([[
+au BufNewFile,BufRead *.app set filetype=erlang
+]])
+
+vim.cmd([[
+au BufNewFile,BufRead .bash_* set filetype=sh
+]])
+
+vim.cmd([[
+au BufNewFile,BufRead *.sil set filetype=tex
+]])
+
+vim.cmd([[
+au BufNewFile,BufRead *.erl filetype indent off
+]])
+
+vim.cmd([[
+au BufNewFile,BufRead *.hrl filetype indent off
+]])
 
 --https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
 
@@ -16,7 +54,8 @@ lspconfig.nil_ls.setup{{
 
 local vim_pid = vim.fn.getpid()
 
-local omnisharp_cmd = { tostring(vim.env.OMNISHARP_BIN), '--languageserver', '--hostPID',  tostring(vim_pid) }
+-- "FormatterOptions:EnableEditorConfigSupport=true" 
+local omnisharp_cmd = { tostring(vim.env.OMNISHARP_BIN), '--languageserver', '--hostPID',  tostring(vim_pid), }
 -- This needs a path to the omnisharp dll provided. We depend on the OMNISHARP_BIN environment variable being set to make this work.
 lspconfig.omnisharp.setup {
     cmd = omnisharp_cmd,
@@ -27,6 +66,7 @@ lspconfig.omnisharp.setup {
     on_attach = function(client, bufnr)
         client.server_capabilities.semanticTokensProvider = nil
     end,
+	-- TODO(jwall): See if init_options can assist in getting our lint setting correct.
 }
 
 --ocaml
@@ -242,7 +282,9 @@ telescope.setup({
 
 vim.keymap.set("n", "<Leader>nff", telescope_builtins.fd)
 vim.keymap.set("n", "<Leader>rl", telescope_builtins.lsp_references)
+vim.keymap.set("n", "<Leader>rn", vim.lsp.buf.rename)
 vim.keymap.set("n", "<Leader>sl", telescope_builtins.lsp_workspace_symbols)
+vim.keymap.set("n", "<Leader>dl", telescope_builtins.diagnostics)
 vim.keymap.set("n", "<Leader>bl", function() telescope_builtins.buffers({}) end)
 
 -- Show whatever errors we have in our trouble pane
diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock
index 0199cc7..6854c93 100644
--- a/nix/darwin/flake.lock
+++ b/nix/darwin/flake.lock
@@ -34,12 +34,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-BVCBcsjnf6ByR/xBL+CaJVpSm4aYBa92F+yKvJ60afc=",
-        "path": "/nix/store/xx4azg7693rgqcb578lwfqfmm1jp2x8v-source/nix/base-system",
+        "narHash": "sha256-slV/Wip7cNLLNJXA/u25+h1l7ePi+1+/0T+GfgO+JA4=",
+        "path": "/nix/store/vqf2xx1r7is6hiy0m3pazs6cin0yhiqr-source/nix/base-system",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/xx4azg7693rgqcb578lwfqfmm1jp2x8v-source/nix/base-system",
+        "path": "/nix/store/vqf2xx1r7is6hiy0m3pazs6cin0yhiqr-source/nix/base-system",
         "type": "path"
       }
     },