Merge remote-tracking branch 'refs/remotes/origin/master'

.config/nvim/.options/obsidian.all.lua

@@ -12,7 +12,7 @@ return {
   opts = {
     workspaces = {
       {
-        name = "All",
+        name = "Obsidian",
         path = "~/Obsidian",
       },
     },

.config/tmux/tmux.conf

@@ -1,10 +1,20 @@
 # $XDG_CONFIG_HOME/tmux/tmux.conf
 # ln -sf $DOTFILES/.config/tmux/tmux.conf $XDG_CONFIG_HOME/tmux/tmux.conf
+
 # Prefix
 # -----------------
-set-option -g prefix C-x
+set-option -g prefix C-a
 unbind C-b
-bind C-x send-prefix
+bind C-a send-prefix
+
+# Options
+set-option -g mouse on
+set-option -g default-terminal "screen-256color"
+set-option -g allow-rename on
+set-option -g alternate-screen on
+set-option -g visual-activity on
+set-option -g pane-border-style fg=colour244
+set-option -g pane-activity-border-style fg=colour239
 
 # Index
 # -----------------
@@ -17,7 +27,7 @@ set -g history-limit 4096
 
 # Reload Config
 # -----------------
-bind r source-file ~/.tmux.conf \; display "Reloaded Config"
+bind r source-file ~/.config/tmux/tmux.conf \; display "Reloaded Config"
 
 # Vi Mode
 # -----------------
@@ -34,6 +44,18 @@ bind h select-pane -L
 bind n select-pane -D
 bind e select-pane -U
 bind i select-pane -R
+bind -r H resize-pane -L 5
+bind -r N resize-pane -D 5
+bind -r E resize-pane -U 5
+bind -r I resize-pane -R 5
+bind C-h select-window -t :-
+bind C-l select-window -t :+
+bind ` resize-pane -Z
 
-
+# Status Bar
-
+# -----------------
+set -g status-position top
+set-option -g status-bg black
+set-option -g status-fg white
+set-option -g status-left '#[fg=green][#S] '
+setw -g window-status-current-format '#[fg=colour236,bg=colour39] #I #W '

mac/Microsoft.PowerShell_profile.ps1

@@ -2,12 +2,12 @@
 # ln -sf $DOTFILES/mac/Microsoft.PowerShell_profile.ps1 $XDG_CONFIG_HOME/powershell/Microsoft.PowerShell_profile.ps1
 ### Variables ###
 
-$DOTFILES = "$HOME\.dotfiles"
+$DOTFILES = "$HOME/.dotfiles"
 
 ### Load Configs ###
 
-Get-ChildItem -Path $DOTFILES\powershell -Filter *.ps1 | ForEach-Object {. $_}
+Get-ChildItem -Path $DOTFILES/powershell -Filter *.ps1 | ForEach-Object {. $_}
-Get-ChildItem -Path $DOTFILES\powershell_private -Filter *.ps1 | ForEach-Object {. $_}
+Get-ChildItem -Path $DOTFILES/powershell_private -Filter *.ps1 | ForEach-Object {. $_}
 
 ## Aliases ###
 

setup/mac_setup.sh

@@ -278,3 +278,6 @@ duti -s com.jetbrains.rider .fsproj all
 # Video -> IINA
 duti -s com.colliderli.iina .mp4 all
 duti -s com.colliderli.iina .mkv all
+
+mkdir -p $DOTFILES/powershell_private
+touch $ZDOTDIR/.private.env.sh

zsh/alias.zsh

@@ -1,6 +1,7 @@
 # PowerShell Equivalent #
 alias ni=touch
 alias cls=clear
+alias ii=open
 
 # Dev #
 alias g++='g++ -std=c++2b' # Set the default C++ standard to C++20
@@ -9,10 +10,11 @@ alias cl='clang -std=c99'
 alias clpp='clang++ -std=c++2b'
 alias python=python3 # Set the default Python version to Python 3
 alias py=python # Alias for Python
+alias pip=pip3 # Alias for pip
 alias bashcfg="nvim ~/.bashrc"
 alias zshcfg="nvim ~/.zshrc"
 alias shcfg=zshcfg
-alias reload="source ~/.zshrc"
+alias reload="source $ZDOTDIR/.zshrc"
 alias nvimrc="nvim $XDG_CONFIG_HOME/nvim/"
 alias ohmyzsh="code ~/.oh-my-zsh"
 alias pulldots="cd $DOTFILES && git pull"
@@ -27,6 +29,9 @@ alias pymkenv="conda create --name"
 alias v=nvim
 alias c=code
 
+# lsd #
+alias ls='lsd -a'
+alias l='lsd -lah'
 # Misc #
 alias cf=cfiles
 

zsh/config.zsh

@@ -1,29 +1,22 @@
-### ZSH Config ###
+# ZSH Config #
 export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
-export ZSH="$ZDOTDIR/ohmyzsh"
-ZSH_THEME="avit"
-# DISABLE_MAGIC_FUNCTIONS="true"
-# DISABLE_LS_COLORS="true"
-# DISABLE_AUTO_TITLE="true"
-# ENABLE_CORRECTION="true"
-# Uncomment the following line to display red dots whilst waiting for completion.
-# You can also set it to another string to have that shown instead of the default red dots.
-# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
-# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
-# COMPLETION_WAITING_DOTS="true"
-# Uncomment the following line if you want to disable marking untracked files
-# under VCS as dirty. This makes repository status check for large repositories
-# much, much faster.
-# DISABLE_UNTRACKED_FILES_DIRTY="true"
 HIST_STAMPS="yyyy-mm-dd"
-plugins=(git web-search jsontools z vi-mode zsh-syntax-highlighting zsh-autosuggestions)
+# plugins=(git web-search jsontools z vi-mode zsh-syntax-highlighting zsh-autosuggestions)
-source $ZSH/oh-my-zsh.sh
-source .private.env.sh
 
-# export MANPATH="/usr/local/man:$MANPATH"
+# Plugins (Manually Managed) #
-# export LANG= "en_US.UTF-8"
+# $ZDOTDIR/plugins
 
-# Use XDG Base Directory Specification
+source $ZDOTDIR/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+source $ZDOTDIR/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
+source $ZDOTDIR/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
+
+# Tools Related Environment Variables #
+
+PAGER="less"
+EDITOR="nvim"
+VISUAL="nvim"
+
+# Use XDG Base Directory Specification #
 
 # ~/.azure/ -> $XDG_DATA_HOME/azure/
 export AZURE_CONFIG_DIR="$XDG_DATA_HOME"/azure

zsh/update.sh

@@ -0,0 +1,13 @@
+# $DOTFILES/zsh/update.sh
+
+# This file won't be sourced by zsh by default
+# Use `source` to run this file for updating plugins
+
+# Plugins #
+# Auto `git pull` on $ZDOTDIR/plugins
+for plugin in $ZDOTDIR/plugins/*; do
+  if [ -d "$plugin" ]; then
+    cd $plugin
+    git pull --quiet --no-edit
+  fi
+done