Merge branch 'master' of https://git.terminallychill.xyz/clint/dotfiles

nvim/.config/nvim/lua/clint/autocmds.lua

@@ -1,4 +1,4 @@
-local group = vim.api.nvim_create_augroup("clints_custom_autocmds", {})
+local group = vim.api.nvim_create_augroup("clints_custom_autocmds", { clear = true })
 -- vim.api.nvim_create_autocmd("BufEnter", { command = "echo 'Hello'", group = group })
 
 -- for a moment, highlight the text that was yanked
@@ -14,3 +14,5 @@ vim.api.nvim_create_autocmd('BufEnter', {
 	group = group,
 	command = "MarkdownPreview",
 })
+
+-- when opening a python file, try to start the virtualenv of the current project

nvim/.config/nvim/lua/clint/keybindings.lua

@@ -109,13 +109,10 @@ vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()')
 
 -- Toggle a custom Terminal with ipython
 local Terminal = require('toggleterm.terminal').Terminal
-<<<<<<< Updated upstream
-local ipython = Terminal:new({ cmd="ipython", direction="horizontal", count="100"})
-local function _ipython_toggle()
-=======
 local ipython = Terminal:new({ cmd="ipython", direction="horizontal", count=100})
 function _ipython_toggle()
->>>>>>> Stashed changes
 	ipython:toggle()
 end
 keymap('n', '<F1>', ":lua _ipython_toggle()<CR><Cmd>wincmd k<CR>", default_ops)
+keymap('i', '<F1>', "<Esc>:lua _ipython_toggle()<CR><Cmd>wincmd k<CR>", default_ops)
+keymap('t', '<F1>', "<Esc><Cmd>wincmd k<CR>:lua _ipython_toggle()<CR>", default_ops)

nvim/.config/nvim/lua/plugins/init.lua

@@ -150,7 +150,8 @@ return {
 		version = "*",
 		config = {
 			open_mapping = [[<c-\>]],
-			direction = 'horizontal'
+			direction = 'horizontal',
+			insert_mappings = true
 		}
 	},