From 5cb8ae2fc128732c60fa50c5652088bf0db72537 Mon Sep 17 00:00:00 2001
From: Jacob Bohanon <jacob.bohanon@solo.io>
Date: Thu, 7 Mar 2024 08:57:49 -0500
Subject: [PATCH] merge-main, neovim from source, aliases

---
 init.sh              | 21 +++++++++++++++++----
 nvim/lua/autocmd.lua | 10 +++++-----
 zsh/.zshrc           |  3 +++
 zsh/merge-main.sh    |  6 ++++++
 4 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100755 zsh/merge-main.sh

diff --git a/init.sh b/init.sh
index 9a8ebae..df80def 100755
--- a/init.sh
+++ b/init.sh
@@ -9,8 +9,17 @@ echo "PKGUPD: ${PKGUPD}"
 echo "PKGINST: ${PKGINST}"
 
 # Install zsh, neovim, ripgrep, fd
-which apt && sudo add-apt-repository ppa:neovim-ppa/stable || which dnf && sudo dnf copr enable agriffis/neovim-nightly
-[[ $PKGINST != '' ]] && $PKGUPD && $PKGINST zsh neovim ripgrep fd-find fzf
+[[ $PKGINST != '' ]] && $PKGUPD && $PKGINST zsh ripgrep fd-find fzf
+
+# Install neovim
+pushd /tmp || true
+git clone https://github.com/neovim/neovim
+pushd neovim \
+  && make CMAKE_BUILD_TYPE=RelWithDebInfo \
+  && sudo make install
+popd || true
+rm -rf neovim/
+popd || true
 
 # install zellij
 curl -L -o "$HOME/Downloads/zellij.tar.gz" "https://github.com/zellij-org/zellij/releases/latest/download/zellij-x86_64-unknown-linux-musl.tar.gz"
@@ -32,7 +41,7 @@ ln -s $HOME/.config/nvim/init.vim $HOME/.vimrc
 mv $HOME/.zshrc $HOME/.zshrc.bak && ln -s $HOME/.config/zsh/.zshrc $HOME/.zshrc
 
 ## Install powerline-fonts
-#which apt && $PKGINST fonts-powerline || which dnf && $PKGINST powerline-fonts
+which apt && $PKGINST fonts-powerline || which dnf && $PKGINST powerline-fonts
 
 # Install starship
 curl -sS https://starship.rs/install.sh | sh
@@ -43,7 +52,11 @@ mkdir -p $HOME/.go/downloads
 sudo ln -s $HOME/.dotfiles/zsh/mygvm /usr/local/bin/mygvm
 
 # Install Go
-mygvm install go1.20.1
+mygvm install go1.22.0
+
+# Install merge-main.sh
+mkdir -p $HOME/.local/bin
+sudo ln -s $HOME/.dotfiles/zsh/merge-main.sh $HOME/.local/bin/merge-main.sh
 
 # link gitconfig
 ln -s $HOME/.dotfiles/.gitconfig $HOME/.gitconfig
diff --git a/nvim/lua/autocmd.lua b/nvim/lua/autocmd.lua
index 433fbbe..d153c36 100644
--- a/nvim/lua/autocmd.lua
+++ b/nvim/lua/autocmd.lua
@@ -1,9 +1,9 @@
 vim.api.nvim_create_augroup('jbohanon', {clear=true})
-vim.api.nvim_create_autocmd('BufWritePre', {
-    pattern = '*',
-    group = 'jbohanon',
-    command = '%s/\\s\\+$//e',
-})
+-- vim.api.nvim_create_autocmd('BufWritePre', {
+--     pattern = '*',
+--     group = 'jbohanon',
+--     command = '%s/\\s\\+$//e',
+-- })
 vim.api.nvim_create_autocmd('FileType', {
     pattern = {'yaml','cpp'},
     group = 'jbohanon',
diff --git a/zsh/.zshrc b/zsh/.zshrc
index bf26efc..516ac33 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -28,6 +28,9 @@ else
 fi
 
 alias pls='sudo'
+alias mm='merge-main.sh'
+alias gmc='git merge --continue'
+alias kci='git commit --allow-empty --message "kick CI" && git push'
 alias cddf='cd $HOME/.dotfiles'
 alias nvdf='cddf && nvim $HOME/.dotfiles/README.md'
 alias cdjb='cd $HOME/src/github.com/jbohanon'
diff --git a/zsh/merge-main.sh b/zsh/merge-main.sh
new file mode 100755
index 0000000..a33a59b
--- /dev/null
+++ b/zsh/merge-main.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/bash -e
+branch=$(git status|head -1|cut -f3 -d\ )
+git checkout main
+git pull
+git checkout "$branch"
+git merge main