diff --git a/nvim/.config/nvim/lua/clint/autocmds.lua b/nvim/.config/nvim/lua/clint/autocmds.lua index 1d8144a..8544b61 100644 --- a/nvim/.config/nvim/lua/clint/autocmds.lua +++ b/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 diff --git a/nvim/.config/nvim/lua/clint/keybindings.lua b/nvim/.config/nvim/lua/clint/keybindings.lua index 8e9a4a4..777a69f 100644 --- a/nvim/.config/nvim/lua/clint/keybindings.lua +++ b/nvim/.config/nvim/lua/clint/keybindings.lua @@ -89,7 +89,8 @@ keymap('n', '', ":lua require'dap'.step_over()", default_ops) keymap('n', 'D', ":lua require'dapui'.toggle()", default_ops) -- REPL -keymap('v', 'x', ':ToggleTermSendVisualLines 100', default_ops) +keymap('v', 'x', ':ToggleTermSendVisualLines 100', default_ops) +keymap('n', 'x', ':ToggleTermSendCurrentLine 100', default_ops) -- Helpful stuff for ToggleTerm, taken from their docs @@ -108,8 +109,10 @@ 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', '', ":lua _ipython_toggle()wincmd k", default_ops) +keymap('i', '', ":lua _ipython_toggle()wincmd k", default_ops) +keymap('t', '', "wincmd k:lua _ipython_toggle()", default_ops) diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index aa85f4d..485dd98 100644 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -150,7 +150,8 @@ return { version = "*", config = { open_mapping = [[]], - direction = 'horizontal' + direction = 'horizontal', + insert_mappings = true } }, diff --git a/nvim/.config/nvim/test.py b/nvim/.config/nvim/test.py index 1d1e830..e9805a1 100644 --- a/nvim/.config/nvim/test.py +++ b/nvim/.config/nvim/test.py @@ -17,7 +17,10 @@ def subtract(x, y) -> int: return: int """ print(f"{x} - {y} = {x-y}\n") + print("ahother break") return x + y # open terminal 100: f1 +add(1, 2) subtract(1, 2) + diff --git a/zsh/.zshrc b/zsh/.zshrc index a6cc493..9b8a090 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -8,6 +8,7 @@ fi #USE_POWERLINE="true" # aliases +alias python="/Library/Frameworks/Python.framework/Versions/3.10/bin/python3" alias cp="cp -i" alias more="less" alias weather="curl wttr.in"