diff --git a/nvim/.config/nvim/lua/clint/keybindings.lua b/nvim/.config/nvim/lua/clint/keybindings.lua
index 777a69f..f151209 100644
--- a/nvim/.config/nvim/lua/clint/keybindings.lua
+++ b/nvim/.config/nvim/lua/clint/keybindings.lua
@@ -17,9 +17,9 @@ keymap("n", "<leader>sh", "<C-w>s", default_ops)
 keymap("n", "<leader>se", "<C-w>=", default_ops)
 keymap("n", "<leader>sx", ":close<CR>", default_ops)
 
--- Save, Save/Quit
-keymap('n', '<F1>', ':w<CR>', default_ops)
-keymap('n', '<F2>', ':wq<CR>', default_ops)
+-- -- Save, Save/Quit
+-- keymap('n', '<F1>', ':w<CR>', default_ops)
+-- keymap('n', '<F2>', ':wq<CR>', default_ops)
 
 -- Tab through open buffers
 keymap('n', '[b', ':bp<CR>', default_ops)
@@ -81,12 +81,12 @@ keymap('n', '<Leader>e', ':NeoTreeFocusToggle<CR>', default_ops)
 -- Object Explorer
 keymap('n', '<Leader>o', ':SymbolsOutline<CR>', default_ops)
 
--- Debugging
-keymap('n', '<Leader>B', ":lua require'dap'.toggle_breakpoint()<CR>", default_ops)
-keymap('n', '<F5>', ":lua require'dap'.continue()<CR>", default_ops)
-keymap('n', '<F6>', ":lua require'dap'.step_into()<CR>", default_ops)
-keymap('n', '<F7>', ":lua require'dap'.step_over()<CR>", default_ops)
-keymap('n', '<Leader>D', ":lua require'dapui'.toggle()<CR>", default_ops)
+-- -- Debugging
+-- keymap('n', '<Leader>B', ":lua require'dap'.toggle_breakpoint()<CR>", default_ops)
+-- keymap('n', '<F5>', ":lua require'dap'.continue()<CR>", default_ops)
+-- keymap('n', '<F6>', ":lua require'dap'.step_into()<CR>", default_ops)
+-- keymap('n', '<F7>', ":lua require'dap'.step_over()<CR>", default_ops)
+-- keymap('n', '<Leader>D', ":lua require'dapui'.toggle()<CR>", default_ops)
 
 -- REPL
 keymap('v', '<Leader>x', ':ToggleTermSendVisualLines 100<CR><CR><CR>', default_ops)
@@ -95,24 +95,44 @@ keymap('n', '<Leader>x', ':ToggleTermSendCurrentLine 100<CR><CR>', default_ops)
 
 -- Helpful stuff for ToggleTerm, taken from their docs
 function _G.set_terminal_keymaps()
-  local opts = {buffer = 0}
-  vim.keymap.set('t', '<esc>', [[<C-\><C-n>]], opts)
-  vim.keymap.set('t', 'jk', [[<C-\><C-n>]], opts)
-  vim.keymap.set('t', '<C-h>', [[<Cmd>wincmd h<CR>]], opts)
-  vim.keymap.set('t', '<C-j>', [[<Cmd>wincmd j<CR>]], opts)
-  vim.keymap.set('t', '<C-k>', [[<Cmd>wincmd k<CR>]], opts)
-  vim.keymap.set('t', '<C-l>', [[<Cmd>wincmd l<CR>]], opts)
-  vim.keymap.set('t', '<C-w>', [[<C-\><C-n><C-w>]], opts)
+	local opts = { buffer = 0 }
+	vim.keymap.set('t', '<esc>', [[<C-\><C-n>]], opts)
+	vim.keymap.set('t', 'jk', [[<C-\><C-n>]], opts)
+	vim.keymap.set('t', '<C-h>', [[<Cmd>wincmd h<CR>]], opts)
+	vim.keymap.set('t', '<C-j>', [[<Cmd>wincmd j<CR>]], opts)
+	vim.keymap.set('t', '<C-k>', [[<Cmd>wincmd k<CR>]], opts)
+	vim.keymap.set('t', '<C-l>', [[<Cmd>wincmd l<CR>]], opts)
+	vim.keymap.set('t', '<C-w>', [[<C-\><C-n><C-w>]], opts)
 end
+
 -- if you only want these mappings for toggle term use term://*toggleterm#* instead
 vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()')
 
 -- Toggle a custom Terminal with ipython
 local Terminal = require('toggleterm.terminal').Terminal
-local ipython = Terminal:new({ cmd="ipython", direction="horizontal", count=100})
+local ipython = Terminal:new({
+	cmd = "ipython",
+	direction = "horizontal",
+	count = 100 })
 function _ipython_toggle()
 	ipython:toggle()
 end
-keymap('n', '<F1>', ":lua _ipython_toggle()<CR><Cmd>wincmd k<CR>", default_ops)
+
+keymap('n', '<F1>', ":lua _ipython_toggle()<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)
+
+-- Pytest
+local Terminal = require('toggleterm.terminal').Terminal
+local pytest = Terminal:new({
+	cmd = "python -m pytest",
+	direction = "float",
+	count = 200,
+	float_opts = { border = "curved" },
+	close_on_exit = false
+})
+function _pytest_toggle()
+	pytest:toggle()
+end
+
+keymap('n', '<F12>', ":lua _pytest_toggle()<CR>", default_ops)
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 581635c..196df47 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -72,5 +72,3 @@ eval "$(pyenv init -)"
 # eval "$(pyenv virtualenv-init -)"
 
 source ~/powerlevel10k/powerlevel10k.zsh-theme
-
-macchina