From 3313d963244810b2017b0781bbc62d8a46d254dd Mon Sep 17 00:00:00 2001
From: jdormit <jeremy.dormitzer@gmail.com>
Date: Tue, 12 Mar 2024 10:56:19 -0400
Subject: [PATCH] Misc changes

---
 emacs/.emacs.d/config/init-evil.el | 2 +-
 emacs/.emacs.d/config/init-ruby.el | 2 +-
 emacs/.emacs.d/init.el             | 3 +++
 starship/.config/starship.toml     | 6 +++++-
 zsh/.zshenv                        | 4 ----
 zsh/.zshrc                         | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/emacs/.emacs.d/config/init-evil.el b/emacs/.emacs.d/config/init-evil.el
index 74929db..b6638fb 100644
--- a/emacs/.emacs.d/config/init-evil.el
+++ b/emacs/.emacs.d/config/init-evil.el
@@ -25,7 +25,7 @@
   (evil-vsplit-window-right t))
 
 (use-package evil-collection
-  :straight (:host github :repo "meliache/evil-collection" :branch "mu4e-development")
+;;  :straight (:host github :repo "meliache/evil-collection" :branch "mu4e-development")
   :after evil
   :config
   (evil-collection-init '(dashboard
diff --git a/emacs/.emacs.d/config/init-ruby.el b/emacs/.emacs.d/config/init-ruby.el
index 020d2a3..9248acb 100644
--- a/emacs/.emacs.d/config/init-ruby.el
+++ b/emacs/.emacs.d/config/init-ruby.el
@@ -1,6 +1,6 @@
 ;; -*- lexical-binding: t; -*-
 (use-package ruby-mode
-  :straight (:typebuilt-in))
+  :straight (:type built-in))
 
 (use-package rbenv
   :hook (after-init . global-rbenv-mode))
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index da6e1c7..b0606ea 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -37,6 +37,9 @@
 (straight-use-package 'use-package)
 (setq straight-use-package-by-default t)
 
+;; Tell straight to use SSH for git connections
+(setq straight-vc-git-default-protocol 'ssh)
+
 ;; "Garbage Collection Magic Hack"
 (use-package gcmh
   :demand t
diff --git a/starship/.config/starship.toml b/starship/.config/starship.toml
index 3b85fb5..489ec6b 100644
--- a/starship/.config/starship.toml
+++ b/starship/.config/starship.toml
@@ -3,7 +3,8 @@ $git_branch\
 $git_commit\
 $git_state\
 $git_metrics\
-$git_status
+$git_status\
+$time
 $character"""
 
 [directory]
@@ -13,3 +14,6 @@ repo_root_style = 'bold cyan'
 
 [git_branch]
 symbol = '🌱 '
+
+[time]
+disabled = false
diff --git a/zsh/.zshenv b/zsh/.zshenv
index de1859a..6a13aa0 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -35,7 +35,3 @@ if [ -d "/opt/homebrew/Caskroom/google-cloud-sdk" ]; then
 fi
 
 [[ -e "$HOME/.cargo/env" ]] && . "$HOME/.cargo/env"
-
-if command -v rbenv &> /dev/null; then
-    eval "$(rbenv init - zsh)"
-fi
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 5ba7644..4424972 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -93,7 +93,7 @@ fi
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git direnv pipenv npm nvm)
+plugins=(git direnv pipenv npm nvm rbenv)
 
 source $ZSH/oh-my-zsh.sh