diff --git a/nvim/.config/nvim/fnl/dots/keybinds.fnl b/nvim/.config/nvim/fnl/dots/keybinds.fnl index 0b4511a..de1895b 100644 --- a/nvim/.config/nvim/fnl/dots/keybinds.fnl +++ b/nvim/.config/nvim/fnl/dots/keybinds.fnl @@ -27,7 +27,7 @@ (utils.keymap :n : "lua vim.lsp.buf.definition()") (utils.keymap :n : "lua vim.lsp.buf.hover()") -(utils.keymap :n :c "\"+y") +(utils.keymap [:n :v] :c "\"+y") ;(utils.keymap :i : "(copilot-suggest)") diff --git a/nvim/.config/nvim/fnl/dots/plugins/obsidian.fnl b/nvim/.config/nvim/fnl/dots/plugins/obsidian.fnl new file mode 100644 index 0000000..f343517 --- /dev/null +++ b/nvim/.config/nvim/fnl/dots/plugins/obsidian.fnl @@ -0,0 +1,15 @@ +(local {: autoload : utils} (require :dots.prelude)) + +(local vault-path (.. (vim.fn.expand "~") "/Documents/obsidian-vault")) + +[(utils.plugin :epwalsh/obsidian.nvim + {:lazy true + :version "*" + :ft "markdown" + :event [(.. "BufReadPre " vault-path "/**.md") + (.. "BufNewFile " vault-path "/**.md")] + :dependencies ["nvim-lua/plenary.nvim"] + :opts {:workspaces [{:name "Vault" + :path vault-path}] + :completion {:nvim_cmp true}}})] + diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 4861e4b..b15e5ee 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -56,6 +56,7 @@ "nvim-web-devicons": { "branch": "master", "commit": "47103b80c38c59f7a1b5408c232b92bf5d018651" }, "nvim.lua": { "branch": "master", "commit": "5d57be0b6eea6c06977b1c5fe0752da909cf4154" }, "nvlime": { "branch": "master", "commit": "83606f7e2d017ee7fcafe4ed4bf91ac776705633" }, + "obsidian.nvim": { "branch": "main", "commit": "387f5cf90718b729e1e855e66dd272039395a6dc" }, "octo.nvim": { "branch": "master", "commit": "2e4cdb6faa3f05c85605c0074f471840747337da" }, "parinfer-rust": { "branch": "master", "commit": "0e4d52e712641ad351a1bfe6cee3d34d63ed087b" }, "parsley": { "branch": "main", "commit": "9a388fe9e8a443d9d892318b4cce6dd287c47e38" }, diff --git a/zsh/.config/zsh/.zprofile b/zsh/.config/zsh/.zprofile index 80569c8..5b46774 100644 --- a/zsh/.config/zsh/.zprofile +++ b/zsh/.config/zsh/.zprofile @@ -1 +1,4 @@ [ -f $HOME/.profile ] && . $HOME/.profile + +# Added by OrbStack: command-line tools and integration +source ~/.orbstack/shell/init.zsh 2>/dev/null || : diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc index c9888b4..7160f6f 100644 --- a/zsh/.config/zsh/.zshrc +++ b/zsh/.config/zsh/.zshrc @@ -138,3 +138,6 @@ export SDKMAN_DIR="$HOME/.sdkman" if [ -f '~/Downloads/google-cloud-sdk/path.zsh.inc' ]; then . '~/Downloads/google-cloud-sdk/path.zsh.inc'; fi if [ -f '~/Downloads/google-cloud-sdk/completion.zsh.inc' ]; then . '~/Downloads/google-cloud-sdk/completion.zsh.inc'; fi + +[[ -f '/Applications/Tailscale.app/Contents/MacOS/Tailscale' ]] && alias tailscale="/Applications/Tailscale.app/Contents/MacOS/Tailscale" +command -v jless >/dev/null && alias yless="jless --yaml" diff --git a/zsh/.config/zsh/fzf-tab.zsh b/zsh/.config/zsh/fzf-tab.zsh index 6d1fdf1..abd3917 100644 --- a/zsh/.config/zsh/fzf-tab.zsh +++ b/zsh/.config/zsh/fzf-tab.zsh @@ -11,7 +11,7 @@ FZF_TAB_COMMAND=( '--query=$query' # $query will be expanded to query string at runtime. '--header-lines=$#headers' # $#headers will be expanded to lines of headers at runtime ) -zstyle ':fzf-tab:*' command $FZF_TAB_COMMAND +zstyle ':fzf-tab:*' fzf-command $FZF_TAB_COMMAND zstyle ':completion:complete:*:options' sort false zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS} zstyle ':fzf-tab:complete:_zlua:*' query-string input