From bf2e2e971892965b7b6b6c68b40ea5ddebc4a913 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zo=C3=A9=20Cassiop=C3=A9e=20Gauthier?= <hello@blorp.dev>
Date: Tue, 21 May 2024 09:52:10 -0400
Subject: [PATCH] Prefer installing Wezterm from Flatpak

---
 bootstrap.sh | 12 ++----------
 gitconfig    | 24 ++++++++++++++++++++++--
 wezterm.lua  | 32 ++++++++++++--------------------
 zshenv       |  8 ++++++++
 zshrc        |  2 ++
 5 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index e376bd4..6ea8cd0 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -38,10 +38,10 @@ if [ ! -d ~/.oh-my-zsh ]; then
     sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended --keep-zshrc
 fi
 if [ ! -d ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions ]; then
-    git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
+    git clone https://github.com/zsh-users/zsh-autosuggestions "${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions"
 fi
 if [ ! -d ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting ]; then
-    git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
+    git clone https://github.com/zsh-users/zsh-syntax-highlighting.git "${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting"
 fi
 mkdir -p ~/.oh-my-zsh/custom/themes
 ln -sf "$DOTFILES/themes/witchhazelhypercolor.zsh-theme" ~/.oh-my-zsh/custom/themes/witchhazelhypercolor.zsh-theme
@@ -52,11 +52,3 @@ ln -sf "$DOTFILES/themes/witchhazelhypercolor.zsh-theme" ~/.oh-my-zsh/custom/the
 if ! [ -x "$(command -v starship)" ]; then
     sh -c "$(curl -fsSL https://starship.rs/install.sh)" -- -y
 fi
-
-
-### Wezterm
-
-curl -LO https://github.com/wez/wezterm/releases/download/nightly/WezTerm-nightly-Ubuntu18.04.AppImage
-chmod +x WezTerm-nightly-Ubuntu18.04.AppImage
-mkdir -p ~/.local/bin
-mv WezTerm-nightly-Ubuntu18.04.AppImage ~/.local/bin/wezterm
diff --git a/gitconfig b/gitconfig
index a9594ed..ae8c392 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,5 +1,25 @@
+[init]
+	defaultBranch = main
+
+[pull]
+  ff = only
+
 [user]
 	name = Zoé Cassiopée Gauthier
 	email = hello@blorp.dev
-[init]
-	defaultBranch = main
+
+[core]
+  pager = delta
+
+[interactive]
+  diffFilter = delta --color-only
+
+[delta]
+  navigate = true
+  syntax-theme = witchhazelhypercolor
+
+[merge]
+  conflictstyle = diff3
+
+[diff]
+  colorMoved = default
diff --git a/wezterm.lua b/wezterm.lua
index 13c8395..0a81960 100644
--- a/wezterm.lua
+++ b/wezterm.lua
@@ -1,21 +1,13 @@
-local wezterm = require 'wezterm';
-return {
-  colors = {
-    foreground = "#f8f8f2",
-    background = "#282634",
-    cursor_bg = "#f8f8f0",
-    cursor_border = "#f8f8f0",
-    cursor_fg = "#060709",
-    selection_bg = "#8077a8",
-    selection_fg = "#f6e1ce",
-    ansi = {"#040303","#f92672","#c2ffdf","#e6c000","#c2ffdf","#ffb8d1","#c5a3ff","#f8f8f0"},
-    brights = {"#6090cb","#ff857f","#c2ffdf","#ffea00","#c2ffdf","#ffb8d1","#c5a3ff","#f8f8f0"},
-  },
-  font = wezterm.font_with_fallback({
-    {family="IBM Plex Mono", weight="DemiBold"},
-    "FreeMono",
-  }),
-  initial_cols = 140,
-  initial_rows = 50,
-  enable_wayland = false,
+local wezterm = require 'wezterm'
+local config = {}
+
+config.font = wezterm.font_with_fallback {
+  { family="IBM Plex Mono", weight="DemiBold" },
+  "FreeMono",
 }
+config.color_scheme = "Fairy Floss Dark (Gogh)"
+config.initial_cols = 140
+config.initial_rows = 50
+config.enable_wayland = false
+
+return config
diff --git a/zshenv b/zshenv
index b398ac9..d790a55 100644
--- a/zshenv
+++ b/zshenv
@@ -9,3 +9,11 @@ fi
 if [ -f "/opt/zig" ]; then
     export PATH=$PATH:/opt/zig
 fi
+
+if [ -d "$HOME/.pyenv" ]; then
+    export PYENV_ROOT="$HOME/.pyenv"
+    command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
+    eval "$(pyenv init -)"
+fi
+
+export CARGO_MOMMYS_MOODS="chill/ominous/thirsty/yikes"
diff --git a/zshrc b/zshrc
index 09a07d0..d31c40b 100644
--- a/zshrc
+++ b/zshrc
@@ -140,3 +140,5 @@ alias idot='dot -Tsvg -Gbgcolor="transparent" -Ecolor="#f8f8f2ff" -Efontcolor="#
 if which starship >/dev/null 2>&1; then
     eval "$(starship init zsh)"
 fi
+
+eval "$(~/.rbenv/bin/rbenv init - zsh)"