From 8e150aab98d5f890cfd454edddc71541dea88bc3 Mon Sep 17 00:00:00 2001
From: Jeremy Dormitzer <jeremy.dormitzer@gmail.com>
Date: Mon, 6 Nov 2023 13:32:16 -0500
Subject: [PATCH] Lua-mode; starship; org modules; simpler vterm; brew packages

---
 emacs/.emacs.d/config/init-lua.el   |  4 ++++
 emacs/.emacs.d/config/init-org.el   | 12 ++++++++++++
 emacs/.emacs.d/config/init-vterm.el |  8 +-------
 emacs/.emacs.d/init.el              |  1 +
 homebrew/Brewfile                   |  6 ++++++
 starship/.config/starship.toml      | 15 +++++++++++++++
 zsh/.zshrc                          |  5 ++++-
 7 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 emacs/.emacs.d/config/init-lua.el
 create mode 100644 starship/.config/starship.toml

diff --git a/emacs/.emacs.d/config/init-lua.el b/emacs/.emacs.d/config/init-lua.el
new file mode 100644
index 0000000..a0127cf
--- /dev/null
+++ b/emacs/.emacs.d/config/init-lua.el
@@ -0,0 +1,4 @@
+;; -*- lexical-binding: t; -*-
+(use-package lua-mode)
+
+(provide 'init-lua)
diff --git a/emacs/.emacs.d/config/init-org.el b/emacs/.emacs.d/config/init-org.el
index 930e912..406128e 100644
--- a/emacs/.emacs.d/config/init-org.el
+++ b/emacs/.emacs.d/config/init-org.el
@@ -29,6 +29,18 @@
         (newline))
       (goto-char (point-max))))
   :custom
+  (org-modules '(ol-doi
+                 ol-w3m
+                 ol-bbdb
+                 ol-bibtex
+                 ol-docview
+                 ol-gnus
+                 ol-info
+                 ol-irc
+                 ol-mhe
+                 ol-rmail
+                 ol-eww
+                 org-tempo))
   (org-agenda-files `(,(expand-file-name "~/org/todo.org")
                       ,(expand-file-name "~/org/daily")))
   (org-todo-keywords '((sequence
diff --git a/emacs/.emacs.d/config/init-vterm.el b/emacs/.emacs.d/config/init-vterm.el
index 0bd9c72..19d9423 100644
--- a/emacs/.emacs.d/config/init-vterm.el
+++ b/emacs/.emacs.d/config/init-vterm.el
@@ -2,12 +2,6 @@
 
 (use-package vterm
   :commands vterm
-  :init
-  (defun project-vterm ()
-    (interactive)
-    (if (projectile-project-root)
-        (call-interactively #'projectile-run-vterm)
-      (call-interactively #'vterm)))
   :config
   (general-def 'insert vterm-mode-map "C-<escape>" #'vterm-send-escape)
   ;; Add a hook when vterm changes the directory
@@ -47,7 +41,7 @@
     (vterm-send-C-x)
     (vterm-send-C-e))
   :general
-  (leader-map "v" #'project-vterm)
+  (leader-map "v" #'vterm)
   (vterm-mode-map "C-x C-e" #'vterm-edit-zsh-command-line)
   :custom
   (vterm-max-scrollback 10000)
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index bd8ef86..93c825a 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -101,6 +101,7 @@
 (require 'init-groovy)
 (require 'init-terraform)
 (require 'init-docker)
+(require 'init-lua)
 (require 'init-run-command)
 (require 'init-aws)
 (require 'init-prodigy)
diff --git a/homebrew/Brewfile b/homebrew/Brewfile
index 830acd8..bf4267f 100644
--- a/homebrew/Brewfile
+++ b/homebrew/Brewfile
@@ -4,6 +4,7 @@ tap "homebrew/cask"
 tap "homebrew/cask-versions"
 tap "homebrew/core"
 tap "railwaycat/emacsmacport"
+tap "ryleelyman/seamstress"
 brew "clojure/tools/clojure"
 brew "cmake"
 brew "direnv"
@@ -18,6 +19,8 @@ brew "jdtls"
 brew "jq"
 brew "kubectx"
 brew "llvm"
+brew "lua"
+brew "lua-language-server"
 brew "man-db"
 brew "maven"
 brew "metals"
@@ -39,11 +42,14 @@ brew "ripgrep"
 brew "ruby"
 brew "sbt"
 brew "scala"
+brew "seamstress"
+brew "starship"
 brew "stow"
 brew "sqlite"
 brew "texinfo"
 brew "typescript-language-server"
 brew "vscode-langservers-extracted"
+brew "youtube-dl"
 cask "alfred"
 cask "bartender"
 cask "calibre"
diff --git a/starship/.config/starship.toml b/starship/.config/starship.toml
new file mode 100644
index 0000000..3b85fb5
--- /dev/null
+++ b/starship/.config/starship.toml
@@ -0,0 +1,15 @@
+format = """$directory$fill\
+$git_branch\
+$git_commit\
+$git_state\
+$git_metrics\
+$git_status
+$character"""
+
+[directory]
+truncate_to_repo = false
+style = 'bold green'
+repo_root_style = 'bold cyan'
+
+[git_branch]
+symbol = '🌱 '
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 2d38f96..ae2c923 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -12,7 +12,10 @@ fi
 export ZSH="$HOME/.oh-my-zsh"
 
 fpath=($fpath "$HOME/.zfunctions")
-if [ -e "$HOME/.zfunctions/prompt_typewritten_setup" ]; then
+if command -v starship; then
+    export ZSH_THEME=""
+    eval "$(starship init zsh)"
+elif [ -e "$HOME/.zfunctions/prompt_typewritten_setup" ]; then
     export ZSH_THEME=""
     # Set typewritten ZSH as a prompt
     autoload -U promptinit; promptinit