Compare commits
No commits in common. "d85b6ca29a19ebb191fba35d7fa6600021fdaead" and "b6c48db10597a092be16d420d8014e2439c2478a" have entirely different histories.
d85b6ca29a
...
b6c48db105
@ -98,6 +98,10 @@ alias la='ls -A'
|
||||
alias l='ls -CF'
|
||||
#alias lb='lsblk -o+FSAVAIL,FSUSED,FSUSE%,MODEL,PARTTYPENAME,STATE'
|
||||
alias lb='lsblk -o+FSTYPE,FSAVAIL,FSUSED,FSUSE%,MODEL'
|
||||
alias opg="lsof 2>/dev/null +D . | grep 'pg.*swp$' | awk '{print \$9}' | sed 's/\.swp//g' | sed 's/\/\./\//g'"
|
||||
alias osw="lsof 2>/dev/null +D . | awk '\$NF ~ /swp$/ {print \$9}' | sed 's/\.swp//g' | sed 's/\/\./\//g'"
|
||||
alias xpg="lsof 2>/dev/null +D . | grep 'pg.*swp$' | awk '{print \$9}' | sed 's/\.swp//g' | sed 's/\/\./\//g' | xargs -r $PG -f"
|
||||
alias xsw="lsof 2>/dev/null +D . | grep '.*swp$' | awk '{print \$9}' | sed 's/\.swp//g' | sed 's/\/\./\//g' | xargs -r $PG -f"
|
||||
alias ons='lsof +D ~/.local/state/nvim/swap/ 2>/dev/null | grep -v "lsof:" | grep -o "/swap/.*" | cut -c 7- | tr "%" "/" | sed "s/\\.swp$//" | grep "$(pwd)"'
|
||||
alias xns='lsof +D ~/.local/state/nvim/swap/ 2>/dev/null | grep -v "lsof:" | grep -o "/swap/.*" | cut -c 7- | tr "%" "/" | sed "s/\\.swp$//" | sed "s/\\.swo$//" | grep "$(pwd | sed "s|^//|/|")" | fzf | xargs -I % $PG -f %'
|
||||
alias xnsp='lsof +D ~/.local/state/nvim/swap/ 2>/dev/null | grep -v "lsof:" | grep -o "/swap/.*" | cut -c 7- | tr "%" "/" | sed "s/\\.swp$//" | sed "s/\\.swo$//" | grep "$(pwd | sed "s|^//|/|")" | fzf | xargs -I % $PG -f % | pspg'
|
||||
|
||||
@ -1,29 +1,30 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
|
||||
REPO="git@gitea.hptrow.me:pt/nvchad.git"
|
||||
BRANCH="customize"
|
||||
NVIM_CONFIG="$HOME/.config/nvim"
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
|
||||
deploy_nvim_modules() {
|
||||
local src_dir="$SCRIPT_DIR/dotfiles/nvim"
|
||||
[[ -d "$src_dir" ]] || return 0
|
||||
[[ -d "$NVIM_CONFIG/lua" ]] || return 0
|
||||
echo "Deploying nvim lua modules..."
|
||||
for mod in "$src_dir"/*.lua; do
|
||||
[[ -f "$mod" ]] || continue
|
||||
local target="$NVIM_CONFIG/lua/$(basename "$mod")"
|
||||
[[ -e "$target" ]] && mv "$target" "${target}.backup"
|
||||
ln -s "$mod" "$target"
|
||||
echo " linked: $(basename "$mod")"
|
||||
done
|
||||
}
|
||||
|
||||
echo "============================================"
|
||||
echo "NvChad Configuration Installation Script"
|
||||
echo "============================================"
|
||||
echo ""
|
||||
echo "This script will:"
|
||||
echo " - Backup existing ~/.config/nvim to ~/.config/nvim.backup (if exists)"
|
||||
echo " - Clone your NvChad config from git@gitea.hptrow.me:pt/nvchad.git (customize branch)"
|
||||
echo " - Launch nvim to auto-install lazy.nvim and all plugins"
|
||||
echo ""
|
||||
echo "Prerequisites:"
|
||||
echo " - Neovim 0.9.5+ must be installed (run ./install_neovim.sh if needed)"
|
||||
echo " - Git must be installed"
|
||||
echo " - SSH key must be set up for gitea.hptrow.me"
|
||||
echo ""
|
||||
read -p "Continue with installation? (y/N) " -n 1 -r
|
||||
echo
|
||||
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
|
||||
echo "Installation cancelled."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "Starting installation..."
|
||||
echo ""
|
||||
|
||||
# Check prerequisites
|
||||
if ! command -v nvim &> /dev/null; then
|
||||
@ -48,59 +49,28 @@ fi
|
||||
echo "Neovim version: $(nvim --version | head -n1)"
|
||||
echo ""
|
||||
|
||||
# If already installed and pointing at the right remote, just pull
|
||||
if [ -d "$NVIM_CONFIG/.git" ]; then
|
||||
EXISTING_REMOTE=$(git -C "$NVIM_CONFIG" remote get-url hptrow 2>/dev/null || git -C "$NVIM_CONFIG" remote get-url origin 2>/dev/null || echo "")
|
||||
if [ "$EXISTING_REMOTE" = "$REPO" ]; then
|
||||
echo "NvChad config already installed — pulling latest..."
|
||||
git -C "$NVIM_CONFIG" pull hptrow "$BRANCH"
|
||||
deploy_nvim_modules
|
||||
echo "Done."
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "This script will:"
|
||||
echo " - Backup existing ~/.config/nvim to ~/.config/nvim.backup (if exists)"
|
||||
echo " - Clone your NvChad config from $REPO ($BRANCH branch)"
|
||||
echo " - Deploy lua modules from dotfiles/nvim/"
|
||||
echo " - Launch nvim to auto-install lazy.nvim and all plugins"
|
||||
echo ""
|
||||
echo "Prerequisites:"
|
||||
echo " - SSH key must be set up for gitea.hptrow.me"
|
||||
echo ""
|
||||
read -p "Continue with installation? (y/N) " -n 1 -r
|
||||
echo
|
||||
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
|
||||
echo "Installation cancelled."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "Starting installation..."
|
||||
echo ""
|
||||
|
||||
# Backup existing config
|
||||
if [ -d "$NVIM_CONFIG" ]; then
|
||||
# Backup existing config if it exists
|
||||
if [ -d ~/.config/nvim ]; then
|
||||
echo "Backing up existing ~/.config/nvim to ~/.config/nvim.backup"
|
||||
[ -d "$NVIM_CONFIG.backup" ] && rm -rf "$NVIM_CONFIG.backup"
|
||||
mv "$NVIM_CONFIG" "$NVIM_CONFIG.backup"
|
||||
if [ -d ~/.config/nvim.backup ]; then
|
||||
rm -rf ~/.config/nvim.backup
|
||||
fi
|
||||
mv ~/.config/nvim ~/.config/nvim.backup
|
||||
fi
|
||||
|
||||
# Clone the config
|
||||
echo "Cloning NvChad config from gitea ($BRANCH branch)..."
|
||||
echo "Cloning NvChad config from gitea (customize branch)..."
|
||||
set -x
|
||||
git clone -b "$BRANCH" "$REPO" "$NVIM_CONFIG"
|
||||
git clone -b customize git@gitea.hptrow.me:pt/nvchad.git ~/.config/nvim
|
||||
set +x
|
||||
|
||||
[ -d "$NVIM_CONFIG" ] || { echo "Error: Failed to clone config" >&2; exit 1; }
|
||||
if [ ! -d ~/.config/nvim ]; then
|
||||
echo "Error: Failed to clone config" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "Config cloned successfully!"
|
||||
echo ""
|
||||
|
||||
deploy_nvim_modules
|
||||
|
||||
echo ""
|
||||
echo "============================================"
|
||||
echo "First Launch Setup"
|
||||
@ -117,6 +87,7 @@ echo ""
|
||||
read -p "Press Enter to launch nvim and complete setup..." -r
|
||||
echo ""
|
||||
|
||||
# Launch nvim to trigger plugin installation
|
||||
nvim +q
|
||||
|
||||
echo ""
|
||||
@ -124,7 +95,7 @@ echo "============================================"
|
||||
echo "Installation Complete!"
|
||||
echo "============================================"
|
||||
echo ""
|
||||
echo "Your NvChad configuration is installed at: $NVIM_CONFIG"
|
||||
echo "Your NvChad configuration is installed at: ~/.config/nvim"
|
||||
echo ""
|
||||
echo "Key customizations in this config:"
|
||||
echo " - Theme: vscode_dark"
|
||||
@ -136,5 +107,7 @@ echo " - Custom keybindings: g+w (format), <leader>gb (blame), more in lua/mapp
|
||||
echo ""
|
||||
echo "Next time you launch nvim, everything will be ready!"
|
||||
echo ""
|
||||
[ -d "$NVIM_CONFIG.backup" ] && echo "Note: Your old config was backed up to $NVIM_CONFIG.backup"
|
||||
if [ -d ~/.config/nvim.backup ]; then
|
||||
echo "Note: Your old config was backed up to ~/.config/nvim.backup"
|
||||
fi
|
||||
echo "============================================"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user