removed hardcoded variables and created setup script

Reviewed-on: Nicholai/nvim#2

.bashrc

@@ -1,664 +0,0 @@
-#!/usr/bin/env bash
-iatest=$(expr index "$-" i)
-cat /home/nicholai/.cache/wal/sequences
-
-# Source global definitions
-if [ -f /etc/bashrc ]; then
-	. /etc/bashrc
-fi
-
-if [ -f /usr/share/bash-completion/bash_completion ]; then
-	. /usr/share/bash-completion/bash_completion
-elif [ -f /etc/bash_completion ]; then
-	. /etc/bash_completion
-fi
-
-#######################################################
-# EXPORTS
-#######################################################
-
-# Disable the bell
-if [[ $iatest -gt 0 ]]; then bind "set bell-style visible"; fi
-
-# Expand the history size
-export HISTFILESIZE=10000
-export HISTSIZE=500
-export HISTTIMEFORMAT="%F %T" # add timestamp to history
-
-# Don't put duplicate lines in the history and do not add lines that start with a space
-export HISTCONTROL=erasedups:ignoredups:ignorespace
-
-# Check the window size after each command and, if necessary, update the values of LINES and COLUMNS
-shopt -s checkwinsize
-
-# Causes bash to append to history instead of overwriting it so if you start a new terminal, you have old session history
-shopt -s histappend
-PROMPT_COMMAND='history -a'
-
-# set up XDG folders
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_STATE_HOME="$HOME/.local/state"
-export XDG_CACHE_HOME="$HOME/.cache"
-
-# Seeing as other scripts will use it might as well export it
-export LINUXTOOLBOXDIR="$HOME/linuxtoolbox"
-
-# Allow ctrl-S for history navigation (with ctrl-R)
-# [[ $- == *i* ]] && stty -ixon
-
-# Ignore case on auto-completion
-# Note: bind used instead of sticking these in .inputrc
-if [[ $iatest -gt 0 ]]; then bind "set completion-ignore-case on"; fi
-
-# Show auto-completion list automatically, without double tab
-if [[ $iatest -gt 0 ]]; then bind "set show-all-if-ambiguous On"; fi
-
-# Set the default editor
-export EDITOR=nvim
-export VISUAL=nvim
-alias spico='sudo pico'
-alias snano='sudo nano'
-alias vim='nvim'
-
-# To have colors for ls and all grep commands such as grep, egrep and zgrep
-export CLICOLOR=1
-export LS_COLORS='no=00:fi=00:di=00;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.ogg=01;35:*.mp3=01;35:*.wav=01;35:*.xml=00;31:'
-#export GREP_OPTIONS='--color=auto' #deprecated
-
-# Color for manpages in less makes manpages a little easier to read
-export LESS_TERMCAP_mb=$'\E[01;31m'
-export LESS_TERMCAP_md=$'\E[01;31m'
-export LESS_TERMCAP_me=$'\E[0m'
-export LESS_TERMCAP_se=$'\E[0m'
-export LESS_TERMCAP_so=$'\E[01;44;33m'
-export LESS_TERMCAP_ue=$'\E[0m'
-export LESS_TERMCAP_us=$'\E[01;32m'
-
- export QT_QPA_PLATFORMTHEME=qt5ct
-
-#######################################################
-# MACHINE SPECIFIC ALIAS'S
-#######################################################
-
-# Alias's for SSH
-alias united-tattoo='ssh root@77.37.63.91'
-
-# Alias's to change the directory
-alias web='cd /var/www/html'
-
-# Alias's to mount ISO files
-# mount -o loop /home/NAMEOFISO.iso /home/ISOMOUNTDIR/
-# umount /home/NAMEOFISO.iso
-# (Both commands done as root only.)
-
-#######################################################
-# GENERAL ALIAS'S
-#######################################################
-# To temporarily bypass an alias, we precede the command with a \
-# EG: the ls command is aliased, but to use the normal ls command you would type \ls
-
-# Add an "alert" alias for long running commands.  Use like so:
-#   sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-
-# Edit this .bashrc file
-alias ebrc='edit ~/.bashrc'
-
-# Show help for this .bashrc file
-alias hlp='less ~/.bashrc_help'
-
-# alias to show the date
-alias da='date "+%Y-%m-%d %A %T %Z"'
-
-# Alias's to modified commands
-alias cp='cp -i'
-alias mv='mv -i'
-alias mkdir='mkdir -p'
-alias ps='ps auxf'
-alias ping='ping -c 10'
-alias less='less -R'
-alias cls='clear'
-alias apt-get='sudo apt-get'
-alias multitail='multitail --no-repeat -c'
-alias freshclam='sudo freshclam'
-alias vi='nvim'
-alias svi='sudo vi'
-alias vis='nvim "+set si"'
-alias yayf="yay -Slq | fzf --multi --preview 'yay -Sii {1}' --preview-window=down:75% | xargs -ro yay -S"
-
-# Change directory aliases
-alias home='cd ~'
-alias cd..='cd ..'
-alias ..='cd ..'
-alias ...='cd ../..'
-alias ....='cd ../../..'
-alias .....='cd ../../../..'
-
-# cd into the old directory
-alias bd='cd "$OLDPWD"'
-
-# Remove a directory and all files
-alias rmd='/bin/rm  --recursive --force --verbose '
-
-# Alias's for multiple directory listing commands
-alias la='ls -Alh'                # show hidden files
-alias ls='ls -aFh --color=always' # add colors and file type extensions
-alias lx='ls -lXBh'               # sort by extension
-alias lk='ls -lSrh'               # sort by size
-alias lc='ls -ltcrh'              # sort by change time
-alias lu='ls -lturh'              # sort by access time
-alias lr='ls -lRh'                # recursive ls
-alias lt='ls -ltrh'               # sort by date
-alias lm='ls -alh |more'          # pipe through 'more'
-alias lw='ls -xAh'                # wide listing format
-alias ll='ls -Fls'                # long listing format
-alias labc='ls -lap'              # alphabetical sort
-alias lf="ls -l | egrep -v '^d'"  # files only
-alias ldir="ls -l | egrep '^d'"   # directories only
-alias lla='ls -Al'                # List and Hidden Files
-alias las='ls -A'                 # Hidden Files
-alias lls='ls -l'                 # List
-
-# alias chmod commands
-alias mx='chmod a+x'
-alias 000='chmod -R 000'
-alias 644='chmod -R 644'
-alias 666='chmod -R 666'
-alias 755='chmod -R 755'
-alias 777='chmod -R 777'
-
-# Search command line history
-alias h="history | grep "
-
-# Search running processes
-alias p="ps aux | grep "
-alias topcpu="/bin/ps -eo pcpu,pid,user,args | sort -k 1 -r | head -10"
-
-# Search files in the current folder
-alias f="find . | grep "
-
-# Count all files (recursively) in the current folder
-alias countfiles="for t in files links directories; do echo \`find . -type \${t:0:1} | wc -l\` \$t; done 2> /dev/null"
-
-# To see if a command is aliased, a file, or a built-in command
-alias checkcommand="type -t"
-
-# Show open ports
-alias openports='netstat -nape --inet'
-
-# Alias's for safe and forced reboots
-alias rebootsafe='sudo shutdown -r now'
-alias rebootforce='sudo shutdown -r -n now'
-
-# Alias's to show disk space and space used in a folder
-alias diskspace="du -S | sort -n -r |more"
-alias folders='du -h --max-depth=1'
-alias folderssort='find . -maxdepth 1 -type d -print0 | xargs -0 du -sk | sort -rn'
-alias tree='tree -CAhF --dirsfirst'
-alias treed='tree -CAFd'
-alias mountedinfo='df -hT'
-
-# Alias's for archives
-alias mktar='tar -cvf'
-alias mkbz2='tar -cvjf'
-alias mkgz='tar -cvzf'
-alias untar='tar -xvf'
-alias unbz2='tar -xvjf'
-alias ungz='tar -xvzf'
-
-# Show all logs in /var/log
-alias logs="sudo find /var/log -type f -exec file {} \; | grep 'text' | cut -d' ' -f1 | sed -e's/:$//g' | grep -v '[0-9]$' | xargs tail -f"
-
-# SHA1
-alias sha1='openssl sha1'
-
-alias clickpaste='sleep 3; xdotool type "$(xclip -o -selection clipboard)"'
-
-# KITTY - alias to be able to use kitty features when connecting to remote servers(e.g use tmux on remote server)
-
-alias kssh="kitty +kitten ssh"
-
-# alias to cleanup unused docker containers, images, networks, and volumes
-
-alias docker-clean=' \
-  docker container prune -f ; \
-  docker image prune -f ; \
-  docker network prune -f ; \
-  docker volume prune -f '
-
-#######################################################
-# SPECIAL FUNCTIONS
-#######################################################
-# Extracts any archive(s) (if unp isn't installed)
-extract() {
-	for archive in "$@"; do
-		if [ -f "$archive" ]; then
-			case $archive in
-			*.tar.bz2) tar xvjf $archive ;;
-			*.tar.gz) tar xvzf $archive ;;
-			*.bz2) bunzip2 $archive ;;
-			*.rar) rar x $archive ;;
-			*.gz) gunzip $archive ;;
-			*.tar) tar xvf $archive ;;
-			*.tbz2) tar xvjf $archive ;;
-			*.tgz) tar xvzf $archive ;;
-			*.zip) unzip $archive ;;
-			*.Z) uncompress $archive ;;
-			*.7z) 7z x $archive ;;
-			*) echo "don't know how to extract '$archive'..." ;;
-			esac
-		else
-			echo "'$archive' is not a valid file!"
-		fi
-	done
-}
-
-# Searches for text in all files in the current folder
-ftext() {
-	# -i case-insensitive
-	# -I ignore binary files
-	# -H causes filename to be printed
-	# -r recursive search
-	# -n causes line number to be printed
-	# optional: -F treat search term as a literal, not a regular expression
-	# optional: -l only print filenames and not the matching lines ex. grep -irl "$1" *
-	grep -iIHrn --color=always "$1" . | less -r
-}
-
-# Copy file with a progress bar
-cpp() {
-    set -e
-    strace -q -ewrite cp -- "${1}" "${2}" 2>&1 |
-    awk '{
-        count += $NF
-        if (count % 10 == 0) {
-            percent = count / total_size * 100
-            printf "%3d%% [", percent
-            for (i=0;i<=percent;i++)
-                printf "="
-            printf ">"
-            for (i=percent;i<100;i++)
-                printf " "
-            printf "]\r"
-        }
-    }
-    END { print "" }' total_size="$(stat -c '%s' "${1}")" count=0
-}
-
-# Copy and go to the directory
-cpg() {
-	if [ -d "$2" ]; then
-		cp "$1" "$2" && cd "$2"
-	else
-		cp "$1" "$2"
-	fi
-}
-
-# Move and go to the directory
-mvg() {
-	if [ -d "$2" ]; then
-		mv "$1" "$2" && cd "$2"
-	else
-		mv "$1" "$2"
-	fi
-}
-
-# Create and go to the directory
-mkdirg() {
-	mkdir -p "$1"
-	cd "$1"
-}
-
-# Goes up a specified number of directories  (i.e. up 4)
-up() {
-	local d=""
-	limit=$1
-	for ((i = 1; i <= limit; i++)); do
-		d=$d/..
-	done
-	d=$(echo $d | sed 's/^\///')
-	if [ -z "$d" ]; then
-		d=..
-	fi
-	cd $d
-}
-
-# Automatically do an ls after each cd, z, or zoxide
-cd ()
-{
-	if [ -n "$1" ]; then
-		builtin cd "$@" && ls
-	else
-		builtin cd ~ && ls
-	fi
-}
-
-# Returns the last 2 fields of the working directory
-pwdtail() {
-	pwd | awk -F/ '{nlast = NF -1;print $nlast"/"$NF}'
-}
-
-# Show the current distribution
-distribution () {
-    local dtype="unknown"  # Default to unknown
-
-    # Use /etc/os-release for modern distro identification
-    if [ -r /etc/os-release ]; then
-        source /etc/os-release
-        case $ID in
-            fedora|rhel|centos)
-                dtype="redhat"
-                ;;
-            sles|opensuse*)
-                dtype="suse"
-                ;;
-            ubuntu|debian)
-                dtype="debian"
-                ;;
-            gentoo)
-                dtype="gentoo"
-                ;;
-            arch|manjaro)
-                dtype="arch"
-                ;;
-            slackware)
-                dtype="slackware"
-                ;;
-            *)
-                # Check ID_LIKE only if dtype is still unknown
-                if [ -n "$ID_LIKE" ]; then
-                    case $ID_LIKE in
-                        *fedora*|*rhel*|*centos*)
-                            dtype="redhat"
-                            ;;
-                        *sles*|*opensuse*)
-                            dtype="suse"
-                            ;;
-                        *ubuntu*|*debian*)
-                            dtype="debian"
-                            ;;
-                        *gentoo*)
-                            dtype="gentoo"
-                            ;;
-                        *arch*)
-                            dtype="arch"
-                            ;;
-                        *slackware*)
-                            dtype="slackware"
-                            ;;
-                    esac
-                fi
-
-                # If ID or ID_LIKE is not recognized, keep dtype as unknown
-                ;;
-        esac
-    fi
-
-    echo $dtype
-}
-
-
-DISTRIBUTION=$(distribution)
-if [ "$DISTRIBUTION" = "redhat" ] || [ "$DISTRIBUTION" = "arch" ]; then
-      alias cat='bat'
-else
-      alias cat='batcat'
-fi 
-
-# Show the current version of the operating system
-ver() {
-    local dtype
-    dtype=$(distribution)
-
-    case $dtype in
-        "redhat")
-            if [ -s /etc/redhat-release ]; then
-                cat /etc/redhat-release
-            else
-                cat /etc/issue
-            fi
-            uname -a
-            ;;
-        "suse")
-            cat /etc/SuSE-release
-            ;;
-        "debian")
-            lsb_release -a
-            ;;
-        "gentoo")
-            cat /etc/gentoo-release
-            ;;
-        "arch")
-            cat /etc/os-release
-            ;;
-        "slackware")
-            cat /etc/slackware-version
-            ;;
-        *)
-            if [ -s /etc/issue ]; then
-                cat /etc/issue
-            else
-                echo "Error: Unknown distribution"
-                exit 1
-            fi
-            ;;
-    esac
-}
-
-# Automatically install the needed support files for this .bashrc file
-install_bashrc_support() {
-	local dtype
-	dtype=$(distribution)
-
-	case $dtype in
-		"redhat")
-			sudo yum install multitail tree zoxide trash-cli fzf bash-completion fastfetch
-			;;
-		"suse")
-			sudo zypper install multitail tree zoxide trash-cli fzf bash-completion fastfetch
-			;;
-		"debian")
-			sudo apt-get install multitail tree zoxide trash-cli fzf bash-completion
-			# Fetch the latest fastfetch release URL for linux-amd64 deb file
-			FASTFETCH_URL=$(curl -s https://api.github.com/repos/fastfetch-cli/fastfetch/releases/latest | grep "browser_download_url.*linux-amd64.deb" | cut -d '"' -f 4)
-
-			# Download the latest fastfetch deb file
-			curl -sL $FASTFETCH_URL -o /tmp/fastfetch_latest_amd64.deb
-
-			# Install the downloaded deb file using apt-get
-			sudo apt-get install /tmp/fastfetch_latest_amd64.deb
-			;;
-		"arch")
-			sudo paru multitail tree zoxide trash-cli fzf bash-completion fastfetch
-			;;
-		"slackware")
-			echo "No install support for Slackware"
-			;;
-		*)
-			echo "Unknown distribution"
-			;;
-	esac
-}
-
-# IP address lookup
-alias whatismyip="whatsmyip"
-function whatsmyip () {
-    # Internal IP Lookup.
-    if command -v ip &> /dev/null; then
-        echo -n "Internal IP: "
-        ip addr show wlan0 | grep "inet " | awk '{print $2}' | cut -d/ -f1
-    else
-        echo -n "Internal IP: "
-        ifconfig wlan0 | grep "inet " | awk '{print $2}'
-    fi
-
-    # External IP Lookup
-    echo -n "External IP: "
-    curl -4 ifconfig.me
-}
-
-# View Apache logs
-apachelog() {
-	if [ -f /etc/httpd/conf/httpd.conf ]; then
-		cd /var/log/httpd && ls -xAh && multitail --no-repeat -c -s 2 /var/log/httpd/*_log
-	else
-		cd /var/log/apache2 && ls -xAh && multitail --no-repeat -c -s 2 /var/log/apache2/*.log
-	fi
-}
-
-# Edit the Apache configuration
-apacheconfig() {
-	if [ -f /etc/httpd/conf/httpd.conf ]; then
-		sedit /etc/httpd/conf/httpd.conf
-	elif [ -f /etc/apache2/apache2.conf ]; then
-		sedit /etc/apache2/apache2.conf
-	else
-		echo "Error: Apache config file could not be found."
-		echo "Searching for possible locations:"
-		sudo updatedb && locate httpd.conf && locate apache2.conf
-	fi
-}
-
-# Edit the PHP configuration file
-phpconfig() {
-	if [ -f /etc/php.ini ]; then
-		sedit /etc/php.ini
-	elif [ -f /etc/php/php.ini ]; then
-		sedit /etc/php/php.ini
-	elif [ -f /etc/php5/php.ini ]; then
-		sedit /etc/php5/php.ini
-	elif [ -f /usr/bin/php5/bin/php.ini ]; then
-		sedit /usr/bin/php5/bin/php.ini
-	elif [ -f /etc/php5/apache2/php.ini ]; then
-		sedit /etc/php5/apache2/php.ini
-	else
-		echo "Error: php.ini file could not be found."
-		echo "Searching for possible locations:"
-		sudo updatedb && locate php.ini
-	fi
-}
-
-# Edit the MySQL configuration file
-mysqlconfig() {
-	if [ -f /etc/my.cnf ]; then
-		sedit /etc/my.cnf
-	elif [ -f /etc/mysql/my.cnf ]; then
-		sedit /etc/mysql/my.cnf
-	elif [ -f /usr/local/etc/my.cnf ]; then
-		sedit /usr/local/etc/my.cnf
-	elif [ -f /usr/bin/mysql/my.cnf ]; then
-		sedit /usr/bin/mysql/my.cnf
-	elif [ -f ~/my.cnf ]; then
-		sedit ~/my.cnf
-	elif [ -f ~/.my.cnf ]; then
-		sedit ~/.my.cnf
-	else
-		echo "Error: my.cnf file could not be found."
-		echo "Searching for possible locations:"
-		sudo updatedb && locate my.cnf
-	fi
-}
-
-
-# Trim leading and trailing spaces (for scripts)
-trim() {
-	local var=$*
-	var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters
-	var="${var%"${var##*[![:space:]]}"}" # remove trailing whitespace characters
-	echo -n "$var"
-}
-# GitHub Titus Additions
-
-gcom() {
-	git add .
-	git commit -m "$1"
-}
-lazyg() {
-	git add .
-	git commit -m "$1"
-	git push
-}
-
-function hb {
-    if [ $# -eq 0 ]; then
-        echo "No file path specified."
-        return
-    elif [ ! -f "$1" ]; then
-        echo "File path does not exist."
-        return
-    fi
-
-    uri="http://bin.christitus.com/documents"
-    response=$(curl -s -X POST -d @"$1" "$uri")
-    if [ $? -eq 0 ]; then
-        hasteKey=$(echo $response | jq -r '.key')
-        echo "http://bin.christitus.com/$hasteKey"
-    else
-        echo "Failed to upload the document."
-    fi
-}
-
-#######################################################
-# Set the ultimate amazing command prompt
-#######################################################
-
-alias hug="systemctl --user restart hugo"
-alias lanm="systemctl --user restart lan-mouse"
-
-# Check if the shell is interactive
-if [[ $- == *i* ]]; then
-    # Bind Ctrl+f to insert 'zi' followed by a newline
-    bind '"\C-f":"zi\n"'
-fi
-
-export PATH=$PATH:"$HOME/.local/bin:$HOME/.cargo/bin:/var/lib/flatpak/exports/bin:/.local/share/flatpak/exports/bin"
-
-eval "$(starship init bash)"
-eval "$(zoxide init bash)"
-
-if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
-
-exec startx
-
-fi
-
-
-
-
-eval "$(starship init bash)"
-
-# . "$HOME/.local/share/../bin/env"  # Commented out - file doesn't exist
-
-# Added by LM Studio CLI (lms)
-export PATH="$PATH:/home/nicholai/.lmstudio/bin"
-# End of LM Studio CLI section
-
-
-# Git shortcuts
-alias gs='git status'
-alias ga='git add'
-alias gc='git commit -m'
-alias gp='git push'
-alias gl='git log --oneline'
-
-# Colorize man pages
-export LESS_TERMCAP_mb=$'\e[1;32m'
-export LESS_TERMCAP_md=$'\e[1;32m'
-export LESS_TERMCAP_me=$'\e[0m'
-export LESS_TERMCAP_se=$'\e[0m'
-export LESS_TERMCAP_so=$'\e[01;33m'
-export LESS_TERMCAP_ue=$'\e[0m'
-export LESS_TERMCAP_us=$'\e[1;4;31m'
-
-alias ff='fastfetch'
-alias nuke='sudo bash /home/nicholai/Documents/obsidian-vault/02_Areas/Nuke-monitoring/scripts/nuke_isolated.sh'
-alias note='cd /mnt/work/dev/personal-projects/nicholai-work-2026 && pnpm notepad'
-alias comfy='cd /home/nicholai/ComfyUI && source .venv/bin/activate && python main.py'
-alias scripts='nvim .nuke/'
-
-# opencode
-export PATH=/home/nicholai/.opencode/bin:$PATH
-
-# OpenRouter API Key for oh-my-opencode
-export OPENROUTER_API_KEY="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"

.gitignore

@@ -1,2 +1,4 @@
-CLAUDE.md 
 lazy-lock.json
+tmp/
+config.json
+config.json.backup.*

.tmux.conf

@@ -1,34 +0,0 @@
-set -g default-terminal "tmux-256color"
-set-option -g status-position top
-#keybinds 
-unbind r 
-bind r source-file ~/.tmux.conf \; display "reloaded-config"
-unbind C-b
-set -g prefix C-w
-#preferences
-set -g mouse on
-set-option -g status-position top
-set -g base-index 1 
-set -g pane-base-index 1
-set -g repeat-time 1000
-set -g history-limit 10000 
-#window status 
-set -g window-status-format " #I "
-set -g window-status-current-format " #I " 
-set -g window-status-bell-style "bg=red,nobold"
-set -g window-status-current-style \
-    "#{?window_zoomed_flag,bg=yellow,bg=magenta,nobold}"
-#pane separators
-set -g pane-border-lines simple
-# vim keybinds for navigation
-bind-key h select-pane -L 
-bind-key j select-pane -D 
-bind-key k select-pane -U 
-bind-key l select-pane -R 
-#plugins
-set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-sensible'
-#catpuccin theme
-run ~/.config/tmux/plugins/catppuccin/catppuccin.tmux
-run '~/.tmux/plugins/tpm/tpm'
-

README.md

@@ -1,26 +1,45 @@
-# Neovim Configuration
+Neovim Configuration
+===
 
-Modular Neovim setup for TypeScript/JavaScript development.
+Modular Neovim setup.
 
-## Installation
+Installation
+---
 
 ```bash
 # Clone to config directory
 git clone <repo-url> ~/.config/nvim
-
-# Symlink dotfiles (optional)
+# Run setup script (installs opencode, symlinks dotfiles, adds shell aliases)
 ./setup.sh
-
 # Launch Neovim - plugins install automatically
 nvim
 ```
 
-## Features
+New Features
+--- 
 
-- LSP with TypeScript/JavaScript support
-- Autocompletion and snippets
-- Telescope fuzzy finder
-- Treesitter syntax highlighting
-- Format-on-save with Prettier
+- AI-powered code generation via ThePrimeagen's agent plugin
+    - `fill_in_function`: generates function bodies from context
+    - visual mode: modify selected code with AI
+    - `stop_all_requests`: cancel pending AI operations
+    - supports SKILL.md and AGENT.md for custom rules
 
-Leader key: `<Space>`
+Features
+---
+
+This configuration provides LSP integration for TypeScript and
+JavaScript with intelligent code navigation, autocompletion powered by
+nvim-cmp with snippet expansion, and Telescope for fast fuzzy finding
+across files, buffers, and content. Syntax highlighting uses Treesitter
+for semantic understanding, and Prettier handles auto-formatting on
+save.
+
+AI-powered development is available through ThePrimeagen's agent plugin.
+Use `fill_in_function` to generate function implementations from
+context, or select code in visual mode and transform it with natural
+language prompts. Cancel pending operations with `stop_all_requests`.
+Custom behavior can be defined via SKILL.md and AGENT.md files.
+
+Navigation uses `<Space>` as the leader key for all custom keybindings.
+Fugitive handles git operations, Lualine provides status information,
+and Neo-tree offers visual file management.

config.example.json

@@ -0,0 +1,23 @@
+{
+    "paths": {
+        "obsidianVault": "~/Documents/obsidian-vault/",
+        "srcDirectory": "~/.local/src/",
+        "scriptsDirectory": "~/scripts/",
+        "wallpaperScript": "~/scripts/pywal/wallpapermenu.sh"
+    },
+    "editor": {
+        "tabSize": 4,
+        "scrollOffset": 8,
+        "theme": "wave"
+    },
+    "ai": {
+        "model": "claude-sonnet-4-5",
+        "openCodeModel": "anthropic/claude-sonnet-4-5"
+    },
+    "lsp": {
+        "servers": ["ts_ls", "eslint", "jsonls", "html", "cssls", "tailwindcss"]
+    },
+    "treesitter": {
+        "languages": ["lua", "vim", "bash", "javascript", "typescript", "tsx", "json", "yaml", "html", "css"]
+    }
+}

docs/neovim-cheatsheet.md

@@ -117,6 +117,40 @@
 - `Tab` - Next completion item
 - `Shift+Tab` - Previous completion item
 
+### Commenting (Comment.nvim)
+- `gcc` - Toggle comment on line
+- `gc{motion}` - Toggle comment with motion (e.g., `gc3j` comments 3 lines down)
+- `gbc` - Toggle block comment
+- Visual mode: `gc` - Comment selection
+
+### Surround (nvim-surround)
+- `ys{motion}{char}` - Add surround (e.g., `ysiw"` surrounds word with quotes)
+- `ds{char}` - Delete surround (e.g., `ds"` removes quotes)
+- `cs{old}{new}` - Change surround (e.g., `cs"'` changes `"` to `'`)
+- Visual mode: `S{char}` - Surround selection
+
+### Harpoon (quick file switching)
+- `Space+ha` - Add current file to harpoon
+- `Space+hh` - Open harpoon menu
+- `Space+1/2/3/4` - Jump to harpoon file 1-4
+
+### Flash (supercharged motions)
+- `s` - Flash jump (type chars to jump to)
+- `S` - Flash treesitter select
+
+### Diagnostics (Trouble)
+- `Space+xx` - Toggle diagnostics panel
+- `Space+xX` - Buffer diagnostics only
+- `Space+xl` - Location list
+- `Space+xq` - Quickfix list
+
+### Theme Switcher
+- `Space+th` - Open theme picker (pywal, kanagawa variants, or pick new wallpaper)
+
+### Utilities
+- `Space+u` - Toggle undo tree
+- `Space+ft` - Find TODOs in project
+
 ## Useful Tips
 - **Repeat actions**: Number before command (e.g., `5dd` deletes 5 lines)
 - **Combine motions**: `d3w` deletes 3 words, `y2j` yanks 2 lines down
@@ -150,4 +184,4 @@
 - System clipboard integration: Just yank normally with `y` - it copies to system clipboard! (You have `clipboard=unnamedplus` set)
 
 ---
-*Last updated: November 2025*
+*Last updated: February 2026*

dotfiles/.tmux.conf

@@ -0,0 +1,40 @@
+
+# Terminal settings
+set -g default-terminal "tmux-256color"
+set-option -g status-position top
+
+# Keybinds
+unbind r
+bind r source-file ~/.tmux.conf \; display "reloaded-config"
+unbind C-b
+set -g prefix C-w
+
+# Preferences
+set -g mouse on
+set -g base-index 1
+set -g pane-base-index 1
+set -g repeat-time 1000
+set -g history-limit 10000
+
+# Window status
+set -g window-status-format " #I "
+set -g window-status-current-format " #I "
+set -g window-status-bell-style "bg=red,nobold"
+set -g window-status-current-style "#{?window_zoomed_flag,bg=yellow,bg=magenta,nobold}"
+
+# Pane separators
+set -g pane-border-lines simple
+
+# Vim keybinds for navigation
+bind-key h select-pane -L
+bind-key j select-pane -D
+bind-key k select-pane -U
+bind-key l select-pane -R
+
+# Plugins
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+
+# Catppuccin theme
+run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux
+run '~/.tmux/plugins/tpm/tpm'

dotfiles/starship.toml

@@ -1,7 +1,7 @@
 # Catppuccin Mocha theme to match nvim
 format = """
-[┌─](bold blue)$directory$git_branch$git_status
-[└─](bold blue)$character"""
+[╭─](bold blue)$directory$git_branch$git_status
+[╰─](bold blue)$character"""
 
 [character]
 success_symbol = "[➜](bold green)"

lazy-lock.json

@@ -1,47 +1,40 @@
 {
+  "99": { "branch": "master", "commit": "0fb3b8b2d032289ea7088a37161e1c50bdfccfa9" },
+  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
   "LuaSnip": { "branch": "master", "commit": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c" },
   "alpha-nvim": { "branch": "main", "commit": "3979b01cb05734331c7873049001d3f2bb8477f4" },
-  "auto-session": { "branch": "main", "commit": "292492ab7af4bd8b9e37e28508bc8ce995722fd5" },
-  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" },
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
   "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
   "conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" },
-  "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
+  "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
   "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
-  "gitsigns.nvim": { "branch": "main", "commit": "abf82a65f185bd54adc0679f74b7d6e1ada690c9" },
-  "hererocks": { "branch": "master", "commit": "3856f1b4fb69a9f683f1eb146a4cd49a67478419" },
+  "gitsigns.nvim": { "branch": "main", "commit": "1ce96a464fdbc24208e24c117e2021794259005d" },
+  "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
+  "kanagawa": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
   "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
-  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "4823a251e7578a835bb979c37df390fca692ba39" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "ae609525ddf01c153c39305730b1791800ffe4fe" },
   "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
-  "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
-  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
   "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" },
-  "nvim-colorizer.lua": { "branch": "master", "commit": "81e676d3203c9eb6e4c0ccf1eba1679296ef923f" },
-  "nvim-dap": { "branch": "master", "commit": "085386b9359ddf8d76ad89b98973b8e332dc5ba3" },
-  "nvim-dap-python": { "branch": "master", "commit": "1808458eba2b18f178f990e01376941a42c7f93b" },
-  "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
-  "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" },
-  "nvim-lspconfig": { "branch": "master", "commit": "419b082102fa813739588dd82e19a8b6b2442855" },
-  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
-  "nvim-tree.lua": { "branch": "master", "commit": "5757bcf0447d22d8f78826bc5c59b28da2824c3b" },
-  "nvim-treesitter": { "branch": "main", "commit": "88f1dfc211c3a2fb47f1451fd5edc972ec697e58" },
-  "nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "338409dd8a6ed74767bad3eb5269f1b903ffb3cf" },
+  "nvim-lspconfig": { "branch": "master", "commit": "0480b120318ec8bab27b530ffab6ee76a8c4d806" },
+  "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" },
+  "nvim-tree.lua": { "branch": "master", "commit": "037d89e60fb01a6c11a48a19540253b8c72a3c32" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" },
+  "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "rest.nvim": { "branch": "main", "commit": "714d5512aaec5565d55652480c16c26f8d95645d" },
+  "pywal": { "branch": "main", "commit": "d11b673c0e3d6eb8cbee7ea8cf4a8911f6ee24b9" },
+  "render-markdown.nvim": { "branch": "main", "commit": "48b4175dbca8439d30c1f52231cbe5a712c8f9d9" },
   "telescope.nvim": { "branch": "master", "commit": "ad7d9580338354ccc136e5b8f0aa4f880434dcdc" },
-  "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
+  "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
+  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
   "typescript-tools.nvim": { "branch": "master", "commit": "c2f5910074103705661e9651aa841e0d7eea9932" },
-  "vim-dadbod": { "branch": "master", "commit": "6d1d41da4873a445c5605f2005ad2c68c99d8770" },
-  "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "48c4f271da13d380592f4907e2d1d5558044e4e5" },
-  "vscode-js-debug": { "branch": "main", "commit": "4330850d72ee5816914a3188d2a6771854e1c61f" },
+  "undotree": { "branch": "master", "commit": "fc28931fbfba66ab75d9af23fe46ffbbb9de6e8c" },
   "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
 }

lua/core/config.lua

@@ -0,0 +1,156 @@
+-- Config loader module
+-- Loads user configuration from config.json with defaults and validation
+
+local M = {}
+
+-- Default configuration values
+M.defaults = {
+    paths = {
+        obsidianVault = "~/Documents/obsidian-vault/",
+        srcDirectory = "~/.local/src/",
+        scriptsDirectory = "~/scripts/",
+        wallpaperScript = "~/scripts/pywal/wallpapermenu.sh",
+    },
+    editor = {
+        tabSize = 4,
+        scrollOffset = 8,
+        theme = "wave",
+    },
+    ai = {
+        model = "claude-sonnet-4-5",
+        openCodeModel = "anthropic/claude-sonnet-4-5",
+    },
+    lsp = {
+        servers = { "ts_ls", "eslint", "jsonls", "html", "cssls", "tailwindcss" },
+    },
+    treesitter = {
+        languages = { "lua", "vim", "bash", "javascript", "typescript", "tsx", "json", "yaml", "html", "css" },
+    },
+}
+
+-- Cache for loaded config
+local config_cache = nil
+
+-- Deep merge two tables (b overrides a)
+local function deep_merge(a, b)
+    local result = vim.deepcopy(a)
+    for k, v in pairs(b) do
+        if type(v) == "table" and type(result[k]) == "table" then
+            result[k] = deep_merge(result[k], v)
+        else
+            result[k] = v
+        end
+    end
+    return result
+end
+
+-- Expand ~ to home directory in paths
+local function expand_path(path)
+    if type(path) ~= "string" then
+        return path
+    end
+    return path:gsub("^~", vim.fn.expand("$HOME"))
+end
+
+-- Recursively expand paths in a table
+local function expand_paths(tbl)
+    -- Check if this is an array (sequential numeric keys)
+    if #tbl > 0 then
+        local result = {}
+        for i, v in ipairs(tbl) do
+            result[i] = v
+        end
+        return result
+    end
+
+    local result = {}
+    for k, v in pairs(tbl) do
+        if type(v) == "table" then
+            result[k] = expand_paths(v)
+        elseif type(v) == "string" and type(k) == "string" and (k:lower():match("path") or k:lower():match("vault") or k:lower():match("directory") or k:lower():match("script")) then
+            result[k] = expand_path(v)
+        else
+            result[k] = v
+        end
+    end
+    return result
+end
+
+-- Load configuration from config.json
+function M.load()
+    if config_cache then
+        return config_cache
+    end
+
+    local config_path = vim.fn.stdpath("config") .. "/config.json"
+    local user_config = {}
+
+    -- Check if config file exists
+    if vim.fn.filereadable(config_path) == 1 then
+        local file = io.open(config_path, "r")
+        if file then
+            local content = file:read("*a")
+            file:close()
+
+            -- Try to parse JSON
+            local ok, parsed = pcall(vim.json.decode, content)
+            if ok and type(parsed) == "table" then
+                user_config = parsed
+            else
+                vim.notify("config.json: Parse error, using defaults", vim.log.levels.WARN)
+            end
+        end
+    end
+
+    -- Merge defaults with user config
+    local merged = deep_merge(M.defaults, user_config)
+
+    -- Expand paths
+    config_cache = expand_paths(merged)
+
+    return config_cache
+end
+
+-- Get a config value by dot-notation path (e.g., "paths.obsidianVault")
+function M.get(path)
+    local config = M.load()
+    local keys = vim.split(path, ".", { plain = true })
+    local value = config
+
+    for _, key in ipairs(keys) do
+        if type(value) ~= "table" then
+            return nil
+        end
+        value = value[key]
+    end
+
+    return value
+end
+
+-- Convenience getters for common sections
+function M.paths()
+    return M.load().paths
+end
+
+function M.editor()
+    return M.load().editor
+end
+
+function M.ai()
+    return M.load().ai
+end
+
+function M.lsp()
+    return M.load().lsp
+end
+
+function M.treesitter()
+    return M.load().treesitter
+end
+
+-- Reset cache (useful for testing or config reload)
+function M.reset()
+    config_cache = nil
+end
+
+return M

lua/core/keymaps.lua

@@ -8,7 +8,6 @@ keymap('n', '<leader>e', ':NvimTreeToggle<CR>', { desc = "Toggle file explorer"
 keymap('n', '<leader>ff', '<cmd>Telescope find_files<cr>', { desc = "Find files" })
 keymap('n', '<leader>fg', '<cmd>Telescope live_grep<cr>', { desc = "Live grep" })
 keymap('n', '<leader>fb', '<cmd>Telescope buffers<cr>', { desc = "Find buffers" })
-keymap('n', '<leader>fr', '<cmd>Telescope oldfiles<cr>', { desc = "Recent files" })
 
 -- Git (Telescope pickers)
 keymap('n', '<leader>gt', '<cmd>Telescope git_status<cr>', { desc = "Git status" })
@@ -25,70 +24,3 @@ keymap('n', '<C-l>', '<C-w>l')
 -- Quick save and quit
 keymap('n', '<leader>w', ':w<CR>', { desc = "Save" })
 keymap('n', '<leader>q', ':q<CR>', { desc = "Quit" })
-
--- Buffer navigation (native)
-keymap('n', '<leader>1', '<cmd>buffer 1<CR>', { desc = "Go to buffer 1" })
-keymap('n', '<leader>2', '<cmd>buffer 2<CR>', { desc = "Go to buffer 2" })
-keymap('n', '<leader>3', '<cmd>buffer 3<CR>', { desc = "Go to buffer 3" })
-keymap('n', '<leader>4', '<cmd>buffer 4<CR>', { desc = "Go to buffer 4" })
-keymap('n', '<leader>5', '<cmd>buffer 5<CR>', { desc = "Go to buffer 5" })
-keymap('n', '<leader>bd', '<cmd>bdelete<CR>', { desc = "Delete buffer" })
-keymap('n', '<leader>bo', '<cmd>%bd|e#|bd#<CR>', { desc = "Close other buffers" })
-keymap('n', '<S-l>', '<cmd>bnext<CR>', { desc = "Next buffer" })
-keymap('n', '<S-h>', '<cmd>bprevious<CR>', { desc = "Previous buffer" })
-
--- Terminal (toggleterm)
-keymap('n', '<leader>tf', '<cmd>ToggleTerm direction=float<CR>', { desc = "Float terminal" })
-keymap('n', '<leader>th', '<cmd>ToggleTerm direction=horizontal<CR>', { desc = "Horizontal terminal" })
-keymap('n', '<leader>tv', '<cmd>ToggleTerm direction=vertical<CR>', { desc = "Vertical terminal" })
-keymap('n', '<leader>tt', '<cmd>ToggleTerm<CR>', { desc = "Toggle terminal" })
-keymap('n', '<leader>tg', '<cmd>lua _LAZYGIT_TOGGLE()<CR>', { desc = "Lazygit" })
-keymap('n', '<leader>tp', '<cmd>lua _PYTHON_TOGGLE()<CR>', { desc = "Python REPL" })
-keymap('n', '<leader>tn', '<cmd>lua _NODE_TOGGLE()<CR>', { desc = "Node REPL" })
-
--- Terminal mode escape
-keymap('t', '<Esc>', [[<C-\><C-n>]], { desc = "Exit terminal mode" })
-keymap('t', '<C-h>', [[<Cmd>wincmd h<CR>]], { desc = "Window left" })
-keymap('t', '<C-j>', [[<Cmd>wincmd j<CR>]], { desc = "Window down" })
-keymap('t', '<C-k>', [[<Cmd>wincmd k<CR>]], { desc = "Window up" })
-keymap('t', '<C-l>', [[<Cmd>wincmd l<CR>]], { desc = "Window right" })
-
--- Session management
-keymap('n', '<leader>ss', '<cmd>SessionSave<CR>', { desc = "Save session" })
-keymap('n', '<leader>sr', '<cmd>SessionRestore<CR>', { desc = "Restore session" })
-keymap('n', '<leader>sd', '<cmd>SessionDelete<CR>', { desc = "Delete session" })
-
--- DAP (debugging)
-keymap('n', '<leader>db', '<cmd>lua require("dap").toggle_breakpoint()<CR>', { desc = "Toggle breakpoint" })
-keymap('n', '<leader>dB', '<cmd>lua require("dap").set_breakpoint(vim.fn.input("Condition: "))<CR>', { desc = "Conditional breakpoint" })
-keymap('n', '<leader>dc', '<cmd>lua require("dap").continue()<CR>', { desc = "Continue" })
-keymap('n', '<leader>di', '<cmd>lua require("dap").step_into()<CR>', { desc = "Step into" })
-keymap('n', '<leader>do', '<cmd>lua require("dap").step_over()<CR>', { desc = "Step over" })
-keymap('n', '<leader>dO', '<cmd>lua require("dap").step_out()<CR>', { desc = "Step out" })
-keymap('n', '<leader>dr', '<cmd>lua require("dap").repl.toggle()<CR>', { desc = "Toggle REPL" })
-keymap('n', '<leader>dl', '<cmd>lua require("dap").run_last()<CR>', { desc = "Run last" })
-keymap('n', '<leader>du', '<cmd>lua require("dapui").toggle()<CR>', { desc = "Toggle DAP UI" })
-keymap('n', '<leader>dt', '<cmd>lua require("dap").terminate()<CR>', { desc = "Terminate" })
-keymap('n', '<F5>', '<cmd>lua require("dap").continue()<CR>', { desc = "Debug: Continue" })
-keymap('n', '<F10>', '<cmd>lua require("dap").step_over()<CR>', { desc = "Debug: Step Over" })
-keymap('n', '<F11>', '<cmd>lua require("dap").step_into()<CR>', { desc = "Debug: Step Into" })
-keymap('n', '<F12>', '<cmd>lua require("dap").step_out()<CR>', { desc = "Debug: Step Out" })
-
--- Noice (notifications)
-keymap('n', '<leader>nl', '<cmd>Noice last<CR>', { desc = "Last notification" })
-keymap('n', '<leader>nh', '<cmd>Noice history<CR>', { desc = "Notification history" })
-keymap('n', '<leader>na', '<cmd>Noice all<CR>', { desc = "All notifications" })
-keymap('n', '<leader>nd', '<cmd>Noice dismiss<CR>', { desc = "Dismiss notifications" })
-
--- Markdown preview
-keymap('n', '<leader>mp', '<cmd>MarkdownPreviewToggle<CR>', { desc = "Toggle markdown preview" })
-
--- Database
-keymap('n', '<leader>Du', '<cmd>DBUIToggle<CR>', { desc = "Toggle DBUI" })
-keymap('n', '<leader>Df', '<cmd>DBUIFindBuffer<CR>', { desc = "Find DB buffer" })
-keymap('n', '<leader>Da', '<cmd>DBUIAddConnection<CR>', { desc = "Add DB connection" })
-
--- HTTP client
-keymap('n', '<leader>hr', '<cmd>lua require("rest-nvim").run()<CR>', { desc = "Run HTTP request" })
-keymap('n', '<leader>hp', '<cmd>lua require("rest-nvim").run(true)<CR>', { desc = "Preview HTTP request" })
-keymap('n', '<leader>hl', '<cmd>lua require("rest-nvim").last()<CR>', { desc = "Re-run last request" })

lua/core/options.lua

@@ -1,4 +1,7 @@
 -- Basic Settings
+local config = require("core.config")
+local editor = config.editor()
+
 vim.opt.number = true
 vim.opt.relativenumber = true
 vim.opt.mouse = 'a'
@@ -6,13 +9,15 @@ vim.opt.ignorecase = true
 vim.opt.smartcase = true
 vim.opt.hlsearch = false
 vim.opt.wrap = false
-vim.opt.tabstop = 4
-vim.opt.shiftwidth = 4
+vim.opt.tabstop = editor.tabSize
+vim.opt.shiftwidth = editor.tabSize
 vim.opt.expandtab = true
 vim.opt.termguicolors = true
 vim.opt.cursorline = true
 vim.opt.signcolumn = 'yes'
 vim.opt.clipboard = "unnamedplus"
+vim.opt.scrolloff = editor.scrollOffset
+vim.opt.sidescrolloff = editor.scrollOffset
 
 -- Leader key
 vim.g.mapleader = ' '

lua/plugins/ai.lua

@@ -0,0 +1,98 @@
+local config = require("core.config")
+local ai = config.ai()
+
+return {
+    -- AI agent (99)
+    {
+        "ThePrimeagen/99",
+        config = function()
+            local _99 = require("99")
+            local Providers = require("99.providers")
+            local cwd = vim.uv.cwd()
+            local basename = vim.fs.basename(cwd)
+
+            -- custom provider with --attach flag for tool use
+            local CustomOpenCodeProvider = setmetatable({}, {
+                __index = Providers.OpenCodeProvider
+            })
+
+            function CustomOpenCodeProvider._build_command(_, query, request)
+                return {
+                    "opencode", "run",
+                    "--attach", "http://localhost:4096",
+                    "-m", request.context.model,
+                    query
+                }
+            end
+
+            _99.setup({
+                -- Auto-detect provider: OpenCode with server if available, else Claude Code
+                provider = (function()
+                    -- Check if opencode is installed
+                    local opencode_installed = vim.fn.executable("opencode") == 1
+                    if not opencode_installed then
+                        return Providers.ClaudeCodeProvider
+                    end
+
+                    -- Check if opencode serve is running on port 4096
+                    local handle = io.popen("curl -s -o /dev/null -w '%{http_code}' http://localhost:4096/health 2>/dev/null || echo '000'")
+                    local result = handle:read("*a")
+                    handle:close()
+
+                    -- If server is responding (any 2xx or 404), use CustomOpenCodeProvider
+                    if result:match("^[24]%d%d") then
+                        return Providers.CustomOpenCodeProvider
+                    end
+
+                    -- Fallback to Claude Code
+                    return Providers.ClaudeCodeProvider
+                end)(),
+                model = (function()
+                    -- Use appropriate model format based on provider
+                    local opencode_installed = vim.fn.executable("opencode") == 1
+                    if opencode_installed then
+                        local handle = io.popen("curl -s -o /dev/null -w '%{http_code}' http://localhost:4096/health 2>/dev/null || echo '000'")
+                        local result = handle:read("*a")
+                        handle:close()
+                        if result:match("^[24]%d%d") then
+                            return ai.openCodeModel
+                        end
+                    end
+                    return ai.model
+                end)(),
+
+                logger = {
+                    level = _99.DEBUG,
+                    path = "/tmp/" .. basename .. ".99.debug",
+                    print_on_error = true,
+                },
+
+               completion = {
+                    -- custom_rules = { "~/.config/nvim/rules/" },
+                    source = "cmp",
+                },
+
+                md_files = {
+                    "AGENT.md",
+                    "CLAUDE.md",
+                },
+            })
+
+            vim.keymap.set("n", "<leader>9f", function()
+                _99.fill_in_function()
+            end, { desc = "99: Fill function" })
+
+            vim.keymap.set("v", "<leader>9v", function()
+                _99.visual()
+            end, { desc = "99: Visual AI" })
+
+            vim.keymap.set("v", "<leader>9p", function()
+            _99.visual_prompt()
+            end, { desc = "99: Visual with prompt" })
+
+            vim.keymap.set("v", "<leader>9s", function()
+                _99.stop_all_requests()
+            end, { desc = "99: Stop requests" })
+        end,
+    },
+}

lua/plugins/colorscheme.lua

@@ -0,0 +1,127 @@
+local config = require("core.config")
+local editor = config.editor()
+local paths = config.paths()
+
+return {
+    -- Kanagawa colorscheme
+    {
+        "rebelot/kanagawa.nvim",
+        name = "kanagawa",
+        lazy = false,
+        priority = 1000,
+        config = function()
+            require('kanagawa').setup({
+                compile = true,
+                undercurl = true,
+                commentStyle = { italic = true },
+                functionStyle = {},
+                keywordStyle = { italic = true },
+                statementStyle = { bold = true },
+                typeStyle = {},
+                transparent = false,
+                dimInactive = false,
+                terminalColors = true,
+                colors = {
+                    palette = {},
+                    theme = { wave = {}, lotus = {}, dragon = {}, all = {} },
+                },
+                overrides = function(colors)
+                    return {}
+                end,
+                theme = editor.theme,
+                background = {
+                    dark = editor.theme,
+                    light = "lotus"
+                },
+            })
+            -- only set kanagawa if pywal colors don't exist
+            if vim.fn.filereadable(vim.fn.expand("~/.cache/wal/colors")) == 0 then
+                vim.cmd("colorscheme kanagawa")
+            end
+        end,
+    },
+
+    -- Pywal colorscheme (syncs with terminal)
+    {
+        "AlphaTechnolog/pywal.nvim",
+        name = "pywal",
+        lazy = false,
+        priority = 1000,
+        config = function()
+            -- auto-load pywal if colors exist
+            if vim.fn.filereadable(vim.fn.expand("~/.cache/wal/colors")) == 1 then
+                vim.cmd("colorscheme pywal")
+            end
+        end,
+    },
+
+    -- Theme switcher
+    {
+        "nvim-telescope/telescope.nvim",
+        keys = {
+            {
+                "<leader>th",
+                function()
+                    local pickers = require("telescope.pickers")
+                    local finders = require("telescope.finders")
+                    local conf = require("telescope.config").values
+                    local actions = require("telescope.actions")
+                    local action_state = require("telescope.actions.state")
+
+                    local themes = {
+                        { name = "pywal (from wallpaper)", value = "pywal" },
+                        { name = "Pick new wallpaper...", value = "_wallpaper_picker" },
+                        { name = "kanagawa", value = "kanagawa" },
+                        { name = "kanagawa-wave", value = "kanagawa-wave" },
+                        { name = "kanagawa-dragon", value = "kanagawa-dragon" },
+                        { name = "kanagawa-lotus", value = "kanagawa-lotus" },
+                    }
+
+                    pickers.new({}, {
+                        prompt_title = "Theme Switcher",
+                        finder = finders.new_table({
+                            results = themes,
+                            entry_maker = function(entry)
+                                return {
+                                    value = entry.value,
+                                    display = entry.name,
+                                    ordinal = entry.name,
+                                }
+                            end,
+                        }),
+                        sorter = conf.generic_sorter({}),
+                        attach_mappings = function(prompt_bufnr, map)
+                            actions.select_default:replace(function()
+                                actions.close(prompt_bufnr)
+                                local selection = action_state.get_selected_entry()
+                                if selection.value == "_wallpaper_picker" then
+                                    -- launch wallpaper picker, then reload pywal
+                                    vim.fn.jobstart(
+                                        { "bash", "-c", paths.wallpaperScript .. " && sleep 1" },
+                                        {
+                                            on_exit = function()
+                                                vim.schedule(function()
+                                                    vim.cmd("colorscheme pywal")
+                                                    require("lualine").setup({ options = { theme = "pywal" } })
+                                                    vim.notify("Pywal theme applied", vim.log.levels.INFO)
+                                                end)
+                                            end,
+                                        }
+                                    )
+                                else
+                                    vim.cmd("colorscheme " .. selection.value)
+                                    -- update lualine theme
+                                    local lualine_theme = selection.value:match("^kanagawa") and "kanagawa" or selection.value
+                                    require("lualine").setup({ options = { theme = lualine_theme } })
+                                    vim.notify("Theme: " .. selection.value, vim.log.levels.INFO)
+                                end
+                            end)
+                            return true
+                        end,
+                    }):find()
+                end,
+                desc = "Theme switcher",
+            },
+        },
+    },
+}

lua/plugins/completion.lua

@@ -0,0 +1,35 @@
+return {
+    -- Autocompletion
+    {
+        "hrsh7th/nvim-cmp",
+        dependencies = {
+            "hrsh7th/cmp-buffer",
+            "hrsh7th/cmp-path",
+            "hrsh7th/cmp-nvim-lsp",
+            "L3MON4D3/LuaSnip",
+            "saadparwaiz1/cmp_luasnip",
+            "rafamadriz/friendly-snippets",
+        },
+        config = function()
+            local cmp = require("cmp")
+            local luasnip = require("luasnip")
+            require("luasnip.loaders.from_vscode").lazy_load()
+
+            cmp.setup({
+                snippet = { expand = function(args) luasnip.lsp_expand(args.body) end },
+                mapping = cmp.mapping.preset.insert({
+                    ["<C-Space>"] = cmp.mapping.complete(),
+                    ["<CR>"] = cmp.mapping.confirm({ select = true }),
+                    ["<Tab>"] = cmp.mapping.select_next_item(),
+                    ["<S-Tab>"] = cmp.mapping.select_prev_item(),
+                }),
+                sources = {
+                    { name = "nvim_lsp" },
+                    { name = "path" },
+                    { name = "buffer" },
+                    { name = "luasnip" },
+                },
+            })
+        end,
+    },
+}

lua/plugins/editor.lua

@@ -0,0 +1,48 @@
+return {
+    -- Commenting
+    {
+        "numToStr/Comment.nvim",
+        event = { "BufReadPre", "BufNewFile" },
+        opts = {},
+    },
+
+    -- Surround text objects
+    {
+        "kylechui/nvim-surround",
+        version = "*",
+        event = "VeryLazy",
+        opts = {},
+    },
+
+    -- Flash motions
+    {
+        "folke/flash.nvim",
+        event = "VeryLazy",
+        opts = {},
+        keys = {
+            { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
+            { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
+        },
+    },
+
+    -- Auto-pairs
+    {
+        "windwp/nvim-autopairs",
+        event = "InsertEnter",
+        opts = {
+            check_ts = true,
+            ts_config = {
+                lua = { "string", "source" },
+                javascript = { "string", "template_string" },
+                typescript = { "string", "template_string" },
+            },
+            disable_filetype = { "TelescopePrompt", "spectre_panel" },
+        },
+        config = function(_, opts)
+            require("nvim-autopairs").setup(opts)
+            local cmp_autopairs = require("nvim-autopairs.completion.cmp")
+            local cmp = require("cmp")
+            cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
+        end,
+    },
+}

lua/plugins/git.lua

@@ -0,0 +1,42 @@
+return {
+    -- Git signs
+    {
+        "lewis6991/gitsigns.nvim",
+        event = { "BufReadPre", "BufNewFile" },
+        config = function()
+            require("gitsigns").setup({
+                on_attach = function(bufnr)
+                    local gs = package.loaded.gitsigns
+                    local map = function(mode, l, r, opts)
+                        opts = opts or {}
+                        opts.buffer = bufnr
+                        vim.keymap.set(mode, l, r, opts)
+                    end
+                    -- Navigation
+                    map("n", "]c", function() gs.next_hunk() end, { desc = "Next hunk" })
+                    map("n", "[c", function() gs.prev_hunk() end, { desc = "Previous hunk" })
+                    -- Actions
+                    map("n", "<leader>gs", gs.stage_hunk, { desc = "Stage hunk" })
+                    map("n", "<leader>gr", gs.reset_hunk, { desc = "Reset hunk" })
+                    map("n", "<leader>gS", gs.stage_buffer, { desc = "Stage buffer" })
+                    map("n", "<leader>gu", gs.undo_stage_hunk, { desc = "Undo stage" })
+                    map("n", "<leader>gp", gs.preview_hunk, { desc = "Preview hunk" })
+                    map("n", "<leader>gb", function() gs.blame_line({ full = true }) end, { desc = "Blame line" })
+                    map("n", "<leader>gd", gs.diffthis, { desc = "Diff this" })
+                end,
+            })
+        end,
+    },
+
+    -- Diff view
+    {
+        "sindrets/diffview.nvim",
+        cmd = { "DiffviewOpen", "DiffviewFileHistory" },
+        keys = {
+            { "<leader>gv", "<cmd>DiffviewOpen<cr>", desc = "Diff view" },
+            { "<leader>gh", "<cmd>DiffviewFileHistory %<cr>", desc = "File history" },
+            { "<leader>gx", "<cmd>DiffviewClose<cr>", desc = "Close diff" },
+        },
+        config = true,
+    },
+}

lua/plugins/lsp.lua

@@ -0,0 +1,47 @@
+local config = require("core.config")
+
+return {
+    -- Mason (LSP installer)
+    {
+        "williamboman/mason.nvim",
+        build = ":MasonUpdate",
+        config = true,
+    },
+
+    -- Mason LSP config bridge
+    {
+        "williamboman/mason-lspconfig.nvim",
+        dependencies = { "williamboman/mason.nvim" },
+        config = function()
+            require("mason-lspconfig").setup({
+                ensure_installed = config.get("lsp.servers"),
+            })
+        end,
+    },
+
+    -- LSP config
+    {
+        "neovim/nvim-lspconfig",
+        dependencies = {
+            "williamboman/mason.nvim",
+            "williamboman/mason-lspconfig.nvim",
+            "hrsh7th/cmp-nvim-lsp",
+        },
+    },
+
+    -- TypeScript tools
+    {
+        "pmizio/typescript-tools.nvim",
+        dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" },
+        config = function()
+            require("typescript-tools").setup({
+                settings = {
+                    tsserver_file_preferences = {
+                        includeInlayParameterNameHints = "all",
+                        includeCompletionsForModuleExports = true
+                    },
+                },
+            })
+        end,
+    },
+}

lua/plugins/navigation.lua

@@ -0,0 +1,28 @@
+return {
+    -- Quick file navigation
+    {
+        "ThePrimeagen/harpoon",
+        branch = "harpoon2",
+        dependencies = { "nvim-lua/plenary.nvim" },
+        config = function()
+            local harpoon = require("harpoon")
+            harpoon:setup()
+
+            vim.keymap.set("n", "<leader>ha", function() harpoon:list():add() end, { desc = "Harpoon add" })
+            vim.keymap.set("n", "<leader>hh", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end, { desc = "Harpoon menu" })
+            vim.keymap.set("n", "<leader>1", function() harpoon:list():select(1) end, { desc = "Harpoon 1" })
+            vim.keymap.set("n", "<leader>2", function() harpoon:list():select(2) end, { desc = "Harpoon 2" })
+            vim.keymap.set("n", "<leader>3", function() harpoon:list():select(3) end, { desc = "Harpoon 3" })
+            vim.keymap.set("n", "<leader>4", function() harpoon:list():select(4) end, { desc = "Harpoon 4" })
+        end,
+    },
+
+    -- File explorer
+    {
+        "nvim-tree/nvim-tree.lua",
+        dependencies = { "nvim-tree/nvim-web-devicons" },
+        config = function()
+            require("nvim-tree").setup()
+        end,
+    },
+}

lua/plugins/notes.lua

@@ -0,0 +1,99 @@
+local config = require("core.config")
+
+return {
+    -- Obsidian integration
+    {
+        "epwalsh/obsidian.nvim",
+        version = "*",
+        lazy = true,
+        ft = "markdown",
+        dependencies = {
+            "nvim-lua/plenary.nvim",
+            "nvim-telescope/telescope.nvim",
+            "hrsh7th/nvim-cmp",
+        },
+        opts = {
+            workspaces = {
+                {
+                    name = "vault",
+                    path = config.get("paths.obsidianVault"),
+                },
+            },
+            completion = {
+                nvim_cmp = true,
+                min_chars = 2,
+            },
+            mappings = {
+                ["gf"] = {
+                    action = function()
+                        return require("obsidian").util.gf_passthrough()
+                    end,
+                    opts = { noremap = false, expr = true, buffer = true },
+                },
+                ["<leader>oc"] = {
+                    action = function()
+                        return require("obsidian").util.toggle_checkbox()
+                    end,
+                    opts = { buffer = true, desc = "Toggle checkbox" },
+                },
+            },
+            new_notes_location = "current_dir",
+            wiki_link_func = function(opts)
+                return string.format("[[%s]]", opts.path)
+            end,
+            note_id_func = function(title)
+                -- use title as-is for note IDs (no date prefix)
+                if title ~= nil then
+                    return title:gsub(" ", "-"):gsub("[^A-Za-z0-9-]", ""):lower()
+                else
+                    return tostring(os.time())
+                end
+            end,
+            ui = {
+                enable = false, -- using render-markdown instead
+            },
+        },
+        keys = {
+            { "<leader>oo", "<cmd>ObsidianQuickSwitch<cr>", desc = "Obsidian: Quick switch" },
+            { "<leader>on", "<cmd>ObsidianNew<cr>", desc = "Obsidian: New note" },
+            { "<leader>os", "<cmd>ObsidianSearch<cr>", desc = "Obsidian: Search" },
+            { "<leader>ob", "<cmd>ObsidianBacklinks<cr>", desc = "Obsidian: Backlinks" },
+            { "<leader>ot", "<cmd>ObsidianTags<cr>", desc = "Obsidian: Tags" },
+            { "<leader>od", "<cmd>ObsidianToday<cr>", desc = "Obsidian: Daily note" },
+            { "<leader>ol", "<cmd>ObsidianLink<cr>", mode = "v", desc = "Obsidian: Link selection" },
+        },
+    },
+
+    -- Render markdown in buffer
+    {
+        "MeanderingProgrammer/render-markdown.nvim",
+        dependencies = {
+            "nvim-treesitter/nvim-treesitter",
+            "nvim-tree/nvim-web-devicons",
+        },
+        ft = { "markdown", "Avante" },
+        opts = {
+            heading = {
+                enabled = false,
+            },
+            code = {
+                enabled = true,
+                style = "normal",
+                border = "thin",
+            },
+            bullet = {
+                enabled = true,
+                icons = { "•", "◦", "▪", "▫" },
+            },
+            checkbox = {
+                enabled = true,
+                unchecked = { icon = "☐ " },
+                checked = { icon = "☑ " },
+            },
+            quote = { enabled = true },
+            pipe_table = { enabled = true },
+            link = { enabled = true },
+            sign = { enabled = false },
+        },
+    },
+}

lua/plugins/plugin.lua

@@ -1,861 +0,0 @@
-return {
-    -- Color scheme (Catppuccin Mocha)
-    {
-        "catppuccin/nvim",
-        name = "catppuccin",
-        priority = 1000,
-        config = function()
-            require("catppuccin").setup({
-                flavour = "mocha",
-                background = {
-                    light = "latte",
-                    dark = "mocha",
-                },
-                transparent_background = false,
-                show_end_of_buffer = false,
-                term_colors = true,
-                dim_inactive = {
-                    enabled = false,
-                    shade = "dark",
-                    percentage = 0.15,
-                },
-                styles = {
-                    comments = { "italic" },
-                    conditionals = { "italic" },
-                    loops = {},
-                    functions = {},
-                    keywords = { "italic" },
-                    strings = {},
-                    variables = {},
-                    numbers = {},
-                    booleans = {},
-                    properties = {},
-                    types = {},
-                    operators = {},
-                },
-                integrations = {
-                    cmp = true,
-                    gitsigns = true,
-                    nvimtree = true,
-                    telescope = { enabled = true },
-                    treesitter = true,
-                    which_key = true,
-                    alpha = true,
-                    mason = true,
-                    noice = true,
-                    notify = true,
-                    dap = true,
-                    dap_ui = true,
-                    native_lsp = {
-                        enabled = true,
-                        underlines = {
-                            errors = { "undercurl" },
-                            hints = { "undercurl" },
-                            warnings = { "undercurl" },
-                            information = { "undercurl" },
-                        },
-                    },
-                },
-            })
-            vim.cmd.colorscheme("catppuccin")
-        end,
-    },
-
-    -- File explorer
-    {
-        "nvim-tree/nvim-tree.lua",
-        dependencies = { "nvim-tree/nvim-web-devicons" },
-        config = function()
-            require("nvim-tree").setup()
-        end,
-    },
-
-    -- Toggleterm (integrated terminal)
-    {
-        "akinsho/toggleterm.nvim",
-        version = "*",
-        config = function()
-            require("toggleterm").setup({
-                size = function(term)
-                    if term.direction == "horizontal" then
-                        return 15
-                    elseif term.direction == "vertical" then
-                        return vim.o.columns * 0.4
-                    end
-                end,
-                open_mapping = [[<C-\>]],
-                hide_numbers = true,
-                shade_terminals = true,
-                shading_factor = 2,
-                start_in_insert = true,
-                insert_mappings = true,
-                terminal_mappings = true,
-                persist_size = true,
-                persist_mode = true,
-                direction = "float",
-                close_on_exit = true,
-                shell = vim.o.shell,
-                auto_scroll = true,
-                float_opts = {
-                    border = "curved",
-                    winblend = 0,
-                },
-            })
-
-            local Terminal = require("toggleterm.terminal").Terminal
-
-            -- Lazygit terminal
-            local lazygit = Terminal:new({
-                cmd = "lazygit",
-                dir = "git_dir",
-                direction = "float",
-                float_opts = { border = "double" },
-                on_open = function(term)
-                    vim.cmd("startinsert!")
-                end,
-            })
-
-            function _G._LAZYGIT_TOGGLE()
-                lazygit:toggle()
-            end
-
-            -- Python REPL
-            local python = Terminal:new({
-                cmd = "python3",
-                direction = "horizontal",
-            })
-
-            function _G._PYTHON_TOGGLE()
-                python:toggle()
-            end
-
-            -- Node REPL
-            local node = Terminal:new({
-                cmd = "node",
-                direction = "horizontal",
-            })
-
-            function _G._NODE_TOGGLE()
-                node:toggle()
-            end
-        end,
-    },
-
-    -- Session management
-    {
-        "rmagatti/auto-session",
-        config = function()
-            require("auto-session").setup({
-                log_level = "error",
-                auto_session_suppress_dirs = { "~/", "~/Projects", "~/Downloads", "/" },
-                auto_session_use_git_branch = true,
-                auto_save_enabled = true,
-                auto_restore_enabled = true,
-                auto_session_root_dir = vim.fn.stdpath("data") .. "/sessions/",
-            })
-        end,
-    },
-
-    -- Notifications
-    {
-        "rcarriga/nvim-notify",
-        config = function()
-            require("notify").setup({
-                background_colour = "#000000",
-                fps = 60,
-                render = "default",
-                stages = "fade_in_slide_out",
-                timeout = 3000,
-                top_down = true,
-            })
-            vim.notify = require("notify")
-        end,
-    },
-
-    -- Noice (enhanced UI)
-    {
-        "folke/noice.nvim",
-        event = "VeryLazy",
-        dependencies = {
-            "MunifTanjim/nui.nvim",
-            "rcarriga/nvim-notify",
-        },
-        config = function()
-            require("noice").setup({
-                lsp = {
-                    override = {
-                        ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
-                        ["vim.lsp.util.stylize_markdown"] = true,
-                        ["cmp.entry.get_documentation"] = true,
-                    },
-                    hover = { enabled = true },
-                    signature = { enabled = true },
-                },
-                presets = {
-                    bottom_search = true,
-                    command_palette = true,
-                    long_message_to_split = true,
-                    inc_rename = false,
-                    lsp_doc_border = true,
-                },
-                views = {
-                    cmdline_popup = {
-                        position = { row = 5, col = "50%" },
-                        size = { width = 60, height = "auto" },
-                    },
-                },
-                routes = {
-                    {
-                        filter = { event = "msg_show", kind = "", find = "written" },
-                        opts = { skip = true },
-                    },
-                },
-            })
-        end,
-    },
-
-    -- Git signs
-    {
-        "lewis6991/gitsigns.nvim",
-        event = { "BufReadPre", "BufNewFile" },
-        config = function()
-            require("gitsigns").setup({
-                on_attach = function(bufnr)
-                    local gs = package.loaded.gitsigns
-                    local map = function(mode, l, r, opts)
-                        opts = opts or {}
-                        opts.buffer = bufnr
-                        vim.keymap.set(mode, l, r, opts)
-                    end
-                    -- Navigation
-                    map("n", "]c", function() gs.next_hunk() end, { desc = "Next hunk" })
-                    map("n", "[c", function() gs.prev_hunk() end, { desc = "Previous hunk" })
-                    -- Actions
-                    map("n", "<leader>gs", gs.stage_hunk, { desc = "Stage hunk" })
-                    map("n", "<leader>gr", gs.reset_hunk, { desc = "Reset hunk" })
-                    map("n", "<leader>gS", gs.stage_buffer, { desc = "Stage buffer" })
-                    map("n", "<leader>gu", gs.undo_stage_hunk, { desc = "Undo stage" })
-                    map("n", "<leader>gp", gs.preview_hunk, { desc = "Preview hunk" })
-                    map("n", "<leader>gb", function() gs.blame_line({ full = true }) end, { desc = "Blame line" })
-                    map("n", "<leader>gd", gs.diffthis, { desc = "Diff this" })
-                end,
-            })
-        end,
-    },
-
-    -- Diff view
-    {
-        "sindrets/diffview.nvim",
-        cmd = { "DiffviewOpen", "DiffviewFileHistory" },
-        keys = {
-            { "<leader>gv", "<cmd>DiffviewOpen<cr>", desc = "Diff view" },
-            { "<leader>gh", "<cmd>DiffviewFileHistory %<cr>", desc = "File history" },
-            { "<leader>gx", "<cmd>DiffviewClose<cr>", desc = "Close diff" },
-        },
-        config = true,
-    },
-
-    -- Fuzzy finder
-    {
-        "nvim-telescope/telescope.nvim",
-        dependencies = { "nvim-lua/plenary.nvim" },
-        config = function()
-            require("telescope").setup()
-        end,
-    },
-
-    -- Formatter
-    {
-        "stevearc/conform.nvim",
-        opts = {
-            format_on_save = { timeout_ms = 1000, lsp_fallback = true },
-            formatters_by_ft = {
-                -- Web
-                javascript = { "prettierd", "prettier" },
-                javascriptreact = { "prettierd", "prettier" },
-                typescript = { "prettierd", "prettier" },
-                typescriptreact = { "prettierd", "prettier" },
-                json = { "prettierd", "prettier" },
-                css = { "prettierd", "prettier" },
-                html = { "prettierd", "prettier" },
-                markdown = { "prettierd", "prettier" },
-                -- Rust
-                rust = { "rustfmt" },
-                -- Python
-                python = { "ruff_format" },
-                -- C/C++
-                c = { "clang_format" },
-                cpp = { "clang_format" },
-                -- Lua
-                lua = { "stylua" },
-            },
-        },
-    },
-
-    -- Syntax highlighting
-    {
-        "nvim-treesitter/nvim-treesitter",
-        build = ":TSUpdate",
-        config = function()
-            -- Install parsers
-            local ensure_installed = {
-                "lua", "vim", "vimdoc", "bash",
-                "javascript", "typescript", "tsx", "json", "yaml", "html", "css", "graphql",
-                "rust", "toml",
-                "python",
-                "c", "cpp",
-                "markdown", "markdown_inline",
-                "sql",
-            }
-
-            -- Auto-install missing parsers
-            vim.api.nvim_create_autocmd("FileType", {
-                callback = function()
-                    local ft = vim.bo.filetype
-                    local lang = vim.treesitter.language.get_lang(ft) or ft
-                    if vim.tbl_contains(ensure_installed, lang) then
-                        pcall(vim.treesitter.start)
-                    end
-                end,
-            })
-
-            -- Enable treesitter highlighting globally
-            vim.treesitter.start = vim.treesitter.start or function() end
-
-            -- Run TSUpdate to ensure parsers are installed
-            vim.defer_fn(function()
-                for _, lang in ipairs(ensure_installed) do
-                    pcall(function()
-                        if not pcall(vim.treesitter.language.inspect, lang) then
-                            vim.cmd("TSInstall " .. lang)
-                        end
-                    end)
-                end
-            end, 100)
-        end,
-    },
-
-    -- Autocompletion
-    {
-        "hrsh7th/nvim-cmp",
-        dependencies = {
-            "hrsh7th/cmp-buffer",
-            "hrsh7th/cmp-path",
-            "hrsh7th/cmp-nvim-lsp",
-            "L3MON4D3/LuaSnip",
-            "saadparwaiz1/cmp_luasnip",
-            "rafamadriz/friendly-snippets",
-        },
-        config = function()
-            local cmp = require("cmp")
-            local luasnip = require("luasnip")
-            require("luasnip.loaders.from_vscode").lazy_load()
-
-            cmp.setup({
-                snippet = { expand = function(args) luasnip.lsp_expand(args.body) end },
-                mapping = cmp.mapping.preset.insert({
-                    ["<C-Space>"] = cmp.mapping.complete(),
-                    ["<CR>"] = cmp.mapping.confirm({ select = true }),
-                    ["<C-n>"] = cmp.mapping.select_next_item(),
-                    ["<C-p>"] = cmp.mapping.select_prev_item(),
-                }),
-                sources = {
-                    { name = "nvim_lsp" },
-                    { name = "path" },
-                    { name = "buffer" },
-                    { name = "luasnip" },
-                    { name = "crates" },
-                },
-            })
-
-            -- SQL files completion
-            vim.api.nvim_create_autocmd("FileType", {
-                pattern = { "sql", "mysql", "plsql" },
-                callback = function()
-                    cmp.setup.buffer({
-                        sources = {
-                            { name = "vim-dadbod-completion" },
-                            { name = "buffer" },
-                        },
-                    })
-                end,
-            })
-        end,
-    },
-
-    -- LSP
-    {
-        "williamboman/mason.nvim",
-        build = ":MasonUpdate",
-        config = true,
-    },
-    {
-        "williamboman/mason-lspconfig.nvim",
-        dependencies = { "williamboman/mason.nvim" },
-        config = function()
-            require("mason-lspconfig").setup({
-                ensure_installed = {
-                    -- Web
-                    "ts_ls", "eslint", "jsonls", "html", "cssls", "tailwindcss",
-                    -- Rust
-                    "rust_analyzer",
-                    -- Python
-                    "pyright", "ruff",
-                    -- C/C++
-                    "clangd",
-                },
-                automatic_installation = true,
-            })
-        end,
-    },
-    {
-        "neovim/nvim-lspconfig",
-        dependencies = {
-            "williamboman/mason.nvim",
-            "williamboman/mason-lspconfig.nvim",
-            "hrsh7th/cmp-nvim-lsp",
-        },
-        config = function()
-            local capabilities = require("cmp_nvim_lsp").default_capabilities()
-
-            -- LSP keymaps on attach
-            vim.api.nvim_create_autocmd("LspAttach", {
-                callback = function(args)
-                    local opts = { buffer = args.buf, silent = true }
-                    vim.keymap.set("n", "gD", vim.lsp.buf.declaration, opts)
-                    vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts)
-                    vim.keymap.set("n", "K", vim.lsp.buf.hover, opts)
-                    vim.keymap.set("n", "gi", vim.lsp.buf.implementation, opts)
-                    vim.keymap.set("n", "<C-k>", vim.lsp.buf.signature_help, opts)
-                    vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, opts)
-                    vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, opts)
-                    vim.keymap.set("n", "gr", vim.lsp.buf.references, opts)
-                    vim.keymap.set("n", "<leader>lf", function()
-                        vim.lsp.buf.format({ async = true })
-                    end, opts)
-                end,
-            })
-
-            -- Rust
-            vim.lsp.config("rust_analyzer", {
-                capabilities = capabilities,
-                settings = {
-                    ["rust-analyzer"] = {
-                        cargo = { allFeatures = true },
-                        checkOnSave = { command = "clippy" },
-                        inlayHints = {
-                            bindingModeHints = { enable = true },
-                            chainingHints = { enable = true },
-                            closingBraceHints = { enable = true },
-                            closureReturnTypeHints = { enable = "always" },
-                            lifetimeElisionHints = { enable = "always" },
-                            parameterHints = { enable = true },
-                            typeHints = { enable = true },
-                        },
-                    },
-                },
-            })
-
-            -- Python (Pyright)
-            vim.lsp.config("pyright", {
-                capabilities = capabilities,
-                settings = {
-                    python = {
-                        analysis = {
-                            autoSearchPaths = true,
-                            diagnosticMode = "workspace",
-                            useLibraryCodeForTypes = true,
-                            typeCheckingMode = "basic",
-                        },
-                    },
-                },
-            })
-
-            -- Python (Ruff for linting)
-            vim.lsp.config("ruff", {
-                capabilities = capabilities,
-                on_attach = function(client, bufnr)
-                    client.server_capabilities.hoverProvider = false
-                end,
-            })
-
-            -- C/C++
-            vim.lsp.config("clangd", {
-                capabilities = capabilities,
-                cmd = {
-                    "clangd",
-                    "--background-index",
-                    "--clang-tidy",
-                    "--header-insertion=iwyu",
-                    "--completion-style=detailed",
-                    "--function-arg-placeholders",
-                },
-            })
-
-            -- JSON
-            vim.lsp.config("jsonls", { capabilities = capabilities })
-
-            -- HTML
-            vim.lsp.config("html", { capabilities = capabilities })
-
-            -- CSS
-            vim.lsp.config("cssls", { capabilities = capabilities })
-
-            -- Tailwind
-            vim.lsp.config("tailwindcss", { capabilities = capabilities })
-
-            -- ESLint
-            vim.lsp.config("eslint", { capabilities = capabilities })
-
-            -- Enable all configured servers
-            vim.lsp.enable({
-                "rust_analyzer",
-                "pyright",
-                "ruff",
-                "clangd",
-                "jsonls",
-                "html",
-                "cssls",
-                "tailwindcss",
-                "eslint",
-            })
-        end,
-    },
-    {
-        "pmizio/typescript-tools.nvim",
-        dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" },
-        config = function()
-            require("typescript-tools").setup({
-                settings = {
-                    tsserver_file_preferences = {
-                        includeInlayParameterNameHints = "all",
-                        includeCompletionsForModuleExports = true
-                    },
-                },
-            })
-        end,
-    },
-
-    -- Crates.nvim (Rust Cargo.toml)
-    {
-        "saecki/crates.nvim",
-        event = { "BufRead Cargo.toml" },
-        dependencies = { "nvim-lua/plenary.nvim" },
-        config = function()
-            require("crates").setup({
-                smart_insert = true,
-                insert_closing_quote = true,
-                autoload = true,
-                autoupdate = true,
-                loading_indicator = true,
-                popup = {
-                    autofocus = false,
-                    hide_on_select = false,
-                    copy_register = '"',
-                    style = "minimal",
-                    border = "rounded",
-                    show_version_date = true,
-                    max_height = 30,
-                    min_width = 20,
-                },
-                completion = {
-                    cmp = { enabled = true },
-                },
-            })
-
-            -- Crates keymaps
-            vim.api.nvim_create_autocmd("BufRead", {
-                pattern = "Cargo.toml",
-                callback = function()
-                    local crates = require("crates")
-                    vim.keymap.set("n", "<leader>ct", crates.toggle, { buffer = true, desc = "Toggle crates" })
-                    vim.keymap.set("n", "<leader>cr", crates.reload, { buffer = true, desc = "Reload crates" })
-                    vim.keymap.set("n", "<leader>cv", crates.show_versions_popup, { buffer = true, desc = "Show versions" })
-                    vim.keymap.set("n", "<leader>cf", crates.show_features_popup, { buffer = true, desc = "Show features" })
-                    vim.keymap.set("n", "<leader>cd", crates.show_dependencies_popup, { buffer = true, desc = "Show dependencies" })
-                    vim.keymap.set("n", "<leader>cu", crates.update_crate, { buffer = true, desc = "Update crate" })
-                    vim.keymap.set("n", "<leader>cU", crates.upgrade_crate, { buffer = true, desc = "Upgrade crate" })
-                end,
-            })
-        end,
-    },
-
-    -- DAP (debugging)
-    {
-        "mfussenegger/nvim-dap",
-        dependencies = {
-            "rcarriga/nvim-dap-ui",
-            "nvim-neotest/nvim-nio",
-            "theHamsta/nvim-dap-virtual-text",
-        },
-        config = function()
-            local dap = require("dap")
-            local dapui = require("dapui")
-
-            dapui.setup({
-                icons = { expanded = "", collapsed = "", current_frame = "" },
-                mappings = {
-                    expand = { "<CR>", "<2-LeftMouse>" },
-                    open = "o",
-                    remove = "d",
-                    edit = "e",
-                    repl = "r",
-                    toggle = "t",
-                },
-                layouts = {
-                    {
-                        elements = {
-                            { id = "scopes", size = 0.25 },
-                            "breakpoints",
-                            "stacks",
-                            "watches",
-                        },
-                        size = 40,
-                        position = "left",
-                    },
-                    {
-                        elements = { "repl", "console" },
-                        size = 0.25,
-                        position = "bottom",
-                    },
-                },
-            })
-
-            require("nvim-dap-virtual-text").setup({
-                enabled = true,
-                enabled_commands = true,
-                highlight_changed_variables = true,
-                highlight_new_as_changed = false,
-                show_stop_reason = true,
-                commented = false,
-            })
-
-            dap.listeners.after.event_initialized["dapui_config"] = function()
-                dapui.open()
-            end
-            dap.listeners.before.event_terminated["dapui_config"] = function()
-                dapui.close()
-            end
-            dap.listeners.before.event_exited["dapui_config"] = function()
-                dapui.close()
-            end
-
-            vim.fn.sign_define("DapBreakpoint", { text = "", texthl = "DiagnosticSignError" })
-            vim.fn.sign_define("DapBreakpointCondition", { text = "", texthl = "DiagnosticSignWarn" })
-            vim.fn.sign_define("DapLogPoint", { text = "", texthl = "DiagnosticSignInfo" })
-            vim.fn.sign_define("DapStopped", { text = "", texthl = "DiagnosticSignHint", linehl = "Visual" })
-            vim.fn.sign_define("DapBreakpointRejected", { text = "", texthl = "DiagnosticSignError" })
-        end,
-    },
-
-    -- Python DAP
-    {
-        "mfussenegger/nvim-dap-python",
-        dependencies = { "mfussenegger/nvim-dap" },
-        ft = "python",
-        config = function()
-            require("dap-python").setup("python3")
-        end,
-    },
-
-    -- JS/TS DAP
-    {
-        "mxsdev/nvim-dap-vscode-js",
-        dependencies = {
-            "mfussenegger/nvim-dap",
-            {
-                "microsoft/vscode-js-debug",
-                build = "npm install --legacy-peer-deps && npx gulp vsDebugServerBundle && mv dist out",
-            },
-        },
-        config = function()
-            require("dap-vscode-js").setup({
-                debugger_path = vim.fn.stdpath("data") .. "/lazy/vscode-js-debug",
-                adapters = { "pwa-node", "pwa-chrome", "pwa-msedge", "node-terminal", "pwa-extensionHost" },
-            })
-
-            for _, language in ipairs({ "typescript", "javascript", "typescriptreact", "javascriptreact" }) do
-                require("dap").configurations[language] = {
-                    {
-                        type = "pwa-node",
-                        request = "launch",
-                        name = "Launch file",
-                        program = "${file}",
-                        cwd = "${workspaceFolder}",
-                    },
-                    {
-                        type = "pwa-node",
-                        request = "attach",
-                        name = "Attach",
-                        processId = require("dap.utils").pick_process,
-                        cwd = "${workspaceFolder}",
-                    },
-                    {
-                        type = "pwa-chrome",
-                        request = "launch",
-                        name = "Launch Chrome",
-                        url = "http://localhost:3000",
-                        webRoot = "${workspaceFolder}",
-                    },
-                }
-            end
-        end,
-    },
-
-    -- Markdown preview
-    {
-        "iamcco/markdown-preview.nvim",
-        cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
-        ft = { "markdown" },
-        build = function() vim.fn["mkdp#util#install"]() end,
-        config = function()
-            vim.g.mkdp_auto_start = 0
-            vim.g.mkdp_auto_close = 1
-            vim.g.mkdp_refresh_slow = 0
-            vim.g.mkdp_browser = ""
-            vim.g.mkdp_preview_options = {
-                mkit = {},
-                katex = {},
-                uml = {},
-                maid = {},
-                disable_sync_scroll = 0,
-                sync_scroll_type = "middle",
-                hide_yaml_meta = 1,
-            }
-        end,
-    },
-
-    -- Database client
-    {
-        "tpope/vim-dadbod",
-        cmd = { "DB", "DBUI", "DBUIToggle", "DBUIAddConnection" },
-    },
-    {
-        "kristijanhusak/vim-dadbod-ui",
-        dependencies = {
-            { "tpope/vim-dadbod", lazy = true },
-            { "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true },
-        },
-        cmd = { "DBUI", "DBUIToggle", "DBUIAddConnection", "DBUIFindBuffer" },
-        init = function()
-            vim.g.db_ui_use_nerd_fonts = 1
-            vim.g.db_ui_save_location = vim.fn.stdpath("data") .. "/db_ui"
-        end,
-    },
-
-    -- HTTP client
-    {
-        "rest-nvim/rest.nvim",
-        dependencies = { "nvim-lua/plenary.nvim" },
-        ft = "http",
-        config = function()
-            require("rest-nvim").setup({
-                result_split_horizontal = false,
-                result_split_in_place = false,
-                skip_ssl_verification = false,
-                encode_url = true,
-                highlight = {
-                    enabled = true,
-                    timeout = 150,
-                },
-                result = {
-                    show_url = true,
-                    show_curl_command = false,
-                    show_http_info = true,
-                    show_headers = true,
-                    formatters = {
-                        json = "jq",
-                    },
-                },
-                jump_to_request = false,
-                env_file = ".env",
-                yank_dry_run = true,
-            })
-        end,
-    },
-
-    -- Colorizer
-    {
-        "NvChad/nvim-colorizer.lua",
-        opts = { user_default_options = { names = false } }
-    },
-
-    -- Status line
-    {
-        "nvim-lualine/lualine.nvim",
-        dependencies = { "nvim-tree/nvim-web-devicons" },
-        config = function()
-            require("lualine").setup({
-                options = { theme = "catppuccin" },
-            })
-        end,
-    },
-
-    -- Which-key
-    {
-        "folke/which-key.nvim",
-        event = "VeryLazy",
-        config = function()
-            local wk = require("which-key")
-            wk.setup({
-                preset = "modern",
-            })
-
-            wk.add({
-                { "<leader>e",  desc = "Toggle file explorer" },
-                { "<leader>f",  group = "Find" },
-                { "<leader>ff", desc = "Find files" },
-                { "<leader>fg", desc = "Live grep" },
-                { "<leader>fb", desc = "Find buffers" },
-                { "<leader>g",  group = "Git" },
-                { "<leader>w",  desc = "Save" },
-                { "<leader>q",  desc = "Quit" },
-                { "<leader>b",  group = "Buffers" },
-                { "<leader>t",  group = "Terminal" },
-                { "<leader>d",  group = "Debug" },
-                { "<leader>l",  group = "LSP" },
-                { "<leader>c",  group = "Crates (Rust)" },
-                { "<leader>s",  group = "Session" },
-                { "<leader>n",  group = "Notifications" },
-                { "<leader>h",  group = "HTTP" },
-                { "<leader>D",  group = "Database" },
-                { "<leader>m",  group = "Markdown" },
-            })
-        end,
-    },
-
-    -- Alpha (dashboard)
-    {
-        "goolord/alpha-nvim",
-        config = function()
-            local alpha = require('alpha')
-            local dashboard = require("alpha.themes.dashboard")
-            dashboard.section.header.val = {
-                [[  ^  ^  ^   ^☆ ★ ☆ ___I_☆ ★ ☆ ^  ^   ^  ^  ^   ^  ^ ]],
-                [[ /|\/|\/|\ /|\ ★☆ /\-_--\ ☆ ★/|\/|\ /|\/|\/|\ /|\/|\ ]],
-                [[ /|\/|\/|\ /|\ ★ /  \_-__\☆ ★/|\/|\ /|\/|\/|\ /|\/|\ ]],
-                [[ /|\/|\/|\ /|\ 󰻀 |[]| [] | 󰻀 /|\/|\ /|\/|\/|\ /|\/|\ ]],
-            }
-
-            dashboard.section.buttons.val = {
-                dashboard.button("e", "  New file", ":ene <BAR> startinsert <CR>"),
-                dashboard.button("f", "󰍉  Find file", ":Telescope find_files<CR>"),
-                dashboard.button("r", "  Recent files", ":Telescope oldfiles<CR>"),
-                dashboard.button("t", "  Browse cwd", ":NvimTreeOpen<CR>"),
-                dashboard.button("s", "  Restore session", ":SessionRestore<CR>"),
-                dashboard.button("g", "󰊢  Lazygit", ":lua _LAZYGIT_TOGGLE()<CR>"),
-                dashboard.button("c", "  Config", ":e ~/.config/nvim/<CR>"),
-                dashboard.button("p", "  Plugins", ":Lazy<CR>"),
-                dashboard.button("q", "󰅙  Quit", ":qa<CR>"),
-            }
-
-            dashboard.section.footer.val = function()
-                return vim.g.startup_time_ms or "[[  ]]"
-            end
-
-            dashboard.section.buttons.opts.hl = "Keyword"
-            dashboard.opts.opts.noautocmd = true
-            alpha.setup(dashboard.opts)
-        end,
-    },
-}

lua/plugins/telescope.lua

@@ -0,0 +1,10 @@
+return {
+    -- Fuzzy finder
+    {
+        "nvim-telescope/telescope.nvim",
+        dependencies = { "nvim-lua/plenary.nvim" },
+        config = function()
+            require("telescope").setup()
+        end,
+    },
+}

lua/plugins/tools.lua

@@ -0,0 +1,53 @@
+return {
+    -- Diagnostics list
+    {
+        "folke/trouble.nvim",
+        dependencies = { "nvim-tree/nvim-web-devicons" },
+        cmd = "Trouble",
+        keys = {
+            { "<leader>xx", "<cmd>Trouble diagnostics toggle<cr>", desc = "Diagnostics" },
+            { "<leader>xX", "<cmd>Trouble diagnostics toggle filter.buf=0<cr>", desc = "Buffer diagnostics" },
+            { "<leader>xl", "<cmd>Trouble loclist toggle<cr>", desc = "Location list" },
+            { "<leader>xq", "<cmd>Trouble qflist toggle<cr>", desc = "Quickfix list" },
+        },
+        opts = {},
+    },
+
+    -- TODO comments
+    {
+        "folke/todo-comments.nvim",
+        event = { "BufReadPre", "BufNewFile" },
+        dependencies = { "nvim-lua/plenary.nvim" },
+        opts = {},
+        keys = {
+            { "<leader>ft", "<cmd>TodoTelescope<cr>", desc = "Find TODOs" },
+        },
+    },
+
+    -- Undo tree
+    {
+        "mbbill/undotree",
+        cmd = "UndotreeToggle",
+        keys = {
+            { "<leader>u", "<cmd>UndotreeToggle<cr>", desc = "Toggle undotree" },
+        },
+    },
+
+    -- Formatter
+    {
+        "stevearc/conform.nvim",
+        opts = {
+            format_on_save = { timeout_ms = 1000, lsp_fallback = true },
+            formatters_by_ft = {
+                javascript = { "prettierd", "prettier" },
+                javascriptreact = { "prettierd", "prettier" },
+                typescript = { "prettierd", "prettier" },
+                typescriptreact = { "prettierd", "prettier" },
+                json = { "prettierd", "prettier" },
+                css = { "prettierd", "prettier" },
+                html = { "prettierd", "prettier" },
+                markdown = { "prettierd", "prettier" },
+            },
+        },
+    },
+}

lua/plugins/treesitter.lua

@@ -0,0 +1,16 @@
+local config = require("core.config")
+
+return {
+    -- Syntax highlighting
+    {
+        "nvim-treesitter/nvim-treesitter",
+        build = ":TSUpdate",
+        config = function()
+            require("nvim-treesitter.configs").setup({
+                ensure_installed = config.get("treesitter.languages"),
+                highlight = { enable = true },
+                indent = { enable = true },
+            })
+        end,
+    },
+}

lua/plugins/ui.lua

@@ -0,0 +1,105 @@
+local config = require("core.config")
+local paths = config.paths()
+
+return {
+    -- Status line
+    {
+        "nvim-lualine/lualine.nvim",
+        dependencies = {
+            "nvim-tree/nvim-web-devicons",
+            "rebelot/kanagawa.nvim",
+        },
+        config = function()
+            require("lualine").setup({
+                options = { theme = "kanagawa" },
+            })
+        end,
+    },
+
+    -- Alpha (dashboard)
+    {
+        "goolord/alpha-nvim",
+        config = function()
+            local alpha = require('alpha')
+            local dashboard = require("alpha.themes.dashboard")
+            dashboard.section.header.val = {
+                [[  ██╗   ██╗███████╗    ██████╗ ███████╗███████╗██╗ ██████╗ ███╗   ██╗  ]],
+                [[  ██║   ██║╚════██║    ██╔══██╗██╔════╝██╔════╝██║██╔════╝ ████╗  ██║  ]],
+                [[  ██║   ██║    ██╔╝    ██║  ██║█████╗  ███████╗██║██║  ███╗██╔██╗ ██║  ]],
+                [[  ╚██╗ ██╔╝   ██╔╝     ██║  ██║██╔══╝  ╚════██║██║██║   ██║██║╚██╗██║  ]],
+                [[   ╚████╔╝    ██║      ██████╔╝███████╗███████║██║╚██████╔╝██║ ╚████║  ]],
+                [[    ╚═══╝     ╚═╝      ╚═════╝ ╚══════╝╚══════╝╚═╝ ╚═════╝ ╚═╝  ╚═══╝  ]],
+            }
+            dashboard.section.buttons.val = {
+                dashboard.button("e", "  New file", ":ene <BAR> startinsert <CR>"),
+                dashboard.button("f", "󰍉  Find file", ":lua require('fzf-lua').files() <CR>"),
+                dashboard.button("t", "  Browse cwd", ":NvimTreeOpen<CR>"),
+                dashboard.button("r", "  Browse src", ":e " .. paths.srcDirectory .. "<CR>"),
+                dashboard.button("s", "󰯂  Browse scripts", ":e " .. paths.scriptsDirectory .. "<CR>"),
+                dashboard.button("c", "  Config", ":e ~/.config/nvim/<CR>"),
+                dashboard.button("m", "  Mappings", ":e ~/.config/nvim/lua/core/keymaps.lua<CR>"),
+                dashboard.button("p", "  Plugins", ":PlugInstall<CR>"),
+                dashboard.button("q", "󰅙  Quit", ":q!<CR>"),
+            }
+
+            dashboard.section.footer.val = function()
+                return vim.g.startup_time_ms or "[[  ]]"
+            end
+
+            dashboard.section.buttons.opts.hl = "Keyword"
+            dashboard.opts.opts.noautocmd = true
+            alpha.setup(dashboard.opts)
+        end,
+    },
+
+    -- Which-key
+    {
+        "folke/which-key.nvim",
+        event = "VeryLazy",
+        config = function()
+            local wk = require("which-key")
+            wk.setup({
+                preset = "modern",
+            })
+
+            wk.add({
+                { "<leader>e",  desc = "Toggle file explorer" },
+                { "<leader>f",  group = "Find" },
+                { "<leader>ff", desc = "Find files" },
+                { "<leader>fg", desc = "Live grep" },
+                { "<leader>fb", desc = "Find buffers" },
+                { "<leader>ft", desc = "Find TODOs" },
+                { "<leader>g",  group = "Git" },
+                { "<leader>h",  group = "Harpoon" },
+                { "<leader>t",  group = "Theme" },
+                { "<leader>th", desc = "Theme switcher" },
+                { "<leader>x",  group = "Trouble" },
+                { "<leader>w",  desc = "Save" },
+                { "<leader>q",  desc = "Quit" },
+                { "<leader>u",  desc = "Undo tree" },
+                { "<leader>9",  group = "AI (99)" },
+                { "<leader>9f", desc = "Fill Function" },
+                { "<leader>9v", desc = "Visual AI" },
+                { "<leader>9s", desc = "Stop requests" },
+                { "<leader>o",  group = "Obsidian" },
+            })
+        end,
+    },
+
+    -- Colorizer
+    {
+        "NvChad/nvim-colorizer.lua",
+        opts = { user_default_options = { names = false } }
+    },
+
+    -- Indent guides
+    {
+        "lukas-reineke/indent-blankline.nvim",
+        main = "ibl",
+        event = { "BufReadPre", "BufNewFile" },
+        opts = {
+            indent = { char = "│" },
+            scope = { enabled = true },
+        },
+    },
+}

setup.sh

@@ -1,4 +1,349 @@
 #!/bin/bash
-# setup.sh
-ln -sf ~/.config/nvim/.tmux.conf ~/.tmux.conf 
-ln -sf ~/.config/nvim/starship.toml ~/.config/starship.toml 
+set -e  # exit on error
+
+# Colors for output
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m' # No Color
+
+# Helper function for colored output
+print_green() { echo -e "${GREEN}$1${NC}"; }
+print_yellow() { echo -e "${YELLOW}$1${NC}"; }
+print_blue() { echo -e "${BLUE}$1${NC}"; }
+
+# Helper function for prompts with defaults
+prompt_with_default() {
+    local prompt="$1"
+    local default="$2"
+    local result
+    read -p "$(echo -e "${BLUE}$prompt${NC} [${GREEN}$default${NC}]: ")" result
+    echo "${result:-$default}"
+}
+
+# This script sets up dotfiles and installs opencode:
+# - Backs up and symlinks .tmux.conf from dotfiles/ to ~/
+# - Backs up and symlinks starship.toml from dotfiles/ to ~/.config/
+# - Installs opencode CLI if not already present
+# - Generates config.json with interactive prompts
+
+NVIM_CONFIG_DIR="$HOME/.config/nvim"
+
+# ============================================
+# Section 1: Interactive Config Generation
+# ============================================
+print_green "╔════════════════════════════════════════════╗"
+print_green "║     Neovim Configuration Setup Wizard      ║"
+print_green "╚════════════════════════════════════════════╝"
+echo ""
+
+# Check if config.json already exists
+if [ -f "$NVIM_CONFIG_DIR/config.json" ]; then
+    print_yellow "Existing config.json found."
+    read -p "$(echo -e "${YELLOW}Overwrite? (y/N): ${NC}")" overwrite
+    if [[ ! "$overwrite" =~ ^[Yy]$ ]]; then
+        print_blue "Keeping existing config.json"
+        SKIP_CONFIG=true
+    else
+        # Backup existing config
+        cp "$NVIM_CONFIG_DIR/config.json" "$NVIM_CONFIG_DIR/config.json.backup.$(date +%Y%m%d%H%M%S)"
+        print_green "Backed up existing config.json"
+        SKIP_CONFIG=false
+    fi
+else
+    SKIP_CONFIG=false
+fi
+
+if [ "$SKIP_CONFIG" = false ]; then
+    echo ""
+    print_blue "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    print_blue "  Section 1: Paths"
+    print_blue "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    echo ""
+
+    OBSIDIAN_VAULT=$(prompt_with_default "Obsidian vault path" "~/Documents/obsidian-vault/")
+    SRC_DIR=$(prompt_with_default "Source code directory" "~/.local/src/")
+    SCRIPTS_DIR=$(prompt_with_default "Scripts directory" "~/scripts/")
+    WALLPAPER_SCRIPT=$(prompt_with_default "Wallpaper script path" "~/scripts/pywal/wallpapermenu.sh")
+
+    echo ""
+    print_blue "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    print_blue "  Section 2: Editor Settings"
+    print_blue "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    echo ""
+
+    TAB_SIZE=$(prompt_with_default "Tab size" "4")
+    SCROLL_OFFSET=$(prompt_with_default "Scroll offset" "8")
+    echo ""
+    print_yellow "Theme variants: wave (default), dragon (dark), lotus (light)"
+    THEME=$(prompt_with_default "Kanagawa theme variant" "wave")
+
+    echo ""
+    print_blue "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    print_blue "  Section 3: Languages"
+    print_blue "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    echo ""
+
+    print_yellow "Enter comma-separated lists"
+    echo ""
+    LSP_SERVERS=$(prompt_with_default "LSP servers" "ts_ls, eslint, jsonls, html, cssls, tailwindcss")
+    TS_LANGUAGES=$(prompt_with_default "Treesitter languages" "lua, vim, bash, javascript, typescript, tsx, json, yaml, html, css")
+
+    echo ""
+    print_blue "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    print_blue "  Section 4: AI Settings"
+    print_blue "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    echo ""
+
+    print_yellow "Claude models: claude-sonnet-4-5, claude-opus-4, haiku"
+    AI_MODEL=$(prompt_with_default "Claude Code model" "claude-sonnet-4-5")
+    OPENCODE_MODEL=$(prompt_with_default "OpenCode model (with provider prefix)" "anthropic/claude-sonnet-4-5")
+
+    # Convert comma-separated strings to JSON arrays
+    format_json_array() {
+        echo "$1" | sed 's/,/\n/g' | sed 's/^[[:space:]]*//;s/[[:space:]]*$//' | \
+        awk 'BEGIN{printf "["} NR>1{printf ", "} {printf "\"%s\"", $0} END{printf "]"}'
+    }
+
+    LSP_SERVERS_JSON=$(format_json_array "$LSP_SERVERS")
+    TS_LANGUAGES_JSON=$(format_json_array "$TS_LANGUAGES")
+
+    # Generate config.json
+    cat > "$NVIM_CONFIG_DIR/config.json" << EOF
+{
+    "paths": {
+        "obsidianVault": "$OBSIDIAN_VAULT",
+        "srcDirectory": "$SRC_DIR",
+        "scriptsDirectory": "$SCRIPTS_DIR",
+        "wallpaperScript": "$WALLPAPER_SCRIPT"
+    },
+    "editor": {
+        "tabSize": $TAB_SIZE,
+        "scrollOffset": $SCROLL_OFFSET,
+        "theme": "$THEME"
+    },
+    "ai": {
+        "model": "$AI_MODEL",
+        "openCodeModel": "$OPENCODE_MODEL"
+    },
+    "lsp": {
+        "servers": $LSP_SERVERS_JSON
+    },
+    "treesitter": {
+        "languages": $TS_LANGUAGES_JSON
+    }
+}
+EOF
+
+    echo ""
+    print_green "✓ config.json generated successfully!"
+    echo ""
+fi
+
+# ============================================
+# Section 2: Dotfile Symlinks
+# ============================================
+print_blue "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+print_blue "  Setting up dotfile symlinks..."
+print_blue "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+echo ""
+
+# Check and backup/symlink .tmux.conf
+TMUX_TARGET="$HOME/.config/nvim/dotfiles/.tmux.conf"
+if [ -L ~/.tmux.conf ] && [ "$(readlink ~/.tmux.conf)" = "$TMUX_TARGET" ]; then
+  print_green "✓ .tmux.conf already linked correctly"
+elif [ -f ~/.tmux.conf ] || [ -L ~/.tmux.conf ]; then
+  cp ~/.tmux.conf ~/.tmux.conf.backup.$(date +%Y%m%d%H%M%S)
+  ln -sf "$TMUX_TARGET" ~/.tmux.conf
+  print_green "✓ .tmux.conf backed up and linked"
+elif [ -f "$TMUX_TARGET" ]; then
+  ln -sf "$TMUX_TARGET" ~/.tmux.conf
+  print_green "✓ .tmux.conf linked"
+fi
+
+# Check and backup/symlink starship.toml
+STARSHIP_TARGET="$HOME/.config/nvim/dotfiles/starship.toml"
+if [ -L ~/.config/starship.toml ] && [ "$(readlink ~/.config/starship.toml)" = "$STARSHIP_TARGET" ]; then
+  print_green "✓ starship.toml already linked correctly"
+elif [ -f ~/.config/starship.toml ] || [ -L ~/.config/starship.toml ]; then
+  cp ~/.config/starship.toml ~/.config/starship.toml.backup.$(date +%Y%m%d%H%M%S)
+  ln -sf "$STARSHIP_TARGET" ~/.config/starship.toml
+  print_green "✓ starship.toml backed up and linked"
+elif [ -f "$STARSHIP_TARGET" ]; then
+  mkdir -p ~/.config
+  ln -sf "$STARSHIP_TARGET" ~/.config/starship.toml
+  print_green "✓ starship.toml linked"
+fi
+
+# ============================================
+# Section 3: OpenCode Installation
+# ============================================
+echo ""
+print_blue "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+print_blue "  Checking OpenCode installation..."
+print_blue "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+echo ""
+
+if ! command -v opencode &> /dev/null; then
+  print_yellow "Installing OpenCode..."
+  curl -fsSL https://opencode.ai/install | bash
+  print_green "✓ OpenCode installed"
+else
+  print_green "✓ OpenCode already installed"
+fi
+
+# ============================================
+# Section 4: Shell Aliases
+# ============================================
+echo ""
+print_blue "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+print_blue "  Setting up shell aliases..."
+print_blue "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+echo ""
+
+# Detect shell config file
+SHELL_RC=""
+if [ -f ~/.zshrc ]; then
+    SHELL_RC=~/.zshrc
+elif [ -f ~/.bashrc ]; then
+    SHELL_RC=~/.bashrc
+fi
+
+# Only proceed if we found a shell config
+if [ -n "$SHELL_RC" ]; then
+    # Create a temporary file with all our aliases and functions
+    TEMP_ALIASES=$(mktemp)
+
+    cat > "$TEMP_ALIASES" << 'EOF'
+
+# Git shortcuts
+alias gs='git status'
+alias ga='git add'
+alias gc='git commit -m'
+alias gp='git push'
+alias gl='git log --oneline'
+
+# fastfetch
+alias ff='fastfetch'
+
+# Claude Aliases
+alias cldy='claude --dangerously-skip-permissions'
+alias cldyh='claude --dangerously-skip-permissions --model haiku'
+alias cldys='claude --dangerously-skip-permissions --model sonnet'
+alias cldyo='claude --dangerously-skip-permissions --model opus'
+
+# IP address lookup
+alias whatismyip="whatsmyip"
+function whatsmyip () {
+    # Internal IP Lookup - auto-detect default interface
+    if command -v ip &> /dev/null; then
+        local iface=$(ip route | grep default | awk '{print $5}' | head -1)
+        echo -n "Internal IP: "
+        ip addr show "$iface" | grep "inet " | awk '{print $2}' | cut -d/ -f1
+    else
+        echo -n "Internal IP: "
+        ifconfig | grep "inet " | grep -v 127.0.0.1 | awk '{print $2}' | head -1
+    fi
+
+    # External IP Lookup
+    echo -n "External IP: "
+    curl -s -4 ifconfig.me
+    echo  # newline after curl output
+}
+
+# Automatically do an ls after each cd
+if [[ -n "$ZSH_VERSION" ]]; then
+    chpwd() { ls }
+else
+    cd() {
+        if [ -n "$1" ]; then
+            builtin cd "$@" && ls
+        else
+            builtin cd ~ && ls
+        fi
+    }
+fi
+
+# Create and go to the directory
+mkdirg() {
+	mkdir -p "$1"
+	cd "$1"
+}
+
+# Move and go to the directory
+mvg() {
+	if [ -d "$2" ]; then
+		mv "$1" "$2" && cd "$2"
+	else
+		mv "$1" "$2"
+	fi
+}
+
+# Copy file with a progress bar
+cpp() {
+    set -e
+    strace -q -ewrite cp -- "${1}" "${2}" 2>&1 |
+    awk '{
+        count += $NF
+        if (count % 10 == 0) {
+            percent = count / total_size * 100
+            printf "%3d%% [", percent
+            for (i=0;i<=percent;i++)
+                printf "="
+            printf ">"
+            for (i=percent;i<100;i++)
+                printf " "
+            printf "]\r"
+        }
+    }
+    END { print "" }' total_size="$(stat -c '%s' "${1}")" count=0
+}
+
+# Change directory aliases
+alias home='cd ~'
+alias cd..='cd ..'
+alias ..='cd ..'
+alias ...='cd ../..'
+alias ....='cd ../../..'
+alias .....='cd ../../../..'
+
+# Check the window size after each command (bash only)
+[[ -n "$BASH_VERSION" ]] && shopt -s checkwinsize
+
+# Set the default editor
+export EDITOR=nvim
+export VISUAL=nvim
+alias spico='sudo pico'
+alias snano='sudo nano'
+alias vim='nvim'
+EOF
+
+    # Check if these aliases/functions already exist in the shell config
+    # Look for a marker comment or key aliases
+    if ! grep -q "# Git shortcuts" "$SHELL_RC" && ! grep -q "alias gs='git status'" "$SHELL_RC"; then
+        # Append to shell config
+        echo "" >> "$SHELL_RC"
+        echo "# Added by nvim dotfiles setup" >> "$SHELL_RC"
+        cat "$TEMP_ALIASES" >> "$SHELL_RC"
+        print_green "✓ Shell aliases and functions added to $SHELL_RC"
+    else
+        print_green "✓ Shell aliases already exist in $SHELL_RC"
+    fi
+
+    # Clean up
+    rm "$TEMP_ALIASES"
+else
+    print_yellow "⚠ No .bashrc or .zshrc found, skipping shell config setup"
+fi
+
+# ============================================
+# Done!
+# ============================================
+echo ""
+print_green "╔════════════════════════════════════════════╗"
+print_green "║           Setup Complete!                  ║"
+print_green "╚════════════════════════════════════════════╝"
+echo ""
+print_blue "Run 'nvim' to start using your configuration."
+print_blue "Your config is stored in: $NVIM_CONFIG_DIR/config.json"
+echo ""