From 1707767e1fb5733398e779760b66075eda384687 Mon Sep 17 00:00:00 2001 From: Ben Kreeger Date: Thu, 12 Jun 2025 17:07:50 -0500 Subject: [PATCH] Add lazygit config files --- lazygit.yaml | 12 +++++++++++ setup.sh | 61 ++++++++++++++++++++++++++++------------------------ 2 files changed, 45 insertions(+), 28 deletions(-) create mode 100644 lazygit.yaml diff --git a/lazygit.yaml b/lazygit.yaml new file mode 100644 index 0000000..d75eea5 --- /dev/null +++ b/lazygit.yaml @@ -0,0 +1,12 @@ +--- +gui: + showRootItemInFileTree: false + showPanelJumps: false + nerdFontsVersion: '3' +git: + merging: + args: --no-ff + mainBranches: [master, main, develop] + autoStageResolvedConflicts: false + overrideGpg: true + parseEmoji: true diff --git a/setup.sh b/setup.sh index baf69ce..a01aad0 100755 --- a/setup.sh +++ b/setup.sh @@ -1,38 +1,43 @@ #!/usr/bin/env bash -# Make sure $HOME/.config exists. It should, if we've been cloned there! -if [[ ! -d "$HOME/.config" ]]; then - mkdir -p $HOME/.config -fi - -# Clone ZSH configs. -if [[ ! -d "$HOME/.config/zsh" ]]; then - git clone --recurse-submodules https://git.kree.gr/kreeger/zshrc.git $HOME/.config/zsh -fi - -if [[ ! -a "$HOME/.zshrc" ]]; then - ln -sfv $HOME/.config/zsh/zshrc $HOME/.zshrc -fi - -# Clone nvim configs. -if [[ ! -d "$HOME/.config/nvim" ]]; then - git clone --recurse-submodules https://git.kree.gr/kreeger/nvimrc.git $HOME/.config/nvim -fi - -# Clone tmux configs. -if [[ ! -d "$HOME/.config/tmux" ]]; then - git clone --recurse-submodules https://git.kree.gr/kreeger/tmuxrc.git $HOME/.config/tmux -fi - -# Link dotfiles. -declare -a dotfiles=("gemrc" "gitconfig" "gitignore.global") - SCRIPT=$(readlink -f "$0") SCRIPTPATH=$(dirname "$SCRIPT") +# Make sure $HOME/.config exists. It should, if we've been cloned there! +if [[ ! -d "$HOME/.config" ]]; then + mkdir -p "$HOME"/.config +fi + +# Clone ZSH configs. +if [[ ! -d "$HOME/.config/zsh" ]]; then + git clone --recurse-submodules https://git.kree.gr/kreeger/zshrc.git "$HOME"/.config/zsh +fi + +if [[ ! -a "$HOME/.zshrc" ]]; then + ln -sfv "$HOME"/.config/zsh/zshrc "$HOME"/.zshrc +fi + +# Clone nvim configs. +if [[ ! -d "$HOME/.config/nvim" ]]; then + git clone --recurse-submodules https://git.kree.gr/kreeger/nvimrc.git "$HOME"/.config/nvim +fi + +# Clone tmux configs. +if [[ ! -d "$HOME/.config/tmux" ]]; then + git clone --recurse-submodules https://git.kree.gr/kreeger/tmuxrc.git "$HOME"/.config/tmux +fi + +# Clone lazygit config. +if [[ ! -a "$HOME/.config/lazygit/config.yml" ]]; then + mkdir -p "$HOME/.config/lazygit" + ln -sfv "$SCRIPTPATH/lazygit.yaml" "$HOME/.config/lazygit/config.yml" +fi + +# Link dotfiles. +declare -a dotfiles=("gemrc" "gitconfig" "gitignore.global") for file in "${dotfiles[@]}" do if [[ ! -a "$HOME/.$file" ]]; then - ln -sfv $SCRIPTPATH/$file $HOME/.$file + ln -sfv "$SCRIPTPATH/$file" "$HOME/.$file" fi done