From e47c3fa3f70caccce40bb10ad9d904ff833c313a Mon Sep 17 00:00:00 2001
From: Pratik Tripathy <mail@pratik.live>
Date: Mon, 25 Mar 2024 22:32:36 +0530
Subject: [PATCH] Config Updates: - .gitconfig: Use local date for display -
 .profile: Configure golang - .profile: gtkrc, wget, ollama setting changed to
 adhere to XDG folder structure - .zshrc: Use docker-compose oh-my-zsh plugin

---
 common/.config/shell/aliases.sh |  1 -
 common/.gitconfig               |  2 +-
 common/.profile                 | 11 ++++++++---
 common/.zshrc                   |  5 +++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/common/.config/shell/aliases.sh b/common/.config/shell/aliases.sh
index 88b77d2..d831359 100644
--- a/common/.config/shell/aliases.sh
+++ b/common/.config/shell/aliases.sh
@@ -10,7 +10,6 @@ alias egrep='egrep --color=auto'
 alias fgrep='fgrep --color=auto'
 alias usersearch="awk -F: '{print \"UserName: \" \$1 \", UserID: \" \$3 \", Home Dir: \" \$6 \", Shell Used: \" \$7}' /etc/passwd | grep"
 alias untar='tar -zxvf '
-alias wget='wget --hsts-file ${WGET_HSTS_FILE}'
 
 alias v='$EDITOR'
 alias snvim='${HOMEBREW_PREFIX}/bin/nvim' # Stable nvim
diff --git a/common/.gitconfig b/common/.gitconfig
index c560bb4..83069d2 100644
--- a/common/.gitconfig
+++ b/common/.gitconfig
@@ -29,7 +29,7 @@
   cmd = code --wait $MERGED
 
 [log]
-    date = relative
+    date = local
 
 [alias]
     ll = log --pretty=format:'%Cblue%cn (%ce)%Creset committed %Cred%h%Creset %Cgreen%cr%Creset:%n%B'
diff --git a/common/.profile b/common/.profile
index 75d53db..92c883b 100644
--- a/common/.profile
+++ b/common/.profile
@@ -44,7 +44,7 @@ if [ "$(uname -s)" = "Linux" ]; then
     export __GL_SHADER_DISK_CACHE_PATH="$XDG_CACHE_HOME/nvidia"
 
     # Needs upstream fix to work: https://bugs.kde.org/show_bug.cgi?id=415770
-    export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0"
+    export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc":"$XDG_CONFIG_HOME/gtk-2.0/gtkrc.mine"
     export CUDA_CACHE_PATH="XDG_CACHE_HOME/nv"
 
     # Map caps-lock to escape TIP: also added to /etc/profile
@@ -59,7 +59,7 @@ fi
 
 export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
 export LESSHISTFILE="$XDG_STATE_HOME/shell/lesshst"
-export WGET_HSTS_FILE="$XDG_STATE_HOME/shell/wget-hsts-history" # wget aliased to use this path
+export WGETRC="$XDG_CONFIG_HOME/wgetrc"
 
 # Move the Android device keys to .config (TODO: This needs to be tested)
 export ADB_VENDOR_KEYS="$XDG_CONFIG_HOME/android"
@@ -82,7 +82,10 @@ export DOTNET_CLI_TELEMETRY_OPTOUT=1
 export DOTNET_CLI_HOME="$XDG_CONFIG_HOME/dotnet"
 export DOTNET_TOOLS_PATH="$XDG_DATA_HOME/dotnet"
 
-# FIX: BELOW DID NOT WORK
+# Go
+export GOPATH=/media/pratik/Projects/DevSetUps/gopath/
+
+# FIX: BELOW DID NOT WORK: added to /etc/profile, need to recheck on reboot
 # alias code="code --extensions-dir $XDG_DATA_HOME/vscode"
 
 # Java
@@ -103,3 +106,5 @@ export FZF_DEFAULT_COMMAND='rg --files --hidden'
 export FZF_DEFAULT_OPTS='--layout=reverse --cycle --inline-info --height=~50% --border'
 
 export TLDR_CACHE_DIR="$XDG_CACHE_HOME/tldr"
+
+export OLLAMA_HOME="$XDG_CONFIG_HOME/ollama"
diff --git a/common/.zshrc b/common/.zshrc
index eb6df59..676158a 100644
--- a/common/.zshrc
+++ b/common/.zshrc
@@ -50,6 +50,7 @@ plugins=(
     git
     gitignore
     docker
+    docker-compose
     per-directory-history
     sudo
     zsh-syntax-highlighting
@@ -108,5 +109,5 @@ command -v zoxide >/dev/null && eval "$(zoxide init --cmd cd zsh)"
 for alias_file in "$XDG_CONFIG_HOME"/shell/*.sh; do source "$alias_file"; done
 
 # TIP: Following should be executed AFTER the aliases are sourced
-command -v op >/dev/null && bindkey -s '^o' 'op\n' # Fuzzyfind projects and open in nvim
-command -v pnew >/dev/null && bindkey -s '^[o' 'pnew\n' # Create a new project quickly
+command -v op >/dev/null && bindkey -s '^o' ' op\n' # Fuzzyfind projects and open in nvim
+command -v pnew >/dev/null && bindkey -s '^[o' ' pnew\n' # Create a new project quickly