From c32ab09984764c7c5ed7d584b6ba904589308677 Mon Sep 17 00:00:00 2001
From: Petr Nyc <jet.jetpac@gmail.com>
Date: Thu, 17 Aug 2023 18:20:31 +0200
Subject: [PATCH] update

---
 .config/mc/ini |  2 +-
 .hgrc          |  4 ++++
 .vimrc         | 15 ++++++++++++---
 .zshrc         | 16 ++++++++++++++++
 README.org     | 12 +++++++++++-
 5 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/.config/mc/ini b/.config/mc/ini
index 0dfb544..5fb4037 100644
--- a/.config/mc/ini
+++ b/.config/mc/ini
@@ -87,7 +87,7 @@ skin=solarized-dark-256color
 
 [Layout]
 output_lines=0
-left_panel_size=121
+left_panel_size=93
 top_panel_size=0
 message_visible=true
 keybar_visible=true
diff --git a/.hgrc b/.hgrc
index 04ac426..2caa835 100644
--- a/.hgrc
+++ b/.hgrc
@@ -103,3 +103,7 @@ out = outgoing --style ~/.hgstyle/nlog
 
 # bout - hg out with branch
 bout = outgoing --style ~/.hgstyle/bout
+
+
+ci = commit -X Makefile.inc -X requirements.txt -X .hgignore
+st = status -X Makefile.inc -X requirements.txt -X .hgignore
diff --git a/.vimrc b/.vimrc
index 8415194..a335a13 100644
--- a/.vimrc
+++ b/.vimrc
@@ -18,11 +18,14 @@
 
 " only use copilot on Mac
 let s:usecopilot = 0
+let s:usejedi = 0
 if has('mac')
+    " only enable when not on vpn
     let s:route = system("netstat -nr | grep 'default.*tun' | head -1")
         if s:route != ""
             let s:usecopilot = 1
 	endif
+    let s:usejedi = 1
 endif
 
 
@@ -42,17 +45,22 @@ Plug 'vim-airline/vim-airline-themes'
 Plug 'bling/vim-bufferline'
 Plug 'tpope/vim-characterize'
 Plug 'tpope/vim-endwise'
+Plug 'doums/darcula' " pycharm scheme reproduction
 
 if s:usecopilot == 1
     Plug 'github/copilot.vim', { 'on': 'Copilot' }
 endif
 
+if s:usejedi == 1
+    Plug 'davidhalter/jedi-vim'
+endif
+
 Plug 'frankier/neovim-colors-solarized-truecolor-only'
 
 call plug#end()
 
-let g:airline_solarized_bg='dark'
-let g:airline_theme='solarized'
+" let g:airline_solarized_bg='dark'
+" let g:airline_theme='solarized'
 
 " let g:syntastic_<filetype>_checkers = ['<checker-name>']
 let g:syntastic_yaml_checkers = ['yamllint']
@@ -97,7 +105,8 @@ endif
 " solarized config
 set termguicolors
 set background=dark " or light
-colorscheme solarized"
+" colorscheme solarized
+colorscheme darcula
 hi Visual term=reverse cterm=reverse guibg=Grey
 
 
diff --git a/.zshrc b/.zshrc
index e2bb526..25b5794 100644
--- a/.zshrc
+++ b/.zshrc
@@ -168,3 +168,19 @@ SAVEHIST=$HISTSIZE
 ### MANAGED BY RANCHER DESKTOP START (DO NOT EDIT)
 export PATH="/Users/jetpac/.rd/bin:$PATH"
 ### MANAGED BY RANCHER DESKTOP END (DO NOT EDIT)
+
+# >>> 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)"
+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"
+    else
+        export PATH="/opt/homebrew/Caskroom/miniconda/base/bin:$PATH"
+    fi
+fi
+unset __conda_setup
+# <<< conda initialize <<<
+
diff --git a/README.org b/README.org
index 0e91d58..5d74b09 100644
--- a/README.org
+++ b/README.org
@@ -11,7 +11,7 @@
 
     # enter username/password
     git clone --bare https://git.meinlschmidt.org/jetpac/dotfiles.git ~/.cfg
-    alias config='/usr/bin/git --git-dir=$HOME/.cfg/.git --work-tree=$HOME'
+    alias config='/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME'
     config config --local status.showUntrackedFiles no
     config checkout
     zsh
@@ -34,3 +34,13 @@
 - this profile inherits from Default profile
 - automatically appears in profiles; set it as default and you should be going
 - TODO - table of defined keys
+
+** fonts
+For iTerm on mac, the preferred fonts are installed automatically.
+You can also download fonts like this:
+#+begin_src bash
+  wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Regular.ttf
+  wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Bold.ttf
+  wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Italic.ttf
+  wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Bold%20Italic.ttf
+#+end_src