diff --git a/nvim/.config/nvim/lua/clint/keybindings.lua b/nvim/.config/nvim/lua/clint/keybindings.lua index c2b73a3..a0d4aa8 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,13 @@ 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', '', ":lua _ipython_toggle()wincmd k", default_ops) 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"