From 02d561140c4c7f3364a9ade41494aab4120d15b2 Mon Sep 17 00:00:00 2001 From: cmccay Date: Fri, 16 Jun 2023 01:48:04 -0500 Subject: [PATCH 1/3] better toggleterm --- nvim/.config/nvim/lua/clint/keybindings.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nvim/.config/nvim/lua/clint/keybindings.lua b/nvim/.config/nvim/lua/clint/keybindings.lua index c2b73a3..57931fa 100644 --- a/nvim/.config/nvim/lua/clint/keybindings.lua +++ b/nvim/.config/nvim/lua/clint/keybindings.lua @@ -89,6 +89,7 @@ keymap('n', '', ":lua require'dap'.step_over()", default_ops) keymap('n', 'D', ":lua require'dapui'.toggle()", default_ops) -- REPL +keymap('n', 'x', ':ToggleTermSendCurrentLine 100', default_ops) keymap('v', 'x', ':ToggleTermSendVisualLines 100', default_ops) @@ -109,7 +110,9 @@ 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 function _ipython_toggle() +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) From 71a9e0566843df026cbc8c4909ac92b51e3c6de6 Mon Sep 17 00:00:00 2001 From: cmccay Date: Tue, 20 Jun 2023 15:52:39 -0500 Subject: [PATCH 2/3] ipython stuf --- nvim/.config/nvim/init.lua | 10 +++++----- nvim/.config/nvim/lua/clint/autocmds.lua | 4 +++- nvim/.config/nvim/lua/clint/keybindings.lua | 2 +- nvim/.config/nvim/lua/plugins/init.lua | 15 ++++++++------- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 4e9e127..abaca85 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -18,8 +18,8 @@ require("clint") -- loads lua/clint/init.lua require('dap-python').setup('~/.virtualenvs/debugpy/bin/python') vim.opt.termguicolors = true -vim.cmd.colorscheme 'kanagawa' --- vim.cmd("highlight Normal guibg=none") --- vim.cmd("highlight NonText guibg=none") --- vim.cmd("highlight Normal ctermbg=none") --- vim.cmd("highlight NonText ctermbg=none") +vim.cmd.colorscheme 'ayu' +vim.cmd("highlight Normal guibg=none") +vim.cmd("highlight NonText guibg=none") +vim.cmd("highlight Normal ctermbg=none") +vim.cmd("highlight NonText ctermbg=none") 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 57931fa..065d60f 100644 --- a/nvim/.config/nvim/lua/clint/keybindings.lua +++ b/nvim/.config/nvim/lua/clint/keybindings.lua @@ -109,7 +109,7 @@ 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 diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 49e698d..03c2de8 100644 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -128,19 +128,20 @@ return { }, }, - -- Object Explorer - { 'simrat39/symbols-outline.nvim', - config = { - auto_preview = true, - } - }, + -- -- Object Explorer + -- { 'simrat39/symbols-outline.nvim', + -- config = { + -- auto_preview = true, + -- } + -- }, -- Terminal { 'akinsho/toggleterm.nvim', version = "*", config = { open_mapping = [[]], - direction = 'horizontal' + direction = 'horizontal', + insert_mappings = true } }, From e5574c7658d287e4862ee1eae5aac61fd26ad155 Mon Sep 17 00:00:00 2001 From: c Date: Tue, 20 Jun 2023 22:57:06 -0500 Subject: [PATCH 3/3] asdf --- nvim/.config/nvim/lua/clint/keybindings.lua | 8 +++++++- nvim/.config/nvim/test.py | 3 +++ zsh/.zshrc | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) 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"