From 767396315824cb0117733dc7c4b4e2e5d3aa17de Mon Sep 17 00:00:00 2001 From: Michael Housh Date: Sat, 23 Sep 2023 23:58:32 -0400 Subject: [PATCH] Added toggle-term plugin for neovim --- nvim/m-housh/ftplugin/swift.lua | 16 ++++++++++++++-- nvim/m-housh/lazy-lock.json | 1 + zsh/config/.zshrc | 6 ++---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/nvim/m-housh/ftplugin/swift.lua b/nvim/m-housh/ftplugin/swift.lua index 35deeb1..252afed 100644 --- a/nvim/m-housh/ftplugin/swift.lua +++ b/nvim/m-housh/ftplugin/swift.lua @@ -6,6 +6,18 @@ o.tabstop = 2 o.softtabstop = 2 o.shiftwidth = 2 -keymap('n', '', '!swift build', default_options) -keymap('n', '', '!swift test', default_options) +local Terminal = require("toggleterm.terminal").Terminal +local swifttest = Terminal:new({ + cmd = "swift test", + hidden = true, + close_on_exit = false, +}) + +function _SWIFT_TEST_TOGGLE() + swifttest:toggle() +end + +keymap('n', '', '!swift build', default_options) +keymap('n', '', ':lua _SWIFT_TEST_TOGGLE()', default_options) + diff --git a/nvim/m-housh/lazy-lock.json b/nvim/m-housh/lazy-lock.json index 52fe1fa..4ccf5e4 100644 --- a/nvim/m-housh/lazy-lock.json +++ b/nvim/m-housh/lazy-lock.json @@ -28,6 +28,7 @@ "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope.nvim": { "branch": "0.1.x", "commit": "54930e1abfc94409e1bb9266e752ef8379008592" }, + "toggleterm.nvim": { "branch": "main", "commit": "0427b908ebefcb3701c7f2cfbdafa37d11afe71a" }, "vim-vsnip": { "branch": "master", "commit": "be277461265f1e5c7db470aa479f30956597ea9e" }, "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" } } \ No newline at end of file diff --git a/zsh/config/.zshrc b/zsh/config/.zshrc index 0a659b7..a62d674 100644 --- a/zsh/config/.zshrc +++ b/zsh/config/.zshrc @@ -43,6 +43,7 @@ export GIT_DISCOVERY_ACROSS_FILESYSTEM=1 #export MYVIMRC="$HOME/.vim/vimrc" export MYZSHRC="$ZDOTDIR/.zshrc" export PROPOSALS="$HOME/Library/Mobile Documents/com~apple~CloudDocs/Work/Proposals" +export NVIM_APPNAME="m-housh" autoload -U up-line-or-beginning-search autoload -U down-line-or-beginning-search @@ -194,7 +195,7 @@ alias reload='exec zsh -l' alias temp='cd $(mktemp -d)' alias vi='nvim' alias nvim='unset VIMINIT && unset MYVIMRC && /opt/homebrew/bin/nvim' -alias nvim-mhoush='NVIM_APPNAME=m-housh && /opt/homebrew/bin/nvim' +alias nvim-mhoush='NVIM_APPNAME=m-housh && nvim' alias nvim-kickstart='NVIM_APPNAME=kickstart /opt/homebrew/bin/nvim' alias nvim-lazy='NVIM_APPNAME=lazy /opt/homebrew/bin/nvim' @@ -207,12 +208,9 @@ mkcd() { mkdir -p "$dir" && cd "$dir" } && export mkcd - - #------------------------------ local configs ------------------------------ _source_if "$ZDOTDIR/.zshrc-local" - # [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh test -d "$HOME/.tea" && source <("$HOME/.tea/tea.xyz/v*/bin/tea" --magic=zsh --silent)