From 665ea59a02d184dfe1bc91d69a0fd05855aae62d Mon Sep 17 00:00:00 2001 From: zendesk-acicchetti Date: Thu, 24 Mar 2022 08:57:16 -0400 Subject: [PATCH] updates --- emacs/emacs.doom/init.el | 2 +- hammerspoon/init.lua | 5 ++++- zsh/zshrc | 6 +++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/emacs/emacs.doom/init.el b/emacs/emacs.doom/init.el index 8640331..11fe666 100644 --- a/emacs/emacs.doom/init.el +++ b/emacs/emacs.doom/init.el @@ -139,7 +139,7 @@ ;;idris ; a language you can depend on (json +lsp) ; At least it ain't XML ;;(java +meghanada) ; the poster child for carpal tunnel syndrome - ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) + (javascript +lsp) ; all(hope(abandon(ye(who(enter(here)))))) ;;julia ; a better, faster MATLAB ;;kotlin ; a better, slicker Java(Script) ;;latex ; writing papers in Emacs has never been so fun diff --git a/hammerspoon/init.lua b/hammerspoon/init.lua index c7a8e4c..666b79a 100644 --- a/hammerspoon/init.lua +++ b/hammerspoon/init.lua @@ -7,13 +7,16 @@ spoon.SpoonInstall.use_syncinstall = true spoon.SpoonInstall:andUse("WindowScreenLeftAndRight") spoon.SpoonInstall:andUse("WindowHalfsAndThirds") spoon.SpoonInstall:andUse("Commander") +spoon.SpoonInstall:andUse("ReloadConfiguration") -TERMINAL_NAME = "WezTerm" +TERMINAL_NAME = "iTerm" spoon.WindowScreenLeftAndRight:bindHotkeys(spoon.WindowScreenLeftAndRight.defaultHotkeys) spoon.WindowHalfsAndThirds:bindHotkeys(spoon.WindowHalfsAndThirds.defaultHotkeys) +spoon.ReloadConfiguration:start() + hs.hotkey.bind({"cmd", "alt", "ctrl"}, "SPACE", function () spoon.Commander.show() end) diff --git a/zsh/zshrc b/zsh/zshrc index afe2e5f..a0a95c1 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -109,7 +109,11 @@ function dt() { local session_name session_name=${1:-DefaultSession} - zellij attach -c $session_name + if [[ "${SESSION_MANAGER}" == "tmux" ]]; then + tmux -u -2 new-session -A -s $session_name + else + zellij attach -c $session_name + fi } function send-to-pane() {