From 9adf71ccbc86374ce6cc139d4a0e3ba3dd756649 Mon Sep 17 00:00:00 2001
From: foozzi <foozzione@gmail.com>
Date: Mon, 2 Sep 2024 13:29:36 +0200
Subject: [PATCH] 20240902

---
 global/.config/nvim/lua/core/autocmds.lua |   5 ++++
 global/.config/nvim/lua/core/options.lua  |   4 ++--
 global/.zshrc                             |  27 ++++++++++++++++++----
 global/scripts/vimwiki_diary_template     | Bin 765 -> 788 bytes
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/global/.config/nvim/lua/core/autocmds.lua b/global/.config/nvim/lua/core/autocmds.lua
index 9c845e3..5148020 100644
--- a/global/.config/nvim/lua/core/autocmds.lua
+++ b/global/.config/nvim/lua/core/autocmds.lua
@@ -39,3 +39,8 @@ vim.api.nvim_create_autocmd({ "BufNewFile", "BufReadPre" }, {
 		vim.o.secure = true
 	end,
 })
+
+vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
+	pattern = "*.jrnl",
+	command = "set filetype=markdown",
+})
diff --git a/global/.config/nvim/lua/core/options.lua b/global/.config/nvim/lua/core/options.lua
index 2e9d4a6..b1ad302 100644
--- a/global/.config/nvim/lua/core/options.lua
+++ b/global/.config/nvim/lua/core/options.lua
@@ -132,8 +132,8 @@ vim.opt.langmap = {
 	"Ё/",
 }
 
-M.zettelkasten_dir = vim.fn.expand("~/PKM/00-zettelkasten/")
-M.resources_dir = vim.fn.expand("~/PKM/300-resources/")
+M.zettelkasten_dir = vim.fn.expand("~/PKM/01 - zettelkasten/")
+M.resources_dir = vim.fn.expand("~/PKM/05 - resources/")
 M.pkm_dir = vim.fn.expand("~/PKM/")
 
 return M
diff --git a/global/.zshrc b/global/.zshrc
index f62e0cd..d0a2c0a 100644
--- a/global/.zshrc
+++ b/global/.zshrc
@@ -45,6 +45,21 @@ ex ()
   fi
 }
 
+diary ()
+{
+  if [[ ! -v "$1" ]]; then
+    arg1=1
+  else
+    arg1="$1"
+  fi
+
+  if [[ "$2" == "md" ]]; then
+    jrnl -n "$arg1" | glow
+  else
+    jrnl -n "$arg1"
+  fi
+}
+
 
 # aliases
 ## tmux
@@ -63,16 +78,16 @@ alias zshs='. ~/.zshrc'
 ## neomutt
 alias nm='neomutt'
 ## vim
-alias ovim='vim' # original vim
-alias diary='ovim ~/vimwiki/diary/diary.asc.md'
+# alias ovim='vim' # original vim
+# alias diary='ovim ~/vimwiki/diary/diary.asc.md'
 ## nvim
 alias evim='nvim ~/.dotfiles/global/.config/nvim/'
 alias kvim='nvim ~/PKM/'
 alias cvim='nvim ~/.zshrc'
 alias tvim='nvim ~/Dropbox/TODO/'
-alias kvimr='nvim ~/PKM/300-resources/'
-alias kvimj='nvim ~/PKM/1-journal/'
-alias jvim='nvim ~/PKM/1-journal/$(date "+%Y-%m-%d").md'
+alias kvimr='nvim ~/PKM/05 - resources/'
+alias kvimj='nvim ~/PKM/02 - journal/'
+alias jvim='nvim ~/PKM/02 - journal/$(date "+%Y-%m-%d").md'
 # alias vim='nvim'
 alias vi='nvim'
 alias v='nvim'
@@ -93,6 +108,8 @@ alias to="toipe"
 ## jrnl.sh
 setopt HIST_IGNORE_SPACE
 alias jrnl=" jrnl"
+alias lj="jrnl -n 3 --format json | jq '.entries[].date'"
+alias di=" eton diary"
 ## jupyter
 alias jup="jupyter lab"
 ## hledger
diff --git a/global/scripts/vimwiki_diary_template b/global/scripts/vimwiki_diary_template
index c5887a98af3db195c50257ddefab216d4d6e637a..fa6a330fce243aebb31d7ffeccc122f520685754 100755
GIT binary patch
literal 788
zcmV+v1MB<%M@dveQdv+`0B`dG{8nzE@9*p4KFIEr)!)m`g%lY+T~J?!hNbC6YY-|h
zFXb6daxP`wo2~a*M#RNW7g64tF+bZ+y%nv)m?Ub7q)ZVT(R;Cb%y!fvf?K(LC=2qz
zIYO^>w6sl-x8;}f53%e_liWe(SNpHX{Qzb~>a?n7qw1loUxk%Y535^Y;DJ>7eNx5h
zd|WYa@FLXwZ#U@?-~I9faOL-Vto-VvC?N;7a)~mhJY>^<p4)-P?52bkgd*sa!d-Df
z%7p}=io@9uQ)G2t4szuo_?8PI%?(SzrLzSla$s*#$oK!d`9*{zgTy$y|Iab;ro{*<
z`U>^PB*Bc1<v&#pcCCu1=@K`OMPjQA<#d$&!^_?vz+LNXDbu6t9C;JjoQec8X^m_y
zbxBcLR}ij|M;<@$pk}ktV1unhGVMT|Dj<Dp4DqtkP(BAUia}M8WOSi*-Ky75H~$AC
zqXH=M>fLlg&ZU-gr?I*>;QniTMCQ+S8|=bavH5J|2c#8J112+si5`Id5HO%?R7b$t
zsLW+eJxZ@jXcCs^p<J!lj65S6IRh58kMk!fa;%b=4T~&!(It8rLi#|~$!*y_<;$<g
z?9N;+=<hqs2g9Gxq7i1n^&1$N+MXR*Qo-d_dU&mS`0<{ZXc#03^Eg0Tg)1ByGfK%Z
za7f%;^C^ulhjCDcVtBoTl`uk}T<Ry~Fsui1<M8HGti0~Rh8tfJ*Jk5a^(HtS{}3%p
z<5^(vMb7NkvY<56O!5xetD*9}tkJiZ5QDcP-dDB}lMtA^X85sX%!YVapXi?vC!6Qe
zxAOq?{zzriNC%+V=!Ac2`c&YtZC-X0V_`?)3h(I*#HH@pPuhk8oO61yzqO@xJb0p$
zy2J!h&Om{wK|^s7qN7pe$)G}T&rIbf_BF4L%>87uav4u5;^%5uM8B72xMFg%WTJO3
zJzoqFIwo-}d6VBhZMe;mprdmwz;V^{q3#LD-#5<*gP0{jn|X4(_VUf8!PZI1k}b6C
SS=)fLYquk@klHMi&w2W>ww2ic

literal 765
zcmV<Z0s{R2M@dveQdv+`04h4aemJ*Fw!M_0UK6v)-EP-5fxuO_^TgWv><t>^Ee##E
zGFYB;53Z{5BU@kv1nbaZ97o9DBP{;o(iQb~fo2-yd&LU$EbU0}`%xN!SWE^#h6!+u
zpd_P(-PZ!_ML%zaaING-4rG<A7XE*xKmkri-P3JMU49=Ac^Pdossu8!2wcC0O<a4&
zJ07af(aquDTaE^NDOFur^~;?nhI}NY#uIitX(46qM9J^1G#yLV8fh3A;21Fy&TEQ>
zQz4h!3NWs&lLD0Eqt2h8z<m}@wnR=oJcPm-?1@Hw#%B9l)mlsV+H?(7bcU{hrAZ|P
zc~u`1ko3KYgbhbLc3K8*0=Lt&I1=+|H<$`dX;=wgc=Bj^qnG|Z^na$fD&Lq|wXcu)
zDEa*;$w=~J{nFbH39ftx!w_9I1?7)t$-T$w*-F_;t8iM^Dh3bIYl@8R-!C)RHM@|*
z$7diA#}@d-g`}JXRz-TOeWsQ+j98+!!iq%|@nk4i;=q~!b98TC31VdbF^9O{;%Rm*
zG_?wM5jMd>`F{KpJ<W%(?RC?P?wG>q)W#?rv{9K-z)Ku@LrVE-sm#t6640N^Hw^n?
zCw3{6*63N^)};R5A#qI@)rgX=VlYU-v!dpNN3A0zz-c1H+fEUByMY1@TGHct<UC3m
z^!7Asr4pWud0nS5sCVVTS2NOM@p)Kr_&RBS`Bt*9A;l%uJS^sey~<YmJ+j?xFI>zO
z*onb{{NAc!4$E$~ne(FK@?%1niiv0t_KdU-KE3s`)|@`Xk8zR@N0=k?+g?{<HFw#s
z+zlN`<4|@`HEE0r&j4ObZ_@iD8U=en#EslNxicApGFv{23u*2M(S?N4MEsl;qVA}f
zz#32JP_5LyDseZ2ih)3mtIc`Yko_T%xPq-i$2JPFPLc;+TYkeL<Zna@P3sP_xNe!_
v3$1b(dCt}VbzxdI;**a=V;V48H6bQU59dJuEOvnWQm&t|4n!%)xAqULpCNQ?