From 948f7074bac8d7d9319e1284ca099b8624d1e32a Mon Sep 17 00:00:00 2001
From: Noella <49508517+ItsNoellaHere@users.noreply.github.com>
Date: Tue, 30 Dec 2025 13:19:30 -0700
Subject: [PATCH] lazy push before updates

---
 .gitmodules                          |  3 ++
 alacritty/alacritty.toml             | 10 +++---
 alacritty/themes                     |  1 +
 install.sh                           |  3 ++
 nvim-conf                            |  2 +-
 tmux/tmux/plugins/tmux               |  1 +
 tmux/tmux/plugins/tmux-sensible      |  1 +
 tmux/tmux/plugins/tpm                |  1 +
 tmux/tmux/plugins/vim-tmux-navigator |  1 +
 tmux/tmux/tmux.conf                  | 47 ++++++++++++++++++++++++++++
 zsh/.zshenv                          |  6 ++--
 zsh/.zshrc                           |  2 ++
 12 files changed, 70 insertions(+), 8 deletions(-)
 create mode 160000 alacritty/themes
 create mode 160000 tmux/tmux/plugins/tmux
 create mode 160000 tmux/tmux/plugins/tmux-sensible
 create mode 160000 tmux/tmux/plugins/tpm
 create mode 160000 tmux/tmux/plugins/vim-tmux-navigator
 create mode 100644 tmux/tmux/tmux.conf

diff --git a/.gitmodules b/.gitmodules
index f897189..9faa1ab 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "zsh/custom/themes/powerlevel10k"]
 	path = zsh/custom/themes/powerlevel10k
 	url = https://github.com/romkatv/powerlevel10k
+[submodule "alacritty/themes"]
+	path = alacritty/themes
+	url = https://github.com/alacritty/alacritty-theme
diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml
index add6c6b..4a0f7bd 100644
--- a/alacritty/alacritty.toml
+++ b/alacritty/alacritty.toml
@@ -1,4 +1,4 @@
-import = ["~..config/alacritty/themes/themes/tomorrow_night_bright.yaml"]
+import = ["~/.config/alacritty/themes/themes/catppuccin_mocha.toml"]
 
 [colors]
 draw_bold_text_with_bright_colors = false
@@ -13,10 +13,10 @@ blinking = "On"
 shape = "Underline"
 
 [env]
-TERM = "alacritty"
+TERM = "xterm-256color"
 
 [font.normal]
-family = "monospace"
+family = "JetBrainsMono Nerd Font Mono"
 
 [hints]
 alphabet = "jfkdls;ahgurieowpq"
@@ -49,8 +49,8 @@ program = "/bin/zsh"
 decorations = "none"
 dynamic_title = true
 opacity = 0.95
-startup_mode = "Maximized"
-title = "Alacritty"
+# startup_mode = "Maximized"
+# title = "Alacritty"
 
 [window.class]
 general = "Alacritty"
diff --git a/alacritty/themes b/alacritty/themes
new file mode 160000
index 0000000..f82c742
--- /dev/null
+++ b/alacritty/themes
@@ -0,0 +1 @@
+Subproject commit f82c742634b5e840731dd7c609e95231917681a5
diff --git a/install.sh b/install.sh
index a317539..cb33edd 100755
--- a/install.sh
+++ b/install.sh
@@ -41,4 +41,7 @@ nvm install --lts
 nvm use --lts
 nvm alias default lts/*
 
+# Install TPM
+git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+
 env zsh -l
diff --git a/nvim-conf b/nvim-conf
index 6738ab2..3af0422 160000
--- a/nvim-conf
+++ b/nvim-conf
@@ -1 +1 @@
-Subproject commit 6738ab220e03f45085c743295803b942afad30b1
+Subproject commit 3af042279f37a30d002782f0644eebd83555e58d
diff --git a/tmux/tmux/plugins/tmux b/tmux/tmux/plugins/tmux
new file mode 160000
index 0000000..a0119d2
--- /dev/null
+++ b/tmux/tmux/plugins/tmux
@@ -0,0 +1 @@
+Subproject commit a0119d25283ba2b18287447c1f86720a255fb652
diff --git a/tmux/tmux/plugins/tmux-sensible b/tmux/tmux/plugins/tmux-sensible
new file mode 160000
index 0000000..25cb91f
--- /dev/null
+++ b/tmux/tmux/plugins/tmux-sensible
@@ -0,0 +1 @@
+Subproject commit 25cb91f42d020f675bb0a2ce3fbd3a5d96119efa
diff --git a/tmux/tmux/plugins/tpm b/tmux/tmux/plugins/tpm
new file mode 160000
index 0000000..99469c4
--- /dev/null
+++ b/tmux/tmux/plugins/tpm
@@ -0,0 +1 @@
+Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946
diff --git a/tmux/tmux/plugins/vim-tmux-navigator b/tmux/tmux/plugins/vim-tmux-navigator
new file mode 160000
index 0000000..38b1d04
--- /dev/null
+++ b/tmux/tmux/plugins/vim-tmux-navigator
@@ -0,0 +1 @@
+Subproject commit 38b1d0402c4600543281dc85b3f51884205674b6
diff --git a/tmux/tmux/tmux.conf b/tmux/tmux/tmux.conf
new file mode 100644
index 0000000..6aa6fce
--- /dev/null
+++ b/tmux/tmux/tmux.conf
@@ -0,0 +1,47 @@
+# Options
+set-option -a terminal-features 'xterm-256color:RGB'
+set -g mouse on
+
+# Change start index to 1
+set -g base-index 1
+set -g pane-base-index 1
+set-window-option -g pane-base-index 1
+set-option -g renumber-windows on
+
+# Keymap
+bind -n M-H previous-window
+bind -n M-L next-window
+bind '"' split-window -v -c "#{pane_current_path}"
+bind % split-window -h -c "#{pane_current_path}"
+
+# Check the prefix keys
+unbind C-b
+set -g prefix `
+bind ` send-prefix
+
+# List of plugins
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'christoomey/vim-tmux-navigator'
+set -g @plugin 'catppuccin/tmux'
+
+# Catppuccin config
+set -g @catppuccin_flavour 'mocha'
+set -g @catppuccin_window_left_separator ""
+set -g @catppuccin_window_right_separator " "
+set -g @catppuccin_window_middle_separator " "
+set -g @catppuccin_window_number_position "left"
+set -g @catppuccin_window_default_fill "all"
+set -g @catppuccin_window_default_text "#W"
+set -g @catppuccin_window_current_fill "all"
+set -g @catppuccin_window_current_text "#W"
+set -g @catppuccin_status_modules_right "application date_time directory session"
+set -g @catppuccin_status_left_separator  " "
+set -g @catppuccin_status_right_separator ""
+set -g @catppuccin_status_right_separator_inverse "no"
+set -g @catppuccin_status_fill "icon"
+set -g @catppuccin_status_connect_separator "no"
+set -g @catppuccin_directory_text "#{pane_current_path}"
+
+# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+run '~/.tmux/plugins/tpm/tpm'
diff --git a/zsh/.zshenv b/zsh/.zshenv
index fab5397..d241b8d 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -1,6 +1,8 @@
+export XDG_CONFIG_HOME="$HOME/.config"
+export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
+
 export HISTFILE="$ZDOTDIR/.zhistory"
 export HISTSIZE=10000
 export SAVEHIST=10000
 
-export XDG_CONFIG_HOME="$HOME/.config"
-export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
+. "$HOME/.cargo/env"
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 7c60157..95c0db3 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -6,6 +6,8 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
   source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
 fi
 
+export PATH=$PATH:/home/noella/.local/bin
+
 # Path to your oh-my-zsh installation.
 export ZSH="$HOME/.oh-my-zsh"