From cd8dade58b9012f2af79b31ad3e837d0aeb98981 Mon Sep 17 00:00:00 2001
From: "Aaron D. Lee" <aaron.daniel.lee@mgial.com>
Date: Sat, 27 Dec 2025 22:01:41 -0500
Subject: [PATCH] Dotfiles update 2025-12-27 22:01

---
 dotfiles.conf            | 5 ++++-
 machines/type-laptop.zsh | 4 ++++
 zsh/aliases.zsh          | 9 ++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/dotfiles.conf b/dotfiles.conf
index a3fdc31..156ca5a 100644
--- a/dotfiles.conf
+++ b/dotfiles.conf
@@ -84,6 +84,9 @@ INSTALL_EZA="ask"
 INSTALL_NEOVIM="ask"
 SET_ZSH_DEFAULT="ask"
 
+DEFAULT_EDITOR="vim"
+
+
 # ============================================================================
 # Advanced Features
 # ============================================================================
@@ -115,7 +118,7 @@ TW_SESSION_PREFIX="work"
 TW_DEFAULT_TEMPLATE="dev"
 
 # ============================================================================
-# Tmuxinator Settings 
+# Tmuxinator Settings
 # ============================================================================
 
 TMUXINATOR_ENABLED="auto"             # auto, true, false
diff --git a/machines/type-laptop.zsh b/machines/type-laptop.zsh
index 6d39995..c7de3b7 100644
--- a/machines/type-laptop.zsh
+++ b/machines/type-laptop.zsh
@@ -29,3 +29,7 @@ fi
 # --- Suspend/hibernate helpers ---
 alias suspend='systemctl suspend'
 alias hibernate='systemctl hibernate'
+
+# --- Use neovim on laptops / vim on servers ---
+alias vim="nvim"
+alias vimc="/usr/bin/vim"
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index fd547f4..8b0faa8 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -182,6 +182,13 @@ alias v.motd='${EDITOR:-vim} ~/.dotfiles/zsh/functions/motd.zsh'
 alias v.theme='${EDITOR:-vim} ~/.dotfiles/zsh/themes/adlee.zsh-theme'
 alias v.machine='${EDITOR:-vim} ~/.dotfiles/machines/${DF_HOSTNAME:-$(hostname -s)}.zsh'
 
+if [[ ${DEFAULT_EDITOR} = "nvim" ]]; then
+    alias vim='nvim'
+    alias vimc='/usr/bin/vim'
+else
+    alias vim='/usr/bin/vim'
+fi
+
 # ============================================================================
 # Reload
 # ============================================================================
@@ -312,7 +319,7 @@ alias vm="mv"
 
 # Docker Stuff
 dkr-rbld() {
-    sudo docker-compose down 
+    sudo docker-compose down
     sudo docker-compose up --build -d
 }