Move python config into options, add keymap to format with black and zimports

init.lua

@@ -1,3 +1,6 @@
+-- Set vim options
+require 'options'
+
 -- Load plugins as defined for Packer
 require 'plugins'
 
@@ -7,8 +10,5 @@ require 'keymaps'
 -- Setup LSP configuration
 require 'config_lsp'
 
--- Set additional vim.opt variables
-require 'options'
-
 -- Remaining vim commands to be converted to lua
 require 'vimcommands'

lua/config_filetypes/config_python.lua

@@ -1,7 +0,0 @@
-vim.g.python3_host_prog = '~/.pyenv/versions/neovim3/bin/python'
-vim.g.python_indent = {
-    open_paren = 'shiftwidth()',
-    nested_paren = 'shiftwidth()',
-    continue = 'shiftwidth()',
-    closed_paren_align_last_line = 'v:false',
-}

lua/keymaps.lua

@@ -17,6 +17,7 @@ nmap('<leader>sr', ':SnipRun<cr>')
 nmap('<leader>gf', ':Git fetch<cr>')
 nmap('<leader>gp', ':Git pull<cr>')
 nmap('<leader>gP', ':Git push<cr>')
+nmap('<leader>i', ':!black % ; zimports %<cr>')
 
 -- Telescope
 nmap('<leader>;', '<cmd>Telescope builtin<cr>')

lua/options.lua

@@ -1,3 +1,10 @@
+vim.g.python3_host_prog = '~/.pyenv/versions/neovim3/bin/python'
+vim.g.python_indent = {
+    open_paren = 'shiftwidth()',
+    nested_paren = 'shiftwidth()',
+    continue = 'shiftwidth()',
+    closed_paren_align_last_line = 'v:false',
+}
 vim.opt.mouse="nv"
 vim.opt.shiftwidth=4
 vim.opt.number=true