diff --git a/config/bash/shell b/config/bash/shell index d43a740..1a2bc66 100644 --- a/config/bash/shell +++ b/config/bash/shell @@ -10,19 +10,16 @@ export SSH_ASKPASS_REQUIRE=prefer export CARGO_PATH="$HOME/.cargo" export BUN_INSTALL="$HOME/.bun" export PYENV_ROOT="$HOME/.pyenv" -export PNPM_HOME="$HOME/.local/share/pnpm" export NVM_DIR="$HOME/.nvm" export ANDROID_SDK_HOME="$HOME/.local/share/Android" export GOPATH="$HOME/.local/share/go" export DOTNETPATH="$HOME/.dotnet/tools" # Set complete path -export PATH="$HOME/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PANAMA_PATH/bin:$BUN_INSTALL/bin:$CARGO_PATH/bin:$PNPM_HOME:$PYENV_ROOT/bin:$HOME/.rbenv/bin:/usr/lib/ccache/bin/:$GOPATH/bin:$DOTNETPATH" +export PATH="$HOME/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PANAMA_PATH/bin:$BUN_INSTALL/bin:$CARGO_PATH/bin:$PYENV_ROOT/bin:$HOME/.rbenv/bin:/usr/lib/ccache/bin/:$GOPATH/bin:$DOTNETPATH" # Nvm -set -h -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm -[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion +source /etc/profile.d/nvm.sh # Zoxide eval "$(zoxide init bash)" diff --git a/config/dot/espanso/match/packages/markdown-shortcuts/README.md b/config/dot/espanso/match/packages/markdown-shortcuts/README.md index d0453ff..f18cb4d 100644 --- a/config/dot/espanso/match/packages/markdown-shortcuts/README.md +++ b/config/dot/espanso/match/packages/markdown-shortcuts/README.md @@ -1,22 +1,23 @@ # Available matches -| Trigger | Replace | -|--------------|--------------------------------------------------------| -| :block: | \```🖰\n``` | -| :code: | \`🖰` | -| :h1: | # | -| :h2: | ## | -| :h3: | ### | -| :h4: | #### | -| :h5: | ##### | -| :h6: | ###### | -| :bold: | \*\*🖰** | -| :italic: | \*🖰\* | -| :strike: | \~\~🖰~~ | -| :url: | \[🖰]() | -| :image: | !\[](🖰) | -| :horizontal: | ___\n | -| :task: | - [ ] | -| :donetask: | - [x] | -| :collapse: | \
\🖰\\n\

\n\n\

\n\
| +| Trigger | Replace | +|--------------|-----------------------------------------------------------------| +| :block: | \```🖰
``` | +| :code: | \`🖰` | +| :h1: | # | +| :h2: | ## | +| :h3: | ### | +| :h4: | #### | +| :h5: | ##### | +| :h6: | ###### | +| :bold: | \*\*🖰** | +| :italic: | \*🖰\* | +| :strike: | \~\~🖰~~ | +| :url: | \[🖰]() | +| :image: | !\[](🖰) | +| :horizontal: | ___
| +| :task: | - [ ] | +| :donetask: | - [x] | +| :collapse: | \

\\
🖱
\
| +| :comment: | \<\!--- 🖱 --> | -**Note: The 🖰 symbol is where your mouse cursor will be after the trigger and \n represents a new line.** \ No newline at end of file +**Note**: The symbol "🖰" denotes where your mouse cursor will be after the trigger. diff --git a/config/dot/espanso/match/packages/markdown-shortcuts/_manifest.yml b/config/dot/espanso/match/packages/markdown-shortcuts/_manifest.yml index 98ce55f..4915304 100644 --- a/config/dot/espanso/match/packages/markdown-shortcuts/_manifest.yml +++ b/config/dot/espanso/match/packages/markdown-shortcuts/_manifest.yml @@ -2,6 +2,6 @@ author: "Jos\xE9 Ferreira" description: A simple package to make writing Markdown easier name: markdown-shortcuts title: Markdown shortcuts -version: 0.1.0 +version: 0.2.0 homepage: "https://github.com/jpmvferreira/espanso-mega-pack" -tags: ["markdown", "development", "writing"] \ No newline at end of file +tags: ["markdown", "development", "writing"] diff --git a/config/dot/espanso/match/packages/markdown-shortcuts/package.yml b/config/dot/espanso/match/packages/markdown-shortcuts/package.yml index f3df025..e8e65b0 100644 --- a/config/dot/espanso/match/packages/markdown-shortcuts/package.yml +++ b/config/dot/espanso/match/packages/markdown-shortcuts/package.yml @@ -1,65 +1,83 @@ -name: markdown-shortcuts -parent: default - matches: - - triggers: [":block:", ":mb:"] + - trigger: ":block:" + label: "Markdown - Code block" replace: |- ```$|$ ``` force_clipboard: true - - triggers: [":code:", ":mc:"] + - trigger: ":code:" + label: "Markdown - Inline code" replace: |- `$|$` force_clipboard: true - trigger: ":h1:" + label: "Markdown - Header1" replace: "#" - trigger: ":h2:" + label: "Markdown - Header2" replace: "##" - trigger: ":h3:" + label: "Markdown - Header3" replace: "###" - trigger: ":h4:" + label: "Markdown - Header4" replace: "####" - trigger: ":h5:" + label: "Markdown - Header5" replace: "#####" - trigger: ":h6:" + label: "Markdown - Header6" replace: "######" - trigger: ":bold:" + label: "Markdown - Bold" replace: "**$|$**" - trigger: ":italic:" + label: "Markdown - Italic" replace: "*$|$*" - trigger: ":strike:" + label: "Markdown - Strikethrough" replace: "~~$|$~~" - trigger: ":url:" + label: "Markdown - URL" replace: "[$|$]()" - - triggers: [":image:", ":img:"] + - trigger: ":img:" + label: "Markdown - Image" replace: "![]($|$)" - - triggers: [":horizontal:", ":mh:"] + - trigger: ":horizontal:" + label: "Markdown - Horizontal line" replace: "___" - - triggers: [":task:", ":mt:"] + - trigger: ":task:" + label: "Markdown - Task" replace: "- [ ] " - - triggers: [":taskdone:", ":mtd:"] + - trigger: ":taskdone:" + label: "Markdown - Task completed" replace: "- [x] " - - triggers: [":collapse:", ":mcol:"] + - trigger: ":collapse:" + label: "Markdown - Collapse block" replace: |-
- $|$
force_clipboard: true + + - trigger: ":comment:" + label: "Markdown - Comment" + replace: "" + force_clipboard: true diff --git a/config/dot/nvim/lua/plugins/colors.lua b/config/dot/nvim/lua/plugins/colors.lua index cb2bac2..687000d 100644 --- a/config/dot/nvim/lua/plugins/colors.lua +++ b/config/dot/nvim/lua/plugins/colors.lua @@ -10,6 +10,10 @@ return { colors.fg_gutter = '#787f93' colors.terminal_black = '#828bb8' end, + on_highlights = function(hl, c) + hl['@markup.raw.markdown_inline'] = { bg = c.bg_highlight, fg = c.fg } + hl['RenderMarkdownCodeInline'] = { bg = c.bg_highlight, fg = c.fg } + end, }, config = function(_,opts) require'tokyonight'.setup(opts) diff --git a/config/dot/nvim/lua/plugins/lsp.lua b/config/dot/nvim/lua/plugins/lsp.lua index e4077e4..eb3d84e 100644 --- a/config/dot/nvim/lua/plugins/lsp.lua +++ b/config/dot/nvim/lua/plugins/lsp.lua @@ -38,10 +38,10 @@ return { { name = 'supermaven' }, --{ name = 'copilot' }, }, { - { name = 'buffer', keyword_length = 4 }, + --{ name = 'buffer', keyword_length = 4 }, { name = 'path' }, - { name = 'dotenv' }, - { name = 'emoji' }, + --{ name = 'dotenv' }, + --{ name = 'emoji' }, }), formatting = { format = lspkind.cmp_format({