From d9d659241b296986911ba811fb80d8238d8573c0 Mon Sep 17 00:00:00 2001
From: Petr Nyc <jet.jetpac@gmail.com>
Date: Fri, 6 Jun 2025 11:55:39 +0000
Subject: [PATCH] changes in osd-dev, to be merged

---
 .gitconfig |  2 ++
 .p10k.zsh  |  2 +-
 .zshenv    |  5 ++---
 .zshrc     | 19 ++++++-------------
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 283d7bd..77b26ef 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -41,3 +41,5 @@
         ; modulePath = /usr/lib/apache2/modules
 [init]
 	defaultBranch = master
+[color]
+	ui = auto
diff --git a/.p10k.zsh b/.p10k.zsh
index e61f1cb..158fad6 100644
--- a/.p10k.zsh
+++ b/.p10k.zsh
@@ -103,7 +103,7 @@
     todo                    # todo items (https://github.com/todotxt/todo.txt-cli)
     timewarrior             # timewarrior tracking status (https://timewarrior.net/)
     taskwarrior             # taskwarrior task count (https://taskwarrior.org/)
-    # cpu_arch              # CPU architecture
+    cpu_arch              # CPU architecture
     time                  # current time
     # =========================[ Line #2 ]=========================
     newline
diff --git a/.zshenv b/.zshenv
index 41e3c21..b0a3a7b 100644
--- a/.zshenv
+++ b/.zshenv
@@ -2,11 +2,10 @@ set -o vi
 
 export LC_ALL=en_US.UTF-8
 
-export PATH=/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/jetpac/work/flutter/bin:$HOME/.rd/bin:$HOME/bin:PATH
-
+export PATH=/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/jetpac/work/flutter/bin:$HOME/.rd/bin:$HOME/bin:$HOME/miniconda3/bin/
 
 alias oe='open /Applications/Emacs.app'
-alias config='/usr/bin/git --git-dir=$HOME/.cfg/.git/ --work-tree=$HOME'
+alias config='/usr/local/bin/git --git-dir=$HOME/.cfg/.git --work-tree=$HOME'
 alias -g N="2>&1 "
 # export PATH=$HOME/.rd/bin
 #
diff --git a/.zshrc b/.zshrc
index 166be50..fd0aff8 100644
--- a/.zshrc
+++ b/.zshrc
@@ -175,24 +175,17 @@ export PATH="/Users/jetpac/.rd/bin:$PATH"
 
 # >>> conda initialize >>>
 # !! Contents within this block are managed by 'conda init' !!
-__conda_setup="$('/opt/homebrew/Caskroom/miniconda/base/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
+__conda_setup="$('/home/pnyc/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
 if [ $? -eq 0 ]; then
     eval "$__conda_setup"
 else
-    if [ -f "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh" ]; then
-        . "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh"
+    if [ -f "/home/pnyc/miniconda3/etc/profile.d/conda.sh" ]; then
+        . "/home/pnyc/miniconda3/etc/profile.d/conda.sh"
     else
-        export PATH="/opt/homebrew/Caskroom/miniconda/base/bin:$PATH"
+        export PATH="/home/pnyc/miniconda3/bin:$PATH"
     fi
 fi
 unset __conda_setup
-# <<< conda initialize <<<
-
-export PATH="/opt/homebrew/bin:$PATH"
-
-# for cocoapods
-export PATH=/opt/homebrew/opt/ruby/bin:$PATH
-export GEM_HOME=$HOME/.gem
-export PATH=$GEM_HOME/bin:$HOME/.gem/ruby/3.3.0/bin:$PATH
-
 
+# conda initialize
+conda activate osd-dev