20240907

global/.config/nvim/lazy-lock.json

@@ -6,12 +6,11 @@
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "conform.nvim": { "branch": "master", "commit": "0ebe875d9c306f5fc829db38492ffff2a70d8e9d" },
+  "everforest": { "branch": "master", "commit": "93b89630861a4c8a1be07bc54f6d53487acb2e57" },
-  "everforest": { "branch": "master", "commit": "4bca38c58be8255fa20a87670df684320974d88c" },
   "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
   "gruvbox.nvim": { "branch": "main", "commit": "7a1b23e4edf73a39642e77508ee6b9cbb8c60f9e" },
   "hardtime.nvim": { "branch": "main", "commit": "6513bf42cd9261669d1ee41ff8b4065dfdc53a09" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" },
   "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" },
   "leap.nvim": { "branch": "main", "commit": "c6bfb191f1161fbabace1f36f578a20ac6c7642c" },
   "lsp-zero.nvim": { "branch": "v3.x", "commit": "56db3d5ce5476b183783160e6045f7337ba12b83" },
@@ -20,22 +19,22 @@
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "mkdnflow.nvim": { "branch": "main", "commit": "d459bd7ce68910272038ed037c028180161fd14d" },
   "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
-  "neoscroll.nvim": { "branch": "master", "commit": "532dcc8cea4287c4cad6bb77532989a8217cfc7b" },
+  "neoscroll.nvim": { "branch": "master", "commit": "6dfce64589e8e685d21f2dbd2df15a2473fa1d41" },
   "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
-  "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" },
+  "nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" },
   "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
-  "nvim-lint": { "branch": "master", "commit": "debabca63c0905b59ce596a55a8e33eafdf66342" },
+  "nvim-lint": { "branch": "master", "commit": "a7ce9c78a7c710c28bee56dfab10a5c0c80b7fb5" },
-  "nvim-lspconfig": { "branch": "master", "commit": "3ad562700d0615818bf358268ac8914f6ce2b079" },
+  "nvim-lspconfig": { "branch": "master", "commit": "bdbc65aadc708ce528efb22bca5f82a7cca6b54d" },
   "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
-  "nvim-tree.lua": { "branch": "master", "commit": "d43ab67d0eb4317961c5e9d15fffe908519debe0" },
+  "nvim-tree.lua": { "branch": "master", "commit": "ea55ef12036897fdc4476b115a395d2a34965c82" },
-  "nvim-treesitter": { "branch": "master", "commit": "c7920f2bc5080e1d04708332f6a0e7e9368b2197" },
+  "nvim-treesitter": { "branch": "master", "commit": "ccbaee59547425ef8b766433a6020ac191f3151f" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "0ec9a8e00cedfb52e3c2259b55f46a7c18fc2429" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "e6cc783b74606d97ca9eff6494e3f5c2ca603a50" },
   "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "375c2d86cee6674afd75b4f727ce3a80065552f7" },
-  "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },
+  "nvim-web-devicons": { "branch": "master", "commit": "9793801f974bba70e4ac5d7eae6c4f5659993d8e" },
   "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
   "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" },
-  "render-markdown.nvim": { "branch": "main", "commit": "bc8213ddcd91d2045cc3813df861adb93fbf2d2d" },
+  "render-markdown.nvim": { "branch": "main", "commit": "2f9d4f0be8784ed4fef5960eb7b80bf60c5fdf56" },
   "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" },
   "tagbar": { "branch": "master", "commit": "d55d454bd3d5b027ebf0e8c75b8f88e4eddad8d8" },
   "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" },

global/.config/nvim/lua/core/autocmds.lua

@@ -42,5 +42,5 @@ vim.api.nvim_create_autocmd({ "BufNewFile", "BufReadPre" }, {
 
 vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
 	pattern = "*.jrnl",
-	command = "set filetype=markdown",
+	command = "set filetype=jrnl",
 })

global/.config/nvim/lua/plugins/conform.lua

@@ -1,6 +1,19 @@
 return {
 	"stevearc/conform.nvim",
 	opts = {
+		log_level = vim.log.levels.DEBUG,
+		formatters = {
+			prettier_markdown = {
+				command = "prettier",
+				args = { "--stdin-filepath", "$FILENAME", "--config", os.getenv("HOME") .. "/.prettierrc.yaml" },
+				-- stdin = true,
+				-- options = {
+				-- 	ext_parsers = {
+				-- 		jrnl = { "markdown" },
+				-- 	},
+				-- },
+			},
+		},
 		icon = "", --'▎',
 		formatters_by_ft = {
 			lua = { "stylua" },
@@ -11,7 +24,8 @@ return {
 			typescriptreact = { "biome" },
 			json = { "biome" },
 			sh = { "shfmt" },
-			markdown = { "prettier" },
+			markdown = { "prettier_markdown" },
+			jrnl = { "prettier_markdown" },
 			["*"] = { "trim_whitespace", "codespell" },
 		},
 		format_on_save = {

global/.prettierrc.yaml

@@ -1 +1,5 @@
 proseWrap: "always"
+overrides:
+  - files: "*.jrnl"
+    options:
+      parser: markdown

global/.zshrc

@@ -1,6 +1,8 @@
 # Path to your oh-my-zsh installation.
 export ZSH="$HOME/.oh-my-zsh"
 
+setopt HIST_IGNORE_SPACE
+
 # Set name of the theme to load --- if set to "random", it will
 # load a random theme each time oh-my-zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
@@ -16,6 +18,8 @@ plugins=(git python tmux genpass web-search zsh-syntax-highlighting zsh-autosugg
 
 fpath+=${ZSH_CUSTOM:-${ZSH:-~/.oh-my-zsh}/custom}/plugins/zsh-completions/src
 
+commit_date=$(date +%Y%m%d)
+
 source $ZSH/oh-my-zsh.sh
 # functions
 ### ARCHIVE EXTRACTION
@@ -103,19 +107,22 @@ alias todo="todo.sh -d ~/Dropbox/TODO/todo.cfg"
 ## eton
 alias et="eton"
 alias zk="eton zk"
+alias di=" eton diary"
 ## toipe (https://github.com/Samyak2/toipe)
 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
 alias hledger='hledger -f ~/PKM/ledger/2024.journal'
+alias ehledger='nvim ~/PKM/ledger/2024.journal'
 ## other
 alias cclear="reset && tmux clear-history"
+## git
+alias s_diary="cd ~/PKM/diary/ && git commit -am '$commit_date' && git push origin master"
+alias s_ledger="cd ~/PKM/ledger/ && git commit -am '$commit_date' && git push origin master"
 
 # Preferred editor for local and remote sessions
 export EDITOR='nvim'