From 6374995a04b1cda99055ec4433f7dfaf4e68c05b Mon Sep 17 00:00:00 2001
From: Solomon Laing <solomonlaing@protonmail.com>
Date: Tue, 17 Jan 2023 08:29:40 +1030
Subject: [PATCH] more updates

---
 .config/nvim/lua/lazyvim/plugins/neorg.lua    | 12 +----
 .config/nvim/lua/lazyvim/plugins/whichkey.lua |  2 +
 .config/shell/profile                         |  2 +-
 .config/zsh/.zshrc                            | 44 +++++++++----------
 4 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/.config/nvim/lua/lazyvim/plugins/neorg.lua b/.config/nvim/lua/lazyvim/plugins/neorg.lua
index 5fb3255..a2a74a0 100644
--- a/.config/nvim/lua/lazyvim/plugins/neorg.lua
+++ b/.config/nvim/lua/lazyvim/plugins/neorg.lua
@@ -11,8 +11,9 @@ return {
 			["core.norg.dirman"] = {
 				config = {
 					workspaces = {
-						work = "~/work/notes",
+						work = "~/work",
 						personal = "~/notes",
+						journal = "~/notes/journal/",
 					},
 				},
 			},
@@ -28,13 +29,4 @@ return {
 			},
 		},
 	},
-	-- keys = {
-	-- 	{
-	-- 		"<leader>nw",
-	-- 		function()
-	-- 			require("lazyvim.utils.neorg").workspace_switcher()
-	-- 		end,
-	-- 		desc = "Workspace",
-	-- 	},
-	-- },
 }
diff --git a/.config/nvim/lua/lazyvim/plugins/whichkey.lua b/.config/nvim/lua/lazyvim/plugins/whichkey.lua
index a5ce65e..2827034 100644
--- a/.config/nvim/lua/lazyvim/plugins/whichkey.lua
+++ b/.config/nvim/lua/lazyvim/plugins/whichkey.lua
@@ -78,6 +78,8 @@ return {
 				n = {
 					name = "+neorg",
 					n = { "<cmd>Neorg<cr>", "Open Neorg" },
+					c = { "<cmd>Neorg toggle-concealer<cr>", "Toggle Concealer" },
+					t = { "<cmd>Neorg tangle current-file<cr>", "Tangle Current File" },
 					j = { "<cmd>Neorg journal<cr>", "Open Neorg Journal" },
 					w = {
 						function()
diff --git a/.config/shell/profile b/.config/shell/profile
index 90a2cfd..88bcca3 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -60,7 +60,7 @@ export QT_QPA_PLATFORMTHEME="gtk2"	# Have QT use gtk2 theme.
 export MOZ_USE_XINPUT2="1"		# Mozilla smooth scrolling/touchpads.
 export AWT_TOOLKIT="MToolkit wmname LG3D"	#May have to install wmname
 export _JAVA_AWT_WM_NONREPARENTING=1	# Fix for Java applications in dwm
-export ZK_NOTEBOOK_DIR="$HOME/notes"
+export ZK_NOTEBOOK_DIR="$HOME/notes/zk"
 
 # This is the list for lf icons:
 export LF_ICONS="di=:\
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 3e82d60..92e6d32 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -30,10 +30,10 @@ ZSH_THEME="inkletblotsh"
 # "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
 # or set a custom format using the strftime function format specifications,
 # see 'man strftime' for details.
- HIST_STAMPS="yyyy-mm-dd"
+HIST_STAMPS="yyyy-mm-dd"
 
 # Would you like to use another custom folder than $ZSH/custom?
- ZSH_CUSTOM=/home/solomon/.config/zsh
+ZSH_CUSTOM=/home/solomon/.config/zsh
 
 # Which plugins would you like to load?
 # Standard plugins can be found in $ZSH/plugins/
@@ -41,21 +41,21 @@ ZSH_THEME="inkletblotsh"
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
 plugins=(git
-	battery
-	git-flow
-	git-prompt vi-mode)
+    battery
+    git-flow
+git-prompt vi-mode)
 
 source $ZSH/oh-my-zsh.sh
 
 # You may need to manually set your language environment
- export LANG=en_US.UTF-8
+export LANG=en_US.UTF-8
 
 # Preferred editor for local and remote sessions
- if [[ -n $SSH_CONNECTION ]]; then
-   export EDITOR='nano'
- else
-   export EDITOR='nvim'
- fi
+if [[ -n $SSH_CONNECTION ]]; then
+    export EDITOR='nano'
+else
+    export EDITOR='nvim'
+fi
 
 HISTSIZE=1000000
 SAVEHIST=1000000
@@ -78,13 +78,13 @@ bindkey -v '^?' backward-delete-char
 
 # use lf to switch directories and bind it to ctrl-l
 lfcd() {
-	tmp="$(mktemp -uq)"
-	trap 'rm -f $tmp >/dev/null 2>&1' HUP INT QUIT TERM PWR EXIT
-	lf -last-dir-path="$tmp" "$@"
-	if [ -f "$tmp" ]; then
-		dir="$(cat "$tmp")"
-		[ -d "$dir" ] && [ "$dir" != "$(pwd)" ] && cd "$dir"
-	fi
+    tmp="$(mktemp -uq)"
+    trap 'rm -f $tmp >/dev/null 2>&1' HUP INT QUIT TERM PWR EXIT
+    lf -last-dir-path="$tmp" "$@"
+    if [ -f "$tmp" ]; then
+        dir="$(cat "$tmp")"
+        [ -d "$dir" ] && [ "$dir" != "$(pwd)" ] && cd "$dir"
+    fi
 }
 
 bindkey -s '^o' '^ulfcd\n'
@@ -92,15 +92,15 @@ bindkey -s '^t' '^utms\n'
 bindkey -s '^n' '^uzk edit --interactive --sort modified-\n'
 
 if [ -f /etc/hostname ]; then
-	HOST=$(cat /etc/hostname)
+    HOST=$(cat /etc/hostname)
 else
-	HOST=$(hostname)
+    HOST=$(hostname)
 fi
 
 if [ "$HOST" = "holocene" ] ; then
-	source /usr/share/zsh/site-functions/zsh-syntax-highlighting.zsh
+    source /usr/share/zsh/site-functions/zsh-syntax-highlighting.zsh
 else
-	source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+    source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 fi
 
 # Dracula Theme (for zsh-syntax-highlighting)