Latest config changes

Better git commands to handle main / master branch
Add copilot
Few upgrades and fixes

Author: bliof

.gitignore

@@ -1,4 +1,5 @@
 vim/bundle
 vim/spell
+vim/backup
 tmux/plugins
 !tmux/plugins/tpm

bashrc

@@ -7,12 +7,16 @@ export GPG_TTY=$(tty)
 
 [ -e ~/.rvm/scripts/rvm ] && . ~/.rvm/scripts/rvm
 [ -e ~/.phpbrew/bashrc ]  && . ~/.phpbrew/bashrc
+[ -e /opt/homebrew/bin/brew ] && eval "$(/opt/homebrew/bin/brew shellenv)"
 
 export GOPATH=$HOME/go
-PATH="$PATH:$GOPATH/bin"
+PATH="$GOPATH/bin:$PATH"
 PATH="/usr/local/bin:$PATH"
-PATH="$PATH:/usr/local/sbin"
-PATH="$PATH:$HOME/.rvm/bin"
+PATH="/usr/local/sbin:$PATH"
+PATH="$HOME/.rvm/bin:$PATH"
+PATH="/opt/homebrew/opt/libpq/bin:$PATH"
+PATH="/opt/homebrew/opt/openjdk/bin:$PATH"
+export JAVA_HOME=/opt/homebrew/Cellar/openjdk/23.0.2/libexec/openjdk.jdk/Contents/Home
 
 # If not running interactively, don't do anything
 [ -z "$PS1" ] && return
@@ -22,6 +26,7 @@ export COMP_KNOWN_HOSTS_WITH_HOSTFILE=''
 
 TERM='xterm-256color'
 export EDITOR='nvim'
+alias vim="nvim"
 profile=`echo $ITERM_PROFILE | tr '[:upper:]' '[:lower:]'`
 if [[ "$profile" == *"light"* ]]; then
     export COLORSCHEME='light'

config/nvim/init.vim

@@ -4,3 +4,28 @@ source ~/.vimrc
 
 let test#strategy = "neovim"
 tnoremap <C-W>N <C-\><C-n>
+
+
+lua << EOF
+  require('codecompanion')
+EOF
+
+" lua << EOF
+" require('codecompanion').setup({
+"   ollama = {
+"     model = "gemma3:1b",
+"     host = "http://localhost:11434"
+"   },
+"   strategies = {
+"       chat = {
+"           adapter = "ollama",
+"       },
+"       inline = {
+"           adapter = "ollama",
+"       },
+"       agent = {
+"           adapter = "ollama",
+"       },
+"   },
+" })
+" EOF

config/starship.toml

@@ -165,3 +165,6 @@ format = '[$symbol($version)]($style) '
 
 [zig]
 format = '[$symbol($version)]($style) '
+
+[battery]
+disabled = true

gitconfig

@@ -1,9 +1,10 @@
 [core]
-    editor = vim
+    editor = nvim
+    excludesfile = /Users/bliof/local/dotfiles/git-global-ignore
 [user]
     name = Aleksandar Ivanov
     email = [email protected]
-    signingkey = D626A7AB76CBE9D5
+    signingkey = 1404AF30CC6873B8
 [color]
     ui = auto
 [color "diff"]
@@ -45,14 +46,19 @@
     ra = !git r --all
     l = "!. ~/.githelpers && pretty_git_log"
     la = !git l --all
-    d = log --graph --decorate --stat master..
+    default-branch = ![ -f "$(git rev-parse --show-toplevel 2>/dev/null)/.git/refs/heads/main" ] && echo main || echo master
     review = !git stash && git fetch origin $1 && (git branch -m $1 tmp-review-$1-$(date +%Y-%m-%d-%H-%M-%S) || :) && git checkout -b $1 origin/$1 && :
     nuke-review-tmp = !git branch | grep 'tmp-review' | xargs git branch -D
-    changes = !BRANCH="${1:-$(git branch-name)}" && git diff --name-only $(git merge-base master "$BRANCH") "$BRANCH"
+    changes = !BRANCH="${1:-$(git branch-name)}" && git diff --name-only $(git merge-base $(git default-branch) "$BRANCH") "$BRANCH"
     branch-name = !git rev-parse --abbrev-ref HEAD
-    mm = !BRANCH="${1:-$(git branch-name)}" && git checkout master && git pull origin master && git checkout "$BRANCH" && git rebase master
+    mm = !BRANCH="${1:-$(git branch-name)}" && git checkout $(git default-branch) && git pull origin $(git default-branch) && git checkout "$BRANCH" && git rebase $(git default-branch)
+    ba = for-each-ref --sort=committerdate refs/heads/ --format='%(color: red)%(committerdate:short) %(color: cyan)%(refname:short)'
     b = for-each-ref --sort=committerdate refs/heads/ --format='%(committerdate:short) %(refname:short)'
+    fame = !python -m gitfame
+    count-lines = "! git log --author=\"$1\" --pretty=tformat: --numstat | awk '{ add += $1; subs += $2; loc += $1 - $2 } END { printf \"added lines: %s, removed lines: %s, total lines: %s\\n\", add, subs, loc }' #"
 [gpg]
     program = gpg
 [url "ssh://[email protected]/"]
     insteadOf = https://github.com/
+[commit]
+    gpgsign = true