tsivinsky/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

run shfmt on .bashrc and bootstrap.sh

Browse Source
This commit is contained in:
Dan Tsivinsky
2022-02-08 19:36:10 +03:00
parent 578a5bbf66
commit dbf0f68ef3
2 changed files with 68 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
bootstrap.sh
View File

@@ -2,94 +2,89 @@
# complete_alias is a script that allows to use completion in aliases # complete_alias is a script that allows to use completion in aliases
declare -A bashCompletions=( declare -A bashCompletions=(
["complete_alias"]="https://raw.githubusercontent.com/cykerway/complete-alias/master/complete_alias" ["complete_alias"]="https://raw.githubusercontent.com/cykerway/complete-alias/master/complete_alias"
["tmux"]="https://raw.githubusercontent.com/Bash-it/bash-it/master/completion/available/tmux.completion.bash" ["tmux"]="https://raw.githubusercontent.com/Bash-it/bash-it/master/completion/available/tmux.completion.bash"
["git"]="https://raw.githubusercontent.com/git/git/master/contrib/completion/git-completion.bash" ["git"]="https://raw.githubusercontent.com/git/git/master/contrib/completion/git-completion.bash"
) )
declare -A configs=( declare -A configs=(
["$PWD/config/.bashrc"]="$HOME/.bashrc" ["$PWD/config/.bashrc"]="$HOME/.bashrc"
["$PWD/config/.inputrc"]="$HOME/.inputrc" ["$PWD/config/.inputrc"]="$HOME/.inputrc"
["$PWD/config/.gitconfig"]="$HOME/.gitconfig" ["$PWD/config/.gitconfig"]="$HOME/.gitconfig"
["$PWD/config/.tmux.conf"]="$HOME/.tmux.conf" ["$PWD/config/.tmux.conf"]="$HOME/.tmux.conf"
["$PWD/config/nvim"]="$HOME/.config/nvim" ["$PWD/config/nvim"]="$HOME/.config/nvim"
["$PWD/config/alacritty"]="$HOME/.config/alacritty" ["$PWD/config/alacritty"]="$HOME/.config/alacritty"
["$PWD/config/rofi"]="$HOME/.config/rofi" ["$PWD/config/rofi"]="$HOME/.config/rofi"
["$PWD/config/dunst"]="$HOME/.config/dunst" ["$PWD/config/dunst"]="$HOME/.config/dunst"
["$PWD/config/fontconfig"]="$HOME/.config/fontconfig" ["$PWD/config/fontconfig"]="$HOME/.config/fontconfig"
["$PWD/config/sway"]="$HOME/.config/sway" ["$PWD/config/sway"]="$HOME/.config/sway"
["$PWD/config/swaylock"]="$HOME/.config/swaylock" ["$PWD/config/swaylock"]="$HOME/.config/swaylock"
["$PWD/config/waybar"]="$HOME/.config/waybar" ["$PWD/config/waybar"]="$HOME/.config/waybar"
["$PWD/config/wlogout"]="$HOME/.config/wlogout" ["$PWD/config/wlogout"]="$HOME/.config/wlogout"
["$PWD/config/swappy"]="$HOME/.config/swappy" ["$PWD/config/swappy"]="$HOME/.config/swappy"
["$PWD/config/lf"]="$HOME/.config/lf" ["$PWD/config/lf"]="$HOME/.config/lf"
) )
bashCompletionsDir="$HOME/.config/bash-completions" bashCompletionsDir="$HOME/.config/bash-completions"
__install_bash_completions() { __install_bash_completions() {
if [[ ! -d "$bashCompletionsDir" ]] ; then if [[ ! -d "$bashCompletionsDir" ]]; then
mkdir "$bashCompletionsDir" mkdir "$bashCompletionsDir"
fi fi
for cmp in "${!bashCompletions[@]}" for cmp in "${!bashCompletions[@]}"; do
do source=${bashCompletions[$cmp]}
source=${bashCompletions[$cmp]} dest="$bashCompletionsDir/$cmp.bash"
dest="$bashCompletionsDir/$cmp.bash"
if [[ ! -f "$dest" ]]; then
if [[ ! -f "$dest" ]] ; then echo "Downloading $cmp completion"
echo "Downloading $cmp completion" curl "$source" -o "$dest" &>/dev/null
curl "$source" -o "$dest" &> /dev/null fi
fi done
done
} }
usage() { usage() {
echo "usage: (./)bootstrap.sh [-S][-R]" echo "usage: (./)bootstrap.sh [-S][-R]"
echo echo
echo " -S installs all this shit" echo " -S installs all this shit"
echo " -R removes all this shit" echo " -R removes all this shit"
echo " -I downloads bash completions" echo " -I downloads bash completions"
} }
if [ $# -eq 0 ] ; then if [ $# -eq 0 ]; then
usage usage
fi fi
# Install all configs # Install all configs
if [ "$1" = "-S" ] ; then if [ "$1" = "-S" ]; then
# Create symlinks # Create symlinks
for config in "${!configs[@]}" for config in "${!configs[@]}"; do
do ln -s $config ${configs[$config]}
ln -s $config ${configs[$config]} done
done
# Install packer.nvim # Install packer.nvim
mkdir ~/.local/share/nvim/site/pack mkdir ~/.local/share/nvim/site/pack
git clone --depth 1 https://github.com/wbthomason/packer.nvim \ git clone --depth 1 https://github.com/wbthomason/packer.nvim \
~/.local/share/nvim/site/pack/packer/start/packer.nvim ~/.local/share/nvim/site/pack/packer/start/packer.nvim
# Install vim plugins # Install vim plugins
nvim -c "PackerInstall" nvim -c "PackerInstall"
if [[ ! -d "$bashCompletionsDir" ]] ; then if [[ ! -d "$bashCompletionsDir" ]]; then
__install_bash_completions __install_bash_completions
fi fi
fi fi
# Remove all configs # Remove all configs
if [ "$1" = "-R" ] ; then if [ "$1" = "-R" ]; then
for config in "${!configs[@]}" for config in "${!configs[@]}"; do
do rm -rf ${configs[$config]}
rm -rf ${configs[$config]} done
done
rm -rf "$bashCompletionsDir" rm -rf "$bashCompletionsDir"
fi fi
# Install bash completions defined in hashmap above # Install bash completions defined in hashmap above
if [ "$1" = "-I" ] ; then if [ "$1" = "-I" ]; then
__install_bash_completions __install_bash_completions
fi fi

17
config/.bashrc
View File

@@ -1,16 +1,16 @@
# If not running interactively, don't do anything # If not running interactively, don't do anything
[[ $- != *i* ]] && return [[ $- != *i* ]] && return
# _____ _ ___ _____ ____ ___ _ _ __ __ _____ _ _ _____ # _____ _ ___ _____ ____ ___ _ _ __ __ _____ _ _ _____
# | ____| \ | \ \ / /_ _| _ \ / _ \| \ | | \/ | ____| \ | |_ _| # | ____| \ | \ \ / /_ _| _ \ / _ \| \ | | \/ | ____| \ | |_ _|
# | _| | \| |\ \ / / | || |_) | | | | \| | |\/| | _| | \| | | | # | _| | \| |\ \ / / | || |_) | | | | \| | |\/| | _| | \| | | |
# | |___| |\ | \ V / | || _ <| |_| | |\ | | | | |___| |\ | | | # | |___| |\ | \ V / | || _ <| |_| | |\ | | | | |___| |\ | | |
# |_____|_| \_| \_/ |___|_| \_\\___/|_| \_|_| |_|_____|_| \_| |_| # |_____|_| \_| \_/ |___|_| \_\\___/|_| \_|_| |_|_____|_| \_| |_|
# #
export DOTFILES="$HOME/dotfiles" export DOTFILES="$HOME/dotfiles"
export TERM=alacritty export TERM=kitty
export EDITOR=nvim export EDITOR=nvim
export VISUAL=nvim export VISUAL=nvim
@@ -26,7 +26,6 @@ PYTHON_BIN="$HOME/.local/bin"
export PATH="$PATH:$MY_BIN:$PYTHON_BIN:$RUSTBIN:$GOBIN" export PATH="$PATH:$MY_BIN:$PYTHON_BIN:$RUSTBIN:$GOBIN"
# Source bash completions # Source bash completions
source $HOME/.config/bash-completions/* source $HOME/.config/bash-completions/*
@@ -50,3 +49,7 @@ set -o vi
# Show calendar and date on start # Show calendar and date on start
cal -m cal -m
date +"%d %B %Y - %H:%M:%S, %A" date +"%d %B %Y - %H:%M:%S, %A"
# BEGIN_KITTY_SHELL_INTEGRATION
if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi
# END_KITTY_SHELL_INTEGRATION