5 files changed, 17 insertions, 26 deletions
diff --git a/.bashrc b/.bashrc
index 5d26e67..11b6c04 100644
--- a/.bashrc
+++ b/.bashrc
@@ -6,7 +6,7 @@
 # anything or bad things will happen !
 
 safe_load() {
-	sh="$1" 
+	sh="$1"
 	[ -r "$sh" ] && . "$sh"
 	unset sh
 }
@@ -14,24 +14,14 @@ safe_load() {
 # Test for an interactive shell.  There is no need to set anything
 # past this point for scp and rcp, and it's important to refrain from
 # outputting anything in those cases.
-if [[ $- != *i* ]] ; then
+if [[ $- != *i* ]]; then
 	# Shell is non-interactive.  Be done now!
 	return
 fi
 
-# Make sure to also load ~/.profile for non-login shells
-safe_load ~/.profile
-
-# Spawn sway, if we are on tty1
-#if [[ "$(tty)" = "/dev/tty1" ]] ; then
-	# safe_load $HOME/.config/sway/env
-	# exec dbus-launch --exit-with-session sway -Ddamage=rerender
-#fi
-
-# Enable fzf integration
-# safe_load /etc/profile.d/fzf.sh
-# safe_load "$HOME"/devel/upstream/github.com/lincheney/fzf-tab-completion/bash/fzf-bash-completion.sh
-# bind -x '"\t": fzf_bash_completion'
+# enable bash vi mode
+set -o vi
+bind -m vi-insert -x '"\C-l": clear'
 
 # Append to history file
 shopt -s histappend
@@ -40,11 +30,12 @@ HISTFILESIZE=500000
 
 # enable direnv
 eval "$(direnv hook bash)"
-
+# enable navi
+eval "$(navi widget bash)"
 # enable z.lua
 if [ -d /usr/libexec/z_lua ]; then
 	eval "$(luajit /usr/libexec/z_lua/z.lua --init bash enhanced once fzf)"
-	safe_load /usr/libexec/z_lua/czmod/czmod.bash
+	# safe_load /usr/libexec/z_lua/czmod/czmod.bash
 fi
 
 # enable navi
@@ -83,7 +74,7 @@ alias ssh='TERM=xterm-256color ssh'
 alias balssh='ssh -p 22222 -o User=root -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o Compression=yes'
 alias balscp='scp -P 22222 -o User=root -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o Compression=yes'
 alias k=kubectl
-alias zk='f() { nvim +cd\ ~/.zk +lua\ "require(\"neuron/telescope\").find_zettels({ default_text = \"$1\" })"; }; f'
 alias org='nvim +Orgmode'
 alias suspend=loginctl\ suspend
 alias fm=vifm
+alias rsy=rsyncez
diff --git a/.profile b/.profile
index dc8abff..6d6288b 100644
--- a/.profile
+++ b/.profile
@@ -1,4 +1,3 @@
-
 # set xdg runtime dir if it's not defined
 if [ -z "${XDG_RUNTIME_DIR}" ]; then
 	export XDG_RUNTIME_DIR=/run/user/"$(id -u)"
@@ -54,13 +53,6 @@ fi
 
 . "$HOME/.config/sway/env"
 
-# Set prompt
-# export PS1="$(prompt)"
-
-# enable bash vi mode
-set -o vi
-bind -m vi-insert -x '"\C-l": clear'
-
 # set terminfo entry to use
 export TERM=foot
 # Parallel portage
@@ -80,5 +72,7 @@ export RSYNC_RSH='ssh -T -x -o Compression=no'
 export WEECHAT_HOME="${XDG_CONFIG_HOME}/weechat"
 # central bemenu config
 export BEMENU_OPTS='-i -n -m focused --fn "Iosevka Fixed SS08 10" --nb "#1c1c1c" --nf "#fffffb" --tb "#4E4371" --tf "#fffffb" --fb "#1c1c1c" --ff "#fffffb" --sb "#ddd23b" --sf "#1c1c1c" --hb "#4E4371" --hf "#fffffb" --scb "#1c1c1c" --scf "#4E4371"'
+# zettelkasten
+export ZK_NOTEBOOK_DIR=${HOME}/Documents/zk
 
 ## private use area:
diff --git a/.vim/after/ftplugin/lua.lua b/.vim/after/ftplugin/lua.lua
new file mode 100644
index 0000000..b2f7993
--- /dev/null
+++ b/.vim/after/ftplugin/lua.lua
@@ -0,0 +1,2 @@
+
+vim.bo.expandtab = true
diff --git a/.vim/after/ftplugin/mail.lua b/.vim/after/ftplugin/mail.lua
new file mode 100644
index 0000000..5e9b198
--- /dev/null
+++ b/.vim/after/ftplugin/mail.lua
@@ -0,0 +1,3 @@
+
+vim.opt.spell = true
+vim.opt.cursorline = false
diff --git a/.vim/after/ftplugin/tex.lua b/.vim/after/ftplugin/tex.lua
new file mode 100644
index 0000000..723d992
--- /dev/null
+++ b/.vim/after/ftplugin/tex.lua
@@ -0,0 +1 @@
+vim.bo.makeprg = 'latexmk -1 -n %'