Lua-mode; starship; org modules; simpler vterm; brew packages

emacs/.emacs.d/config/init-lua.el

@@ -0,0 +1,4 @@
+;; -*- lexical-binding: t; -*-
+(use-package lua-mode)
+
+(provide 'init-lua)

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

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)

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)

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"

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 = '🌱 '

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