diff options
| author | Christian Segundo | 2024-01-20 23:56:23 +0100 |
|---|---|---|
| committer | Christian Segundo | 2024-01-20 23:56:23 +0100 |
| commit | e62c2c3c95855232f0211459966a45a098f46a43 (patch) | |
| tree | 15b8b4d03804d992c1f233b7d2ed41c06c332caa | |
| parent | 31f926041eb5e27f6b4d139d43149fa848371e5c (diff) | |
| download | dotfiles-master.tar.gz | |
86 files changed, 9 insertions, 2512 deletions
@@ -7,10 +7,7 @@ all: clean merge stow after_stow .PHONY: after_stow after_stow: - ln -nfs "$(PREFIX)/.nvim" "$(PREFIX)/.config/nvim" ln -nfs "$(PREFIX)/.zls.json" "$(PREFIX)/Library/Application Support/zls.json" - ln -nfs "$(PREFIX)/.gnupg-conf/gpg-agent.conf" "$(PREFIX)/.gnupg/gpg-agent.conf" - ln -nfs "$(PREFIX)/.gnupg-conf/gpg.conf" "$(PREFIX)/.gnupg/gpg.conf" .PHONY: stow stow: diff --git a/public/alacritty/.alacritty.toml b/public/alacritty/.alacritty.toml deleted file mode 100644 index 0d8e1ea..0000000 --- a/public/alacritty/.alacritty.toml +++ /dev/null @@ -1,413 +0,0 @@ -[[color_schemes.frappe.indexed_colors]] -color = "#EF9F76" -index = 16 - -[[color_schemes.frappe.indexed_colors]] -color = "#F2D5CF" -index = 17 - -[color_schemes.frappe.bright] -black = "#626880" -blue = "#8CAAEE" -cyan = "#81C8BE" -green = "#A6D189" -magenta = "#F4B8E4" -red = "#E78284" -white = "#A5ADCE" -yellow = "#E5C890" - -[color_schemes.frappe.cursor] -cursor = "#F2D5CF" -text = "#303446" - -[color_schemes.frappe.dim] -black = "#51576D" -blue = "#8CAAEE" -cyan = "#81C8BE" -green = "#A6D189" -magenta = "#F4B8E4" -red = "#E78284" -white = "#B5BFE2" -yellow = "#E5C890" - -[color_schemes.frappe.footer_bar] -background = "#A5ADCE" -foreground = "#303446" - -[color_schemes.frappe.hints.end] -background = "#A5ADCE" -foreground = "#303446" - -[color_schemes.frappe.hints.start] -background = "#E5C890" -foreground = "#303446" - -[color_schemes.frappe.normal] -black = "#51576D" -blue = "#8CAAEE" -cyan = "#81C8BE" -green = "#A6D189" -magenta = "#F4B8E4" -red = "#E78284" -white = "#B5BFE2" -yellow = "#E5C890" - -[color_schemes.frappe.primary] -background = "#303446" -bright_foreground = "#C6D0F5" -dim_foreground = "#C6D0F5" -foreground = "#C6D0F5" - -[color_schemes.frappe.search.focused_match] -background = "#A6D189" -foreground = "#303446" - -[color_schemes.frappe.search.matches] -background = "#A5ADCE" -foreground = "#303446" - -[color_schemes.frappe.selection] -background = "#F2D5CF" -text = "#303446" - -[color_schemes.frappe.vi_mode_cursor] -cursor = "#BABBF1" -text = "#303446" - -[[color_schemes.latte.indexed_colors]] -color = "#FE640B" -index = 16 - -[[color_schemes.latte.indexed_colors]] -color = "#DC8A78" -index = 17 - -[color_schemes.latte.bright] -black = "#6C6F85" -blue = "#1E66F5" -cyan = "#179299" -green = "#40A02B" -magenta = "#EA76CB" -red = "#D20F39" -white = "#BCC0CC" -yellow = "#DF8E1D" - -[color_schemes.latte.cursor] -cursor = "#DC8A78" -text = "#EFF1F5" - -[color_schemes.latte.dim] -black = "#5C5F77" -blue = "#1E66F5" -cyan = "#179299" -green = "#40A02B" -magenta = "#EA76CB" -red = "#D20F39" -white = "#ACB0BE" -yellow = "#DF8E1D" - -[color_schemes.latte.hints.end] -background = "#6C6F85" -foreground = "#EFF1F5" - -[color_schemes.latte.hints.start] -background = "#DF8E1D" -foreground = "#EFF1F5" - -[color_schemes.latte.normal] -black = "#5C5F77" -blue = "#1E66F5" -cyan = "#179299" -green = "#40A02B" -magenta = "#EA76CB" -red = "#D20F39" -white = "#ACB0BE" -yellow = "#DF8E1D" - -[color_schemes.latte.primary] -background = "#EFF1F5" -bright_foreground = "#4C4F69" -dim_foreground = "#4C4F69" -foreground = "#4C4F69" - -[color_schemes.latte.search.focused_match] -background = "#40A02B" -foreground = "#EFF1F5" - -[color_schemes.latte.search.footer_bar] -background = "#6C6F85" -foreground = "#EFF1F5" - -[color_schemes.latte.search.matches] -background = "#6C6F85" -foreground = "#EFF1F5" - -[color_schemes.latte.selection] -background = "#DC8A78" -text = "#EFF1F5" - -[color_schemes.latte.vi_mode_cursor] -cursor = "#7287FD" -text = "#EFF1F5" - -[[color_schemes.macchiato.indexed_colors]] -color = "#F5A97F" -index = 16 - -[[color_schemes.macchiato.indexed_colors]] -color = "#F4DBD6" -index = 17 - -[color_schemes.macchiato.bright] -black = "#5B6078" -blue = "#8AADF4" -cyan = "#8BD5CA" -green = "#A6DA95" -magenta = "#F5BDE6" -red = "#ED8796" -white = "#A5ADCB" -yellow = "#EED49F" - -[color_schemes.macchiato.cursor] -cursor = "#F4DBD6" -text = "#24273A" - -[color_schemes.macchiato.dim] -black = "#494D64" -blue = "#8AADF4" -cyan = "#8BD5CA" -green = "#A6DA95" -magenta = "#F5BDE6" -red = "#ED8796" -white = "#B8C0E0" -yellow = "#EED49F" - -[color_schemes.macchiato.hints.end] -background = "#A5ADCB" -foreground = "#24273A" - -[color_schemes.macchiato.hints.start] -background = "#EED49F" -foreground = "#24273A" - -[color_schemes.macchiato.normal] -black = "#494D64" -blue = "#8AADF4" -cyan = "#8BD5CA" -green = "#A6DA95" -magenta = "#F5BDE6" -red = "#ED8796" -white = "#B8C0E0" -yellow = "#EED49F" - -[color_schemes.macchiato.primary] -background = "#24273A" -bright_foreground = "#CAD3F5" -dim_foreground = "#CAD3F5" -foreground = "#CAD3F5" - -[color_schemes.macchiato.search.focused_match] -background = "#A6DA95" -foreground = "#24273A" - -[color_schemes.macchiato.search.footer_bar] -background = "#A5ADCB" -foreground = "#24273A" - -[color_schemes.macchiato.search.matches] -background = "#A5ADCB" -foreground = "#24273A" - -[color_schemes.macchiato.selection] -background = "#F4DBD6" -text = "#24273A" - -[color_schemes.macchiato.vi_mode_cursor] -cursor = "#B7BDF8" -text = "#24273A" - -[[color_schemes.mocha.indexed_colors]] -color = "#FAB387" -index = 16 - -[[color_schemes.mocha.indexed_colors]] -color = "#F5E0DC" -index = 17 - -[color_schemes.mocha.bright] -black = "#585B70" -blue = "#89B4FA" -cyan = "#94E2D5" -green = "#A6E3A1" -magenta = "#F5C2E7" -red = "#F38BA8" -white = "#A6ADC8" -yellow = "#F9E2AF" - -[color_schemes.mocha.cursor] -cursor = "#F5E0DC" -text = "#1E1E2E" - -[color_schemes.mocha.dim] -black = "#45475A" -blue = "#89B4FA" -cyan = "#94E2D5" -green = "#A6E3A1" -magenta = "#F5C2E7" -red = "#F38BA8" -white = "#BAC2DE" -yellow = "#F9E2AF" - -[color_schemes.mocha.hints.end] -background = "#A6ADC8" -foreground = "#1E1E2E" - -[color_schemes.mocha.hints.start] -background = "#F9E2AF" -foreground = "#1E1E2E" - -[color_schemes.mocha.normal] -black = "#45475A" -blue = "#89B4FA" -cyan = "#94E2D5" -green = "#A6E3A1" -magenta = "#F5C2E7" -red = "#F38BA8" -white = "#BAC2DE" -yellow = "#F9E2AF" - -[color_schemes.mocha.primary] -background = "#1E1E2E" -bright_foreground = "#CDD6F4" -dim_foreground = "#CDD6F4" -foreground = "#CDD6F4" - -[color_schemes.mocha.search.focused_match] -background = "#A6E3A1" -foreground = "#1E1E2E" - -[color_schemes.mocha.search.footer_bar] -background = "#A6ADC8" -foreground = "#1E1E2E" - -[color_schemes.mocha.search.matches] -background = "#A6ADC8" -foreground = "#1E1E2E" - -[color_schemes.mocha.selection] -background = "#F5E0DC" -text = "#1E1E2E" - -[color_schemes.mocha.vi_mode_cursor] -cursor = "#B4BEFE" -text = "#1E1E2E" - -[[colors.indexed_colors]] -color = "#EF9F76" -index = 16 - -[[colors.indexed_colors]] -color = "#F2D5CF" -index = 17 - -[colors.bright] -black = "#626880" -blue = "#8CAAEE" -cyan = "#81C8BE" -green = "#A6D189" -magenta = "#F4B8E4" -red = "#E78284" -white = "#A5ADCE" -yellow = "#E5C890" - -[colors.cursor] -cursor = "#F2D5CF" -text = "#303446" - -[colors.dim] -black = "#51576D" -blue = "#8CAAEE" -cyan = "#81C8BE" -green = "#A6D189" -magenta = "#F4B8E4" -red = "#E78284" -white = "#B5BFE2" -yellow = "#E5C890" - -[colors.footer_bar] -background = "#A5ADCE" -foreground = "#303446" - -[colors.hints.end] -background = "#A5ADCE" -foreground = "#303446" - -[colors.hints.start] -background = "#E5C890" -foreground = "#303446" - -[colors.normal] -black = "#51576D" -blue = "#8CAAEE" -cyan = "#81C8BE" -green = "#A6D189" -magenta = "#F4B8E4" -red = "#E78284" -white = "#B5BFE2" -yellow = "#E5C890" - -[colors.primary] -background = "#303446" -bright_foreground = "#C6D0F5" -dim_foreground = "#C6D0F5" -foreground = "#C6D0F5" - -[colors.search.focused_match] -background = "#A6D189" -foreground = "#303446" - -[colors.search.matches] -background = "#A5ADCE" -foreground = "#303446" - -[colors.selection] -background = "#F2D5CF" -text = "#303446" - -[colors.vi_mode_cursor] -cursor = "#BABBF1" -text = "#303446" - -[cursor.style] -blinking = "Always" -shape = "Block" - -[env] -TERM = "xterm-256color" - -[font] -size = 14.0 - -[font.bold] -family = "ComicCodeLigatures Nerd Font" -style = "Bold" - -[font.bold_italic] -family = "ComicCodeLigatures Nerd Font" -style = "Bold Italic" - -[font.italic] -family = "ComicCodeLigatures Nerd Font" -style = "Italic" - -[font.normal] -family = "ComicCodeLigatures Nerd Font" - -[[keyboard.bindings]] -chars = "\u001E" -key = "Key6" -mods = "Control" - -[window] -dynamic_title = true -title = "Terminal" diff --git a/public/brew/.brewfile b/public/brew/.brewfile index b79c803..ed4ff2a 100644 --- a/public/brew/.brewfile +++ b/public/brew/.brewfile @@ -7,125 +7,51 @@ tap "homeport/tap" tap "homebrew/cask-versions" tap "segundo/tap", "https://git.segundo.io/homebrew-tap" tap "fsouza/prettierd" -brew "age" -brew "ansible" -brew "ansible-lint" -brew "antigen" -brew "automake" -brew "autopep8" -brew "awscli" -brew "bash" -brew "bash-language-server" -brew "bats-core" -brew "bear" -brew "coreutils" -brew "ffmpeg" -brew "findutils" -brew "flake8" brew "flyctl" brew "fsouza/prettierd/prettierd" -brew "fzf" -brew "gawk" brew "geckodriver" brew "ghz" -brew "git" -brew "git-crypt" -brew "git-lfs" brew "glab" -brew "gmailctl" -brew "gnu-sed" -brew "gnuplot" brew "gnutls" brew "go" -brew "gofumpt" -brew "golangci-lint" -brew "gopls" -brew "goss", args: ["HEAD"] -brew "grep" -brew "grpcurl" -brew "hadolint" brew "harfbuzz" -brew "hashicorp/tap/terraform-ls" -brew "hcl2json" -brew "helm" -brew "jq" brew "kind" -brew "kubernetes-cli" -brew "ledger" brew "linkerd" brew "linkerd@2.11.5" -brew "lua-language-server" -brew "make" -brew "mandoc" -brew "markdownlint-cli2" brew "minikube" -brew "neovim", args: ["HEAD"] brew "node" -brew "node@16" brew "opa" -brew "pandoc" -brew "parallel" -brew "pass" -brew "pass-otp" -brew "perltidy" -brew "pinentry-mac" brew "platformio" -brew "poetry" +brew "bear" +brew "swiftformat" brew "prometheus" brew "protobuf" -brew "pwgen" -brew "pyright" -brew "python-build" -brew "python-yq" -brew "rclone" -brew "ripgrep" brew "rust" brew "segundo/tap/kontext" brew "segundo/tap/krash" -brew "selene" -brew "shellcheck" -brew "shfmt" -brew "skopeo" brew "slides" brew "solargraph" -brew "stylua" -brew "swaks" -brew "swiftformat" brew "swiftlint" brew "telnet" brew "terraform" brew "terraform@1.2.9" -brew "tfsec" -brew "tmux" -brew "tree" -brew "trivy" -brew "twine-pypi" -brew "typescript-language-server" -brew "vale" brew "virt-manager" -brew "watch" brew "web-ext" -brew "wget" -brew "yaml-language-server" -brew "yamllint" brew "zig", args: ["HEAD"] -brew "zsh" cask "1password" -cask "steam" cask "1password-cli1" -cask "alacritty" cask "authy" cask "bitwarden" cask "discord" +cask "docker" cask "firefox" cask "gimp" cask "github" cask "google-cloud-sdk" -cask "gpg-suite-no-mail" -cask "docker" cask "rectangle" cask "skitch" cask "slack" +cask "steam" cask "sublime-merge" cask "the-unarchiver" cask "thunderbird" diff --git a/public/git/.git_template/hooks/post-commit b/public/git/.git_template/hooks/post-commit deleted file mode 100755 index 82f44ec..0000000 --- a/public/git/.git_template/hooks/post-commit +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -### lolcommits hook (begin) ### -LANG="" && PATH="$PATH:/usr/bin:/usr/local/bin" && if [ ! -d "$GIT_DIR/rebase-merge" ] && [ "$LOLCOMMITS_CAPTURE_DISABLED" != "true" ]; then lolcommits --capture --device 'Logitech StreamCam' --fork; fi -### lolcommits hook (end) ### diff --git a/public/git/.gitconfig b/public/git/.gitconfig deleted file mode 100644 index 61d7614..0000000 --- a/public/git/.gitconfig +++ /dev/null @@ -1,24 +0,0 @@ -[filter "lfs"] - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - required = true -[user] - name = Christian Segundo - email = christian.segundo@cabify.com - signingkey = 0x8B6B1A3CF906CCEC -[commit] - gpgsign = 1 -[diff] - tool = nvimdiff -[core] - excludesfile = ~/.gitignore_global -[pull] - rebase = false -[push] - autoSetupRemote = true -[init] - templatedir = ~/.git_template - defaultBranch = master -[include] - path = ~/.gitconfig_cabify diff --git a/public/git/.gitignore_global b/public/git/.gitignore_global deleted file mode 100644 index a66ce3d..0000000 --- a/public/git/.gitignore_global +++ /dev/null @@ -1,5 +0,0 @@ -.DS_Store -.vscode -zig-cache -zig-out -venv diff --git a/public/gpg/.gnupg-conf/gpg-agent.conf b/public/gpg/.gnupg-conf/gpg-agent.conf deleted file mode 100644 index ca08738..0000000 --- a/public/gpg/.gnupg-conf/gpg-agent.conf +++ /dev/null @@ -1,3 +0,0 @@ -default-cache-ttl 600 -max-cache-ttl 7200 -pinentry-program /opt/homebrew/bin/pinentry-mac diff --git a/public/gpg/.gnupg-conf/gpg.conf b/public/gpg/.gnupg-conf/gpg.conf deleted file mode 100644 index ff4a19b..0000000 --- a/public/gpg/.gnupg-conf/gpg.conf +++ /dev/null @@ -1,3 +0,0 @@ -auto-key-retrieve -no-emit-version -default-key 5C33B928B8E5F18A1F23D9AB8B6B1A3CF906CCEC diff --git a/public/nvim/.nvim/.gitignore b/public/nvim/.nvim/.gitignore deleted file mode 100644 index 9bbbeea..0000000 --- a/public/nvim/.nvim/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.luarc.json diff --git a/public/nvim/.nvim/.null-ls-root b/public/nvim/.nvim/.null-ls-root deleted file mode 100644 index e69de29..0000000 --- a/public/nvim/.nvim/.null-ls-root +++ /dev/null diff --git a/public/nvim/.nvim/ftdetect/hcl.vim b/public/nvim/.nvim/ftdetect/hcl.vim deleted file mode 100644 index 1cb3a05..0000000 --- a/public/nvim/.nvim/ftdetect/hcl.vim +++ /dev/null @@ -1,7 +0,0 @@ -" Stolen from https://github.com/hashivim/vim-terraform/blob/master/ftdetect/hcl.vim -" By default Vim doesn't recognize .tf files as Terraform -silent! autocmd! filetypedetect BufRead,BufNewFile *.tf -autocmd BufRead,BufNewFile *.hcl set filetype=hcl -autocmd BufRead,BufNewFile .terraformrc,terraform.rc set filetype=hcl -autocmd BufRead,BufNewFile *.tf,*.tfvars set filetype=terraform -autocmd BufRead,BufNewFile *.tfstate,*.tfstate.backup set filetype=json diff --git a/public/nvim/.nvim/ftdetect/jq.vim b/public/nvim/.nvim/ftdetect/jq.vim deleted file mode 100644 index bd364c8..0000000 --- a/public/nvim/.nvim/ftdetect/jq.vim +++ /dev/null @@ -1,3 +0,0 @@ -" https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#jqls -autocmd BufRead,BufNewFile *.jq set filetype=jq -autocmd BufRead,BufNewFile *.yq set filetype=jq diff --git a/public/nvim/.nvim/ftdetect/term.lua b/public/nvim/.nvim/ftdetect/term.lua deleted file mode 100644 index 5124399..0000000 --- a/public/nvim/.nvim/ftdetect/term.lua +++ /dev/null @@ -1,6 +0,0 @@ -vim.api.nvim_create_autocmd({ "TermOpen" }, { - pattern = { "*" }, - callback = function(_) - vim.o.ft = "term" - end, -}) diff --git a/public/nvim/.nvim/ftplugin/groovy.lua b/public/nvim/.nvim/ftplugin/groovy.lua deleted file mode 100644 index ae8636a..0000000 --- a/public/nvim/.nvim/ftplugin/groovy.lua +++ /dev/null @@ -1,6 +0,0 @@ -local l = vim.opt_local - -l.expandtab = true -l.smartindent = false -l.tabstop = 4 -l.shiftwidth = 4 diff --git a/public/nvim/.nvim/ftplugin/markdown.lua b/public/nvim/.nvim/ftplugin/markdown.lua deleted file mode 100644 index 84da7b9..0000000 --- a/public/nvim/.nvim/ftplugin/markdown.lua +++ /dev/null @@ -1,5 +0,0 @@ -local l = vim.opt_local - -l.conceallevel = 2 -l.wrap = true -l.spell = true diff --git a/public/nvim/.nvim/ftplugin/norg.lua b/public/nvim/.nvim/ftplugin/norg.lua deleted file mode 100644 index ae6a7ea..0000000 --- a/public/nvim/.nvim/ftplugin/norg.lua +++ /dev/null @@ -1,3 +0,0 @@ -local l = vim.opt_local - -l.conceallevel = 3 diff --git a/public/nvim/.nvim/ftplugin/sh.lua b/public/nvim/.nvim/ftplugin/sh.lua deleted file mode 100644 index 51e5fc1..0000000 --- a/public/nvim/.nvim/ftplugin/sh.lua +++ /dev/null @@ -1,6 +0,0 @@ -local l = vim.opt_local - -l.expandtab = false -l.smartindent = true -l.tabstop = 8 -l.shiftwidth = 8 diff --git a/public/nvim/.nvim/ftplugin/term.lua b/public/nvim/.nvim/ftplugin/term.lua deleted file mode 100644 index 84faba2..0000000 --- a/public/nvim/.nvim/ftplugin/term.lua +++ /dev/null @@ -1,5 +0,0 @@ -local l = vim.opt_local - -l.number = false -l.relativenumber = false -l.colorcolumn = nil diff --git a/public/nvim/.nvim/ftplugin/zig.vim b/public/nvim/.nvim/ftplugin/zig.vim deleted file mode 100644 index d20fab2..0000000 --- a/public/nvim/.nvim/ftplugin/zig.vim +++ /dev/null @@ -1 +0,0 @@ -setlocal foldmethod=expr foldexpr=nvim_treesitter#foldexpr() diff --git a/public/nvim/.nvim/indent/groovy.vim b/public/nvim/.nvim/indent/groovy.vim deleted file mode 100644 index 9a06798..0000000 --- a/public/nvim/.nvim/indent/groovy.vim +++ /dev/null @@ -1,164 +0,0 @@ -" https://github.com/modille/groovy.vim/blob/master/indent/groovy.vim -" Vim indent file -" Language: Groovy -" Maintainer: Toby Allsopp <toby.allsopp@peace.com> (resigned) -" Last Change: 2005 Mar 28 - -" Only load this indent file when no other was loaded. -if exists("b:did_indent") - finish -endif -let b:did_indent = 1 - -" Indent Groovy anonymous classes correctly. -setlocal cindent cinoptions& cinoptions+=j1 - -" The "extends" and "implements" lines start off with the wrong indent. -setlocal indentkeys& indentkeys+=0=extends indentkeys+=0=implements - -" Set the function to do the work. -setlocal indentexpr=GetGroovyIndent() - -let b:undo_indent = "set cin< cino< indentkeys< indentexpr<" - -" Only define the function once. -if exists("*GetGroovyIndent") - finish -endif - -function! SkipGroovyBlanksAndComments(startline) - let lnum = a:startline - while lnum > 1 - let lnum = prevnonblank(lnum) - if getline(lnum) =~ '\*/\s*$' - while getline(lnum) !~ '/\*' && lnum > 1 - let lnum = lnum - 1 - endwhile - if getline(lnum) =~ '^\s*/\*' - let lnum = lnum - 1 - else - break - endif - elseif getline(lnum) =~ '^\s*//' - let lnum = lnum - 1 - else - break - endif - endwhile - return lnum -endfunction - -function GetGroovyIndent() - - " Groovy is just like C; use the built-in C indenting and then correct a few - " specific cases. - let theIndent = cindent(v:lnum) - - " If we're in the middle of a comment then just trust cindent - if getline(v:lnum) =~ '^\s*\*' - return theIndent - endif - - - " find start of previous line, in case it was a continuation line - let lnum = SkipGroovyBlanksAndComments(v:lnum - 1) - let prev = lnum - while prev > 1 - let next_prev = SkipGroovyBlanksAndComments(prev - 1) - if getline(next_prev) !~ ',\s*$' - break - endif - let prev = next_prev - endwhile - - - " Try to align "throws" lines for methods and "extends" and "implements" for - " classes. - if getline(v:lnum) =~ '^\s*\(extends\|implements\)\>' - \ && getline(lnum) !~ '^\s*\(extends\|implements\)\>' - let theIndent = theIndent + &sw - endif - - " correct for continuation lines of "throws", "implements" and "extends" - let cont_kw = matchstr(getline(prev), - \ '^\s*\zs\(throws\|implements\|extends\)\>\ze.*,\s*$') - if strlen(cont_kw) > 0 - let amount = strlen(cont_kw) + 1 - if getline(lnum) !~ ',\s*$' - let theIndent = theIndent - (amount + &sw) - if theIndent < 0 - let theIndent = 0 - endif - elseif prev == lnum - let theIndent = theIndent + amount - if cont_kw ==# 'throws' - let theIndent = theIndent + &sw - endif - endif - elseif getline(prev) =~ '^\s*\(throws\|implements\|extends\)\>' - \ && (getline(prev) =~ '{\s*$' - \ || getline(v:lnum) =~ '^\s*{\s*$') - let theIndent = theIndent - &sw - endif - - " When the line starts with a }, try aligning it with the matching {, - " skipping over "throws", "extends" and "implements" clauses. - if getline(v:lnum) =~ '^\s*}\s*\(//.*\|/\*.*\)\=$' - call cursor(v:lnum, 1) - silent normal % - let lnum = line('.') - if lnum < v:lnum - while lnum > 1 - let next_lnum = SkipGroovyBlanksAndComments(lnum - 1) - if getline(lnum) !~ '^\s*\(throws\|extends\|implements\)\>' - \ && getline(next_lnum) !~ ',\s*$' - break - endif - let lnum = prevnonblank(next_lnum) - endwhile - return indent(lnum) - endif - endif - - " Below a line starting with "}" never indent more. Needed for a method - " below a method with an indented "throws" clause. - let lnum = SkipGroovyBlanksAndComments(v:lnum - 1) - if getline(lnum) =~ '^\s*}\s*\(//.*\|/\*.*\)\=$' && indent(lnum) < theIndent - let theIndent = indent(lnum) - endif - - " Fixed several indent problem - if theIndent > indent(lnum) - " if no '{ -> ( if else' , then same indent as previous line - if getline(lnum) !~ '[\{>\(]\s*$' && getline(lnum) !~ '\s*\(if\|else\)\s*' - let theIndent = indent(lnum) - endif - - " if last line end with ( - if getline(lnum) =~ '[\(]\s*$' - let theIndent = indent(lnum) + &sw - endif - endif - - " indent the ')' line with ( line - if getline(v:lnum) =~ '^\s*)' - call cursor(v:lnum, 1) - silent normal % - let lnum = line('.') - if lnum < v:lnum - while lnum > 1 - let next_lnum = SkipGroovyBlanksAndComments(lnum - 1) - if getline(lnum) !~ '^\s*\(throws\|extends\|implements\)\>' - \ && getline(next_lnum) !~ ',\s*$' - break - endif - let lnum = prevnonblank(next_lnum) - endwhile - return indent(lnum) - endif - endif - - return theIndent -endfunction - -" vi: sw=2 et diff --git a/public/nvim/.nvim/init.lua b/public/nvim/.nvim/init.lua deleted file mode 100644 index b0648b1..0000000 --- a/public/nvim/.nvim/init.lua +++ /dev/null @@ -1,48 +0,0 @@ -require("core") ---require("plugins") - -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) -end -vim.opt.rtp:prepend(lazypath) - -require("lazy").setup({ - spec = { - { import = "plugins.core" }, - { import = "plugins.eyecandy" }, - { import = "plugins.lsp" }, - { import = "plugins.lang" }, - { import = "plugins.extra.copilot" }, - { import = "plugins.extra.vim-fugitive" }, - --{ import = "plugins.extra.feline" }, - }, - change_detection = { - enabled = true, - notify = false, - }, -}) - ---vim.api.nvim_create_autocmd({ "BufEnter", "BufRead" }, { ---pattern = { "*" }, ---callback = function(args) ---local file_size = vim.fn.getfsize(args.file) -----vim.api.nvim_buf_get_lines(buf, firstline, new_lastline, false) -----nvim_buf_get_lines({buffer}, {start}, {end}, {strict_indexing}) ---if file_size > 1024 * 1024 then ---pcall(vim.cmd, "TSBufDisable highlight") ---pcall(vim.cmd, "syntax off") ---pcall(vim.cmd, "syntax clear") ---pcall(vim.cmd, "IlluminatePauseBuf") ---pcall(vim.cmd, "IndentBlanklineDisable") ---pcall(vim.cmd, "NoMatchParen") ---end ---end, ---}) diff --git a/public/nvim/.nvim/lazy-lock.json b/public/nvim/.nvim/lazy-lock.json deleted file mode 100644 index 11ac60a..0000000 --- a/public/nvim/.nvim/lazy-lock.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "LuaSnip": { "branch": "master", "commit": "6a001360cea89df50f7c5cc8c7a75e6a21f1ef5c" }, - "auto-session": { "branch": "main", "commit": "51196ca66b38fc1660fdf50031cb0b31a199b7c9" }, - "catppuccin": { "branch": "main", "commit": "079500a625f3ae5aa6efb758f1a17fe4c7a57e52" }, - "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" }, - "cmp-ledger": { "branch": "main", "commit": "48adfa1ab74cc731d98e1dc6056734742bf87053" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "dcaaed5b58e6c2d395bca18d25d34e6384856722" }, - "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, - "fugitive-gitlab.vim": { "branch": "master", "commit": "55fed481c0309b3405dd3d72921d687bf36873a8" }, - "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, - "indent-blankline.nvim": { "branch": "master", "commit": "d4c718467d35bc93714425a7102d82e7e5065280" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, - "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "neodev.nvim": { "branch": "main", "commit": "40b608b31f3da728e298051c4bf579d8e8a84294" }, - "nerdcommenter": { "branch": "master", "commit": "da948e160d9f54c2967c7927b9c74c5a68c8dc49" }, - "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, - "nvim-lspconfig": { "branch": "master", "commit": "84f2dd42efffa20d505ac44c78568d778ca7e0a1" }, - "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, - "nvim-tree.lua": { "branch": "master", "commit": "141c0f97c35f274031294267808ada59bb5fb08e" }, - "nvim-treesitter": { "branch": "master", "commit": "5a713474e38a3999b85c6cb3f5cac3248a16c7d0" }, - "nvim-web-devicons": { "branch": "master", "commit": "a1425903ab52a0a0460622519e827f224e5b4fee" }, - "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, - "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, - "promqlfmt.nvim": { "branch": "master", "commit": "bc2ce7bec385ccca278cace3979ec43d2ce2a94d" }, - "tabline.vim": { "branch": "master", "commit": "69c9698a3240860adaba93615f44778a9ab724b4" }, - "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "8e0543365fe5781c9babea7db89ef06bcff3716d" }, - "telescope.nvim": { "branch": "master", "commit": "6213322ab56eb27356fdc09a5078e41e3ea7f3bc" }, - "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, - "vim-ansible-vault": { "branch": "master", "commit": "a1555221bcd361daf385a8d2ae9024f48c3fd8db" }, - "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, - "vim-go": { "branch": "master", "commit": "e8c18054cc44973ee4f59ee463dda4bf6439713c" }, - "vim-helm": { "branch": "master", "commit": "fc2259e1f8836304a0526853ddc3fe27045be39a" }, - "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" }, - "vim-jsonnet": { "branch": "master", "commit": "4ebc6619ddce5d032a985b42a9864154c3d20e4a" }, - "vim-ledger": { "branch": "master", "commit": "281346a221434574dd7f8767a352b2bf0b218b74" }, - "vim-markdown": { "branch": "master", "commit": "46add6c3017d3e4035dc10ffa9cb54221d8dfe1a" }, - "vim-markdown-runner": { "branch": "master", "commit": "8afc2b63e6b5856779647962b4de7093d3ae1c52" }, - "vim-markdown-toc": { "branch": "master", "commit": "0e2c7cdc3ac1d067eb309a10220d001bb7be39cd" }, - "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, - "vim-tmux-navigator": { "branch": "master", "commit": "7db70e08ea03b3e4d91f63713d76134512e28d7e" }, - "virt-column.nvim": { "branch": "master", "commit": "b62b4ef0774d19452d4ed18e473e824c7a756f2f" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } -}
\ No newline at end of file diff --git a/public/nvim/.nvim/lua/core/disable_builtin.lua b/public/nvim/.nvim/lua/core/disable_builtin.lua deleted file mode 100644 index ea546ba..0000000 --- a/public/nvim/.nvim/lua/core/disable_builtin.lua +++ /dev/null @@ -1,16 +0,0 @@ -vim.g.loaded_gzip = 1 -vim.g.loaded_zip = 1 -vim.g.loaded_zipPlugin = 1 -vim.g.loaded_tar = 1 -vim.g.loaded_tarPlugin = 1 - -vim.g.loaded_getscript = 1 -vim.g.loaded_getscriptPlugin = 1 -vim.g.loaded_vimball = 1 -vim.g.loaded_vimballPlugin = 1 -vim.g.loaded_2html_plugin = 1 - -vim.g.loaded_matchit = 1 -vim.g.loaded_matchparen = 1 -vim.g.loaded_logiPat = 1 -vim.g.loaded_rrhelper = 1 diff --git a/public/nvim/.nvim/lua/core/init.lua b/public/nvim/.nvim/lua/core/init.lua deleted file mode 100644 index 3c34282..0000000 --- a/public/nvim/.nvim/lua/core/init.lua +++ /dev/null @@ -1,64 +0,0 @@ ------------------------------------------------------------ --- General ------------------------------------------------------------ -vim.opt.mouse = "a" -- Enable mouse support -vim.opt.clipboard = "unnamedplus" -- Copy/paste to system clipboard -vim.opt.termguicolors = true -- Enable 24-bit RGB colors -vim.o.background = "light" -vim.opt.hidden = true -vim.opt.number = true -vim.o.cursorlineopt = "both" -vim.opt.conceallevel = 0 -vim.opt.relativenumber = true -vim.opt.showcmd = true -vim.opt.showmode = true -vim.opt.colorcolumn = "80" -vim.opt.cursorline = true -vim.opt.foldlevelstart = 99 -vim.opt.showtabline = 1 -vim.opt.laststatus = 3 -- Single status line across all buffers -vim.opt.undofile = true -vim.opt.list = true -- Show some invisible characters like tabs -vim.opt.undodir = vim.fn.stdpath("config") .. "/undo" -vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal" --- TODO make it pretty with the highlights ---vim.opt.winbar = '%!luaeval("_winbar()")' -- The winbar text, I don't know if it is possible to embed it directly here :( ---vim.opt.winbar = "%=%m %t%=" ------------------------------------------------------------ --- Tabs, indent ------------------------------------------------------------ -vim.opt.expandtab = true -- Use spaces instead of tabs -vim.opt.shiftwidth = 2 -- Shift 4 spaces when tab -vim.opt.tabstop = 2 -- 1 tab == 4 spaces -vim.opt.smartindent = true -- Autoindent new lines - ------------------------------------------------------------ --- Custom keymaps ------------------------------------------------------------ -vim.api.nvim_set_keymap("i", "jk", "<Esc>", {}) -- Use jk to exit insert mode -vim.api.nvim_set_keymap("i", "kj", "<Esc>", {}) -- Use kj to exit insert mode -vim.api.nvim_set_keymap("t", "jk", "<Esc>", {}) -- Use jk to exit terminal mode -vim.api.nvim_set_keymap("t", "kj", "<Esc>", {}) -- Use kj to exit terminal mode -vim.api.nvim_set_keymap("t", "<Esc>", "<C-\\><C-n>", { noremap = true }) -- Use Esc to exit terminal mode - -vim.api.nvim_set_keymap("i", "<C-t>", "<Esc>:tabnew<CR>", {}) -- New tab -vim.api.nvim_set_keymap("n", "<C-t>", ":tabnew<CR>", {}) -- New tab - --- No arrow keys for movement ---nnoremap <up> <nop> ---nnoremap <down> <nop> ---inoremap <up> <nop> ---inoremap <down> <nop> ---inoremap <left> <nop> ---inoremap <right> <nop> - ---Left and right to switch buffers ---nnoremap <left> :bp<CR> ---nnoremap <right> :bn<CR> - ---_winbar = function() -- My custom winbar text ---local filename = vim.fn.expand('%') ---return string.gsub(filename, 'term://.*:', '') ---end - -require("core.disable_builtin") diff --git a/public/nvim/.nvim/lua/plugins/core/auto-session.lua b/public/nvim/.nvim/lua/plugins/core/auto-session.lua deleted file mode 100644 index 9bfcac0..0000000 --- a/public/nvim/.nvim/lua/plugins/core/auto-session.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "rmagatti/auto-session", - config = function() - require("auto-session").setup({ log_level = "info" }) - end, -} diff --git a/public/nvim/.nvim/lua/plugins/core/gitsigns.lua b/public/nvim/.nvim/lua/plugins/core/gitsigns.lua deleted file mode 100644 index e856855..0000000 --- a/public/nvim/.nvim/lua/plugins/core/gitsigns.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - "lewis6991/gitsigns.nvim", - event = { "BufRead" }, - config = function() - require("gitsigns").setup() - end, - dependencies = { "nvim-lua/plenary.nvim" }, -} diff --git a/public/nvim/.nvim/lua/plugins/core/luasnip.lua b/public/nvim/.nvim/lua/plugins/core/luasnip.lua deleted file mode 100644 index 622af58..0000000 --- a/public/nvim/.nvim/lua/plugins/core/luasnip.lua +++ /dev/null @@ -1,50 +0,0 @@ -return { - { - "L3MON4D3/LuaSnip", - dependencies = { "rafamadriz/friendly-snippets" }, - build = "make install_jsregexp", - config = function() - local ls = require("luasnip") - local types = require("luasnip.util.types") - - ls.config.set_config({ - history = true, - updateevents = "TextChanged,TextChangedI", - enable_autosnippets = true, - ext_opts = { - [types.choiceNode] = { - active = { - virt_text = { { "<-", "Error" } }, - }, - }, - }, - }) - - -- luasnip keymaps are defined as cmp keymaps - - vim.keymap.set( - "n", - "<leader><leader>s", - '<cmd>lua require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/lua/snippets" })<CR>' - ) - - require("luasnip.loaders.from_lua").lazy_load({ paths = "~/.config/nvim/lua/snippets" }) - end, - }, - - -- VSCode like (JSON) snippets - -- For the full list of supported languages see: - -- https://github.com/rafamadriz/friendly-snippets/blob/main/package.json - { - "rafamadriz/friendly-snippets", - opts = { include = {} }, - config = function(_, opts) - if #opts.include == 0 then - return - end - - opts.path = "~/.local/share/nvim/lazy/friendly-snippets" - require("luasnip.loaders.from_vscode").lazy_load(opts) - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/core/nerdcommenter.lua b/public/nvim/.nvim/lua/plugins/core/nerdcommenter.lua deleted file mode 100644 index 720b3d2..0000000 --- a/public/nvim/.nvim/lua/plugins/core/nerdcommenter.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - "preservim/nerdcommenter", - init = function() - vim.g.NERDCreateDefaultMappings = 0 - end, - config = function() - vim.api.nvim_set_keymap("v", "<leader>cc", "<plug>NERDCommenterComment", { silent = true }) - vim.api.nvim_set_keymap("v", "<leader>cu", "<plug>NERDCommenterUncomment", { silent = true }) - vim.api.nvim_set_keymap("n", "<leader>cc", "<plug>NERDCommenterComment", { noremap = false, silent = true }) - vim.api.nvim_set_keymap("n", "<leader>cu", "<plug>NERDCommenterUncomment", { noremap = false, silent = true }) - end, - keys = { - { "<leader>cc", mode = "v" }, - { "<leader>cc", mode = "n" }, - { "<leader>cu", mode = "v" }, - { "<leader>cu", mode = "n" }, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/core/nvim-tree.lua b/public/nvim/.nvim/lua/plugins/core/nvim-tree.lua deleted file mode 100644 index e8ca82f..0000000 --- a/public/nvim/.nvim/lua/plugins/core/nvim-tree.lua +++ /dev/null @@ -1,36 +0,0 @@ -return { - { - "nvim-tree/nvim-tree.lua", - config = function() - require("nvim-tree").setup({ - sync_root_with_cwd = false, - update_focused_file = { - enable = true, - update_root = false, - }, - renderer = { - indent_markers = { enable = true }, - highlight_git = true, - highlight_opened_files = "all", - }, - }) - end, - dependencies = { "nvim-tree/nvim-web-devicons" }, - }, - - -- Add nvim-tree which-key shortcuts - { - "folke/which-key.nvim", - opts = function(_, opts) - if type(opts) ~= "table" then - opts = {} - end - - if type(opts.f) ~= "table" then - opts["f"] = {} - end - - opts.f["e"] = { "<cmd>NvimTreeToggle<cr>", "Explorer" } - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/core/tabline.lua b/public/nvim/.nvim/lua/plugins/core/tabline.lua deleted file mode 100644 index 0a8305d..0000000 --- a/public/nvim/.nvim/lua/plugins/core/tabline.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "mkitt/tabline.vim", -} diff --git a/public/nvim/.nvim/lua/plugins/core/telescope.lua b/public/nvim/.nvim/lua/plugins/core/telescope.lua deleted file mode 100644 index 367e20c..0000000 --- a/public/nvim/.nvim/lua/plugins/core/telescope.lua +++ /dev/null @@ -1,27 +0,0 @@ -return { - { - "nvim-telescope/telescope.nvim", - config = function() - require("telescope").load_extension("file_browser") - end, - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-telescope/telescope-file-browser.nvim", - }, - }, - - { - "folke/which-key.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.b = opts.b or {} - opts.f = opts.f or {} - - opts.b["b"] = { "<cmd>Telescope buffers<cr>", "All" } - opts.f["f"] = { "<cmd>Telescope find_files<cr>", "Find" } - opts.f["g"] = { "<cmd>Telescope live_grep<cr>", "Grep" } - opts.f["b"] = { "<cmd>Telescope file_browser<cr>", "Browse" } - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/core/tmux.lua b/public/nvim/.nvim/lua/plugins/core/tmux.lua deleted file mode 100644 index 0d63aa4..0000000 --- a/public/nvim/.nvim/lua/plugins/core/tmux.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - "christoomey/vim-tmux-navigator", - config = function() - local nvim_set_keymap = vim.api.nvim_set_keymap - vim.g.tmux_navigator_no_mappings = 1 - for _, mode in pairs({ "n", "v", "i", "t" }) do - nvim_set_keymap(mode, "<C-j>", "<cmd>:TmuxNavigateDown<CR>", { noremap = true }) - nvim_set_keymap(mode, "<C-k>", "<cmd>:TmuxNavigateUp<CR>", { noremap = true }) - nvim_set_keymap(mode, "<C-h>", "<cmd>:TmuxNavigateLeft<CR>", { noremap = true }) - nvim_set_keymap(mode, "<C-l>", "<cmd>:TmuxNavigateRight<CR>", { noremap = true }) - end - end, -} diff --git a/public/nvim/.nvim/lua/plugins/core/treesitter.lua b/public/nvim/.nvim/lua/plugins/core/treesitter.lua deleted file mode 100644 index 3818555..0000000 --- a/public/nvim/.nvim/lua/plugins/core/treesitter.lua +++ /dev/null @@ -1,54 +0,0 @@ ----@param tbl table ----@return table -local tbl_uniq = function(tbl) - ---@type table<string, boolean> - local added = {} - local res = {} - res = vim.tbl_filter(function(k) - if added[k] then - return false - end - added[k] = true - return true - end, tbl) - - return res -end - -return { - { - "nvim-treesitter/nvim-treesitter", - build = ":TSUpdate", - cmd = { "TSUpdateSync" }, - event = { "BufReadPost", "BufNewFile" }, - init = function() - vim.o.foldmethod = "expr" - vim.o.foldexpr = "nvim_treesitter#foldexpr()" - end, - opts = { - ensure_installed = { "query" }, - ignore_install = {}, - highlight = { - enable = true, - }, - query_linter = { - enable = true, - use_virtual_text = true, - lint_events = { "BufWrite", "CursorHold" }, - }, - }, - config = function(_, opts) - if type(opts.ensure_installed) == "table" then - opts.ensure_installed = tbl_uniq(opts.ensure_installed) - end - require("nvim-treesitter.configs").setup(opts) - end, - }, - - { - "nvim-treesitter/playground", - build = ":TSInstall query", - dependencies = { "nvim-treesitter" }, - cmd = { "TSPlaygroundToggle" }, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/core/which-key.lua b/public/nvim/.nvim/lua/plugins/core/which-key.lua deleted file mode 100644 index 6e046a3..0000000 --- a/public/nvim/.nvim/lua/plugins/core/which-key.lua +++ /dev/null @@ -1,45 +0,0 @@ -return { - "folke/which-key.nvim", - event = "VeryLazy", - init = function() - vim.o.timeout = true - vim.o.timeoutlen = 300 - end, - - opts = { - f = { name = "File" }, - b = { - name = "Buffer", - n = { "<cmd>BufferNext<cr>", "Next" }, - p = { "<cmd>BufferPrevious<cr>", "Previous" }, - c = { "<cmd>BufferClose<cr>", "Close" }, - ["1"] = { "<cmd>BufferGoto 1<cr>", "1" }, - ["2"] = { "<cmd>BufferGoto 2<cr>", "2" }, - ["3"] = { "<cmd>BufferGoto 3<cr>", "3" }, - ["4"] = { "<cmd>BufferGoto 4<cr>", "4" }, - ["5"] = { "<cmd>BufferGoto 5<cr>", "5" }, - ["6"] = { "<cmd>BufferGoto 6<cr>", "6" }, - ["7"] = { "<cmd>BufferGoto 7<cr>", "7" }, - ["8"] = { "<cmd>BufferGoto 8<cr>", "8" }, - ["9"] = { "<cmd>BufferGoto 9<cr>", "9" }, - }, - l = { - name = "LSP", - a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Action" }, - f = { "<cmd>lua vim.lsp.buf.format({ async = false, timeout_ms = 5000 })<cr>", "Format" }, - d = { "<cmd>lua vim.diagnostic.open_float()<cr>", "Diagnostic" }, - h = { "<cmd>lua vim.lsp.buf.hover()<cr>", "Help" }, - g = { - name = "Go to", - D = { "<cmd>lua vim.lsp.buf.declaration()<cr>", "Go to declaration" }, - d = { "<cmd>lua vim.lsp.buf.definition()<cr>", "Go to definition" }, - i = { "<cmd>lua vim.lsp.buf.definition()<cr>", "Go to implementation" }, - }, - }, - }, - - config = function(_, opts) - local wk = require("which-key") - wk.register(opts, { prefix = "<leader>" }) - end, -} diff --git a/public/nvim/.nvim/lua/plugins/extra/copilot.lua b/public/nvim/.nvim/lua/plugins/extra/copilot.lua deleted file mode 100644 index 15d0c73..0000000 --- a/public/nvim/.nvim/lua/plugins/extra/copilot.lua +++ /dev/null @@ -1,33 +0,0 @@ -return { - { - "zbirenbaum/copilot.lua", - event = { "InsertEnter" }, - build = ":Copilot auth", - config = function() - vim.schedule(function() - require("copilot").setup({ - filetypes = { yaml = true }, - suggestion = { enabled = false }, - panel = { enabled = false }, - }) - end) - end, - }, - - { - "zbirenbaum/copilot-cmp", - dependencies = { "copilot.lua" }, - opts = {}, - }, - - { - "hrsh7th/nvim-cmp", - dependencies = { "zbirenbaum/copilot-cmp" }, - opts = function(_, opts) - if type(opts) == "table" then - table.insert(opts.sources, 1, { name = "copilot" }) - opts.formatting.format.menu["copilot"] = "" - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/extra/feline.lua b/public/nvim/.nvim/lua/plugins/extra/feline.lua deleted file mode 100644 index 037db34..0000000 --- a/public/nvim/.nvim/lua/plugins/extra/feline.lua +++ /dev/null @@ -1,84 +0,0 @@ -return { - { - "feline-nvim/feline.nvim", - dependencies = { "nvim-navic", "catppuccin", "nvim-tree/nvim-web-devicons" }, - config = function() - local ctp_feline = require("catppuccin.groups.integrations.feline") - ctp_feline.setup({ - assets = { - left_separator = "", - right_separator = "", - }, - }) - - local catpuccin_components = ctp_feline.get() - require("feline").setup({ components = catpuccin_components }) - - local catpuccin_winbar_components = { active = { {}, {}, {} }, inactive = {} } - --catpuccin_winbar_components.inactive = catpuccin_components.inactive - - -- Removes the mode_icon and its left padding - --table.remove(catpuccin_components.active[1], 2) - --table.remove(catpuccin_components.active[1], 1) - --local catpuccin_winbar_components = catpuccin_components - - --local yaml_schema_component = { - --provider = function() - --local schema = require("yaml-companion").get_buf_schema(0) - --return schema.result[1].name - --end, - --enabled = function() - --local enabled = catpuccin_components.active[3][1].enabled - --if vim.bo.filetype == "yaml" and enabled then - --return true - --end - --end, - --hl = catpuccin_components.active[3][1].hl, - --left_sep = catpuccin_components.active[3][1].left_sep, - --right_sep = catpuccin_components.active[3][1].right_sep, - --} - - local navic_component = { - provider = function() - local location = require("nvim-navic").get_location() - if location == "" then - return location - end - return "> " .. require("nvim-navic").get_location() - end, - enabled = function() - local ok, navic = pcall(require, "nvim-navic") - if ok then - return navic.is_available() - end - end, - hl = { - bg = require("catppuccin.palettes").get_palette().base, - fg = catpuccin_components.active[3][1].hl.fg, - }, - } - - --table.insert(catpuccin_components.active[3], 1, yaml_schema_component) - -- Overwrite the useless LSP component - --catpuccin_components.active[3][2] = yaml_schema_component - - -- this is a hack to properly align the next component - catpuccin_winbar_components.active[1][1] = { - provider = function() - return " " - end, - hl = { - bg = require("catppuccin.palettes").get_palette().base, - fg = require("catppuccin.palettes").get_palette().base, - }, - } - - catpuccin_winbar_components.active[1][2] = navic_component - catpuccin_winbar_components.inactive = catpuccin_winbar_components.active - - require("feline").winbar.setup({ - components = catpuccin_winbar_components, - }) - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/extra/vim-fugitive.lua b/public/nvim/.nvim/lua/plugins/extra/vim-fugitive.lua deleted file mode 100644 index d1f8a5a..0000000 --- a/public/nvim/.nvim/lua/plugins/extra/vim-fugitive.lua +++ /dev/null @@ -1,14 +0,0 @@ -return { - { - "shumphrey/fugitive-gitlab.vim", - cmd = "GBrowse", - config = function() - vim.g.fugitive_gitlab_domains = { "https://gitlab.otters.xyz" } - end, - }, - - { - "tpope/vim-fugitive", - dependencies = { "tpope/vim-rhubarb", "fugitive-gitlab.vim" }, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/eyecandy/indent-blankline.lua b/public/nvim/.nvim/lua/plugins/eyecandy/indent-blankline.lua deleted file mode 100644 index 8756757..0000000 --- a/public/nvim/.nvim/lua/plugins/eyecandy/indent-blankline.lua +++ /dev/null @@ -1,22 +0,0 @@ -return { - "lukas-reineke/indent-blankline.nvim", - event = { "BufRead" }, - main = "ibl", - opts = { - indent = { - char = "▏", - tab_char = "▏", - }, - scope = { - enabled = true, - show_start = true, - show_end = true, - exclude = { - language = { - "help", - }, - }, - }, - }, - dependencies = { "nvim-treesitter" }, -} diff --git a/public/nvim/.nvim/lua/plugins/eyecandy/themes.lua b/public/nvim/.nvim/lua/plugins/eyecandy/themes.lua deleted file mode 100644 index 42e5d6c..0000000 --- a/public/nvim/.nvim/lua/plugins/eyecandy/themes.lua +++ /dev/null @@ -1,25 +0,0 @@ -return { - { - "catppuccin/nvim", - lazy = false, - priority = 1000, - name = "catppuccin", - config = function() - local catp = require("catppuccin") - catp.setup({ - flavour = "frappe", - integrations = { - indent_blankline = true, - which_key = true, - illuminate = true, - lsp_trouble = true, - navic = { - enabled = true, - custom_bg = "NONE", - }, - }, - }) - vim.api.nvim_command("colorscheme catppuccin") - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/eyecandy/vim-illuminate.lua b/public/nvim/.nvim/lua/plugins/eyecandy/vim-illuminate.lua deleted file mode 100644 index 20b9bb2..0000000 --- a/public/nvim/.nvim/lua/plugins/eyecandy/vim-illuminate.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - "RRethy/vim-illuminate", - event = { "BufRead" }, -} diff --git a/public/nvim/.nvim/lua/plugins/eyecandy/virt-column.lua b/public/nvim/.nvim/lua/plugins/eyecandy/virt-column.lua deleted file mode 100644 index 5259d7a..0000000 --- a/public/nvim/.nvim/lua/plugins/eyecandy/virt-column.lua +++ /dev/null @@ -1,7 +0,0 @@ -return { - "lukas-reineke/virt-column.nvim", - event = { "BufRead" }, - config = function() - require("virt-column").setup() - end, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/ansible.lua b/public/nvim/.nvim/lua/plugins/lang/ansible.lua deleted file mode 100644 index 91f34df..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/ansible.lua +++ /dev/null @@ -1,21 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "yaml" }) - end - end, - }, - - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.ansiblels = {} - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/bash.lua b/public/nvim/.nvim/lua/plugins/lang/bash.lua deleted file mode 100644 index 141ca1c..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/bash.lua +++ /dev/null @@ -1,41 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "bash" }) - end - end, - }, - - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.code_actions.shellcheck, -- Diagnostics handled by Bash LS - null_ls.builtins.formatting.shfmt, - }) - end - end, - }, - - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - -- Just here because it doesn't work with the default node - -- https://github.com/bash-lsp/bash-language-server/issues/418 - local brew_prefix = vim.fn.systemlist("brew --prefix")[1] - local bashls_script_name = "bash-language-server" - local bashls_script_path = vim.fn.systemlist("which " .. bashls_script_name)[1] - local bashls_cmd = { brew_prefix .. "/opt/node@16/bin/node", bashls_script_path, "start" } - opts.servers.bashls = { cmd = bashls_cmd } - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/c.lua b/public/nvim/.nvim/lua/plugins/lang/c.lua deleted file mode 100644 index 5b54a9d..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/c.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "c" }) - end - end, - }, - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.clangd = {} - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/dockerfile.lua b/public/nvim/.nvim/lua/plugins/lang/dockerfile.lua deleted file mode 100644 index ca3ccc2..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/dockerfile.lua +++ /dev/null @@ -1,24 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "dockerfile" }) - end - end, - }, - - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.diagnostics.hadolint, - }) - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/go.lua b/public/nvim/.nvim/lua/plugins/lang/go.lua deleted file mode 100644 index 7e7fa03..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/go.lua +++ /dev/null @@ -1,65 +0,0 @@ -return { - { - "fatih/vim-go", - init = function() - vim.g.go_fmt_command = "gofumpt" - end, - ft = { "go" }, - }, - - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { - "go", - "gomod", - "gosum", - }) - end - end, - }, - - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.diagnostics.golangci_lint, - null_ls.builtins.formatting.gofumpt, -- Just here because gopls integrated gofumpt doesn't work - }) - end - end, - }, - - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.gopls = { - -- Because integrated gofumpt doesn't work - -- I disable formatting for gopls - -- Formatting is handled with gofumpt by: - -- - null-ls on format request - -- - vim-go on save - on_attach = function(client, _) - client.server_capabilities.documentFormattingProvider = false - client.server_capabilities.documentRangeFormattingProvider = false - end, - cmd = { "gopls", "-remote=auto", "serve" }, -- Shared with vim-go's gopls instance - settings = { - gopls = { - buildFlags = { "-tags=integration,unit" }, -- To make packages with those build flags actually work with the LSP - semanticTokens = false, - gofumpt = true, -- gofumpt formatting, doesn't work - }, - }, - } - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/groovy.lua b/public/nvim/.nvim/lua/plugins/lang/groovy.lua deleted file mode 100644 index 1ab404d..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/groovy.lua +++ /dev/null @@ -1,38 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "groovy" }) - end - end, - }, - - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.diagnostics.npm_groovy_lint, - null_ls.builtins.formatting.npm_groovy_lint, - }) - end - end, - }, - - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - local groovyls_path = "/Users/christian.segundo/git/groovy-language-server" - local groovyls_app_path = "build/libs/app-all.jar" - local groovyls_cmd = { "java", "-jar", groovyls_path .. "/" .. groovyls_app_path } - opts.servers.groovyls = { cmd = groovyls_cmd } - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/helm.lua b/public/nvim/.nvim/lua/plugins/lang/helm.lua deleted file mode 100644 index 6b303ec..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/helm.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - { - "towolf/vim-helm", - ft = { "yaml" }, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/jq.lua b/public/nvim/.nvim/lua/plugins/lang/jq.lua deleted file mode 100644 index a9a41c6..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/jq.lua +++ /dev/null @@ -1,21 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "jq" }) - end - end, - }, - - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.jqls = {} - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/json.lua b/public/nvim/.nvim/lua/plugins/lang/json.lua deleted file mode 100644 index 1d2d073..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/json.lua +++ /dev/null @@ -1,21 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "json" }) - end - end, - }, - - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.jsonls = {} - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/jsonnet.lua b/public/nvim/.nvim/lua/plugins/lang/jsonnet.lua deleted file mode 100644 index dff2e4b..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/jsonnet.lua +++ /dev/null @@ -1,26 +0,0 @@ -return { - { - "google/vim-jsonnet", - ft = { "jsonnet" }, - }, - - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "jsonnet" }) - end - end, - }, - - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.jsonnet_ls = {} - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/ledger.lua b/public/nvim/.nvim/lua/plugins/lang/ledger.lua deleted file mode 100644 index bc265e1..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/ledger.lua +++ /dev/null @@ -1,25 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "ledger" }) - end - end, - }, - { - "ledger/vim-ledger", - ft = { "ldg", "ledger", "journal" }, - }, - -- TODO - --{ - --"hrsh7th/nvim-cmp", - --opts = function(_, opts) - --if type(opts) == "table" then - --opts.sources = opts.sources or {} - --vim.list_extend(opts.sources, { name = "ledger" }) - --end - --end, - --}, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/lua.lua b/public/nvim/.nvim/lua/plugins/lang/lua.lua deleted file mode 100644 index 5e08867..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/lua.lua +++ /dev/null @@ -1,46 +0,0 @@ -return { - { "folke/neodev.nvim", lazy = true, opts = {} }, - - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "lua" }) - end - end, - }, - - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.diagnostics.selene, - null_ls.builtins.formatting.stylua, - }) - end - end, - }, - - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.on_attach = opts.on_attach or {} - opts.servers.lua_ls = { - on_attach = function(client, _) - client.server_capabilities.documentFormattingProvider = false - client.server_capabilities.documentRangeFormattingProvider = false - end, - } - end - end, - dependencies = { - "folke/neodev.nvim", - }, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/markdown.lua b/public/nvim/.nvim/lua/plugins/lang/markdown.lua deleted file mode 100644 index cfa6fd2..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/markdown.lua +++ /dev/null @@ -1,76 +0,0 @@ -return { - { - "iamcco/markdown-preview.nvim", - build = "cd app && npm install", - init = function() - vim.g.mkdp_filetypes = { "markdown" } - end, - ft = { "markdown" }, - }, - - { - "mzlogin/vim-markdown-toc", - init = function() - vim.g.vmt_auto_update_on_save = 0 - vim.g.vmt_dont_insert_fence = 1 - end, - ft = { "markdown" }, - }, - - { - "dbridges/vim-markdown-runner", - cmd = { "MarkdownRunner", "MarkdownRunnerInsert" }, - config = function() - vim.api.nvim_set_keymap("n", "<leader>r", "<cmd>MarkdownRunner<CR>", { noremap = false, silent = true }) - vim.api.nvim_set_keymap("n", "<leader>R", "<cmd>MarkdownRunnerInsert<CR>", { noremap = false, silent = true }) - end, - ft = { "markdown" }, - }, - - { - "preservim/vim-markdown", - dependencies = { "godlygeek/tabular" }, - init = function() - -- All concealing is handled by Treesitter - vim.g.vim_markdown_conceal = 0 - vim.g.vim_markdown_conceal_code_blocks = 0 - vim.g.vim_markdown_frontmatter = 0 - vim.g.vim_markdown_strikethrough = 0 - - vim.g.vim_markdown_auto_insert_bullets = 0 - vim.g.vim_markdown_new_list_item_indent = 0 - vim.g.vim_markdown_folding_disabled = 1 - end, - ft = { "markdown" }, - }, - - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { - "markdown_inline", - "markdown", - }) - end - end, - }, - - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.diagnostics.markdownlint_cli2, - null_ls.builtins.diagnostics.vale, - null_ls.builtins.formatting.prettierd.with({ - filetypes = { "markdown" }, - }), - }) - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/perl.lua b/public/nvim/.nvim/lua/plugins/lang/perl.lua deleted file mode 100644 index 6ec7220..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/perl.lua +++ /dev/null @@ -1,36 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "perl" }) - end - end, - }, - - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - -- perlls is supposed to use perltidy for formatting, but it doesn't - -- work not sure why. - null_ls.builtins.formatting.perltidy, - }) - end - end, - }, - - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.perlls = {} - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/promql.lua b/public/nvim/.nvim/lua/plugins/lang/promql.lua deleted file mode 100644 index 5589b89..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/promql.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "promql" }) - end - end, - }, - - { - name = "promqlfmt.nvim", - url = "https://git.segundo.io/nvim/promqlfmt.nvim", - --dir = "/Users/christian.segundo/git/promql.nvim", - --dev = true, - cmd = { "Promqlfmt" }, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/swift.lua b/public/nvim/.nvim/lua/plugins/lang/swift.lua deleted file mode 100644 index d7f6d33..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/swift.lua +++ /dev/null @@ -1,35 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "swift" }) - end - end, - }, - - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.diagnostics.swiftlint, - null_ls.builtins.formatting.swiftformat, - }) - end - end, - }, - - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.sourcekit = {} - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/terraform.lua b/public/nvim/.nvim/lua/plugins/lang/terraform.lua deleted file mode 100644 index e7ccff4..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/terraform.lua +++ /dev/null @@ -1,40 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { - "hcl", - "terraform", - }) - end - end, - }, - - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.diagnostics.tfsec, - null_ls.builtins.formatting.terraform_fmt.with({ - extra_filetypes = { "hcl" }, - }), - }) - end - end, - }, - - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.terraformls = {} - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/typescript.lua b/public/nvim/.nvim/lua/plugins/lang/typescript.lua deleted file mode 100644 index f21c876..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/typescript.lua +++ /dev/null @@ -1,34 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "typescript", "javascript" }) - end - end, - }, - - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.code_actions.eslint_d, - }) - end - end, - }, - - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.tsserver = {} - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/yaml.lua b/public/nvim/.nvim/lua/plugins/lang/yaml.lua deleted file mode 100644 index 83af09e..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/yaml.lua +++ /dev/null @@ -1,59 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "yaml" }) - end - end, - }, - - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.diagnostics.yamllint, - }) - end - end, - }, - - { - --"someone-stole-my-name/yaml-companion.nvim", - dev = true, - dir = "/Users/christian.segundo/git/nvim_plugins/yaml-companion.nvim", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-telescope/telescope.nvim", - }, - init = function() - require("telescope").load_extension("yaml_schema") - end, - ft = { "yaml" }, - }, - - { - "neovim/nvim-lspconfig", - --dependencies = { "someone-stole-my-name/yaml-companion.nvim" }, - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.yamlls = require("yaml-companion").setup() - end - end, - }, - - { - "rafamadriz/friendly-snippets", - opts = function(_, opts) - if type(opts) == "table" then - opts.include = opts.include or {} - vim.list_extend(opts.include, { "yaml" }) - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lang/zig.lua b/public/nvim/.nvim/lua/plugins/lang/zig.lua deleted file mode 100644 index 1970797..0000000 --- a/public/nvim/.nvim/lua/plugins/lang/zig.lua +++ /dev/null @@ -1,40 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts) == "table" then - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "zig" }) - end - end, - }, - - { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, opts) - if type(opts) == "table" then - opts.sources = opts.sources or {} - local null_ls = require("null-ls") - vim.list_extend(opts.sources, { - null_ls.builtins.formatting.zigfmt, - }) - end - end, - }, - - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.on_attach = opts.on_attach or {} - opts.servers.zls = { - on_attach = function(client, _) - client.server_capabilities.documentFormattingProvider = false - client.server_capabilities.documentRangeFormattingProvider = false - end, - } - end - end, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lsp/cmp.lua b/public/nvim/.nvim/lua/plugins/lsp/cmp.lua deleted file mode 100644 index 004c265..0000000 --- a/public/nvim/.nvim/lua/plugins/lsp/cmp.lua +++ /dev/null @@ -1,97 +0,0 @@ -return { - "hrsh7th/nvim-cmp", - opts = { - sources = { - { name = "ledger" }, - { - name = "luasnip", - option = { - show_autosnippets = true, - use_show_condition = true, - }, - }, - { name = "nvim_lsp", priority = 1 }, - { name = "nvim_lsp_signature_help" }, - { name = "nvim_lua" }, - { name = "path" }, - { name = "emoji" }, - }, - formatting = { - format = { - mode = "symbol_text", - maxwidth = 50, - before = function(entry, vim_item) - return vim_item - end, - menu = { - buffer = "[Buffer]", - nvim_lsp = "[LSP]", - luasnip = "[LuaSnip]", - nvim_lua = "[Lua]", - latex_symbols = "[Latex]", - }, - }, - }, - }, - config = function(_, opts) - local cmp = require("cmp") - local luasnip = require("luasnip") - local lspkind = require("lspkind") - cmp.setup({ - sources = opts.sources, - --experimental = { ghost_text = { hl_group = "Comment" } }, - snippet = { - expand = function(args) - require("luasnip").lsp_expand(args.body) - end, - }, - formatting = { format = lspkind.cmp_format(opts.formatting.format) }, - mapping = { - ["<C-p>"] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - ["<C-n>"] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, { "i", "s" }), - ["<C-l>"] = cmp.mapping(function(fallback) - if luasnip.choice_active() then - luasnip.change_choice(1) - else - fallback() - end - end, { "i", "s" }), - ["<C-d>"] = cmp.mapping.scroll_docs(-4), - ["<C-f>"] = cmp.mapping.scroll_docs(4), - ["<C-Space>"] = cmp.mapping.complete(), - ["<C-e>"] = cmp.mapping.close(), - ["<CR>"] = cmp.mapping.confirm({ - behavior = cmp.ConfirmBehavior.Insert, - select = true, -- Automatically select first item on CR - }), - }, - }) - end, - dependencies = { - { "L3MON4D3/LuaSnip" }, - { "hrsh7th/cmp-emoji" }, - { "hrsh7th/cmp-nvim-lsp" }, - { "hrsh7th/cmp-nvim-lsp-signature-help" }, - { "hrsh7th/cmp-nvim-lua" }, - { "hrsh7th/cmp-path" }, - { "onsails/lspkind.nvim" }, - { "saadparwaiz1/cmp_luasnip" }, - { "someone-stole-my-name/cmp-ledger" }, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lsp/config.lua b/public/nvim/.nvim/lua/plugins/lsp/config.lua deleted file mode 100644 index 579cfec..0000000 --- a/public/nvim/.nvim/lua/plugins/lsp/config.lua +++ /dev/null @@ -1,45 +0,0 @@ -return { - { - "neovim/nvim-lspconfig", - event = { "BufReadPre", "BufNewFile" }, - opts = { servers = {} }, - config = function(_, opts) - local add_hook_after = require("lspconfig.util").add_hook_after - local on_attach = function(client, bufnr) - require("nvim-navic").attach(client, bufnr) - end - - for lsp, lsp_opts in pairs(opts.servers) do - lsp_opts = lsp_opts or {} - if lsp_opts.on_attach ~= nil then - lsp_opts["on_attach"] = add_hook_after(on_attach, lsp_opts.on_attach) - end - lsp_opts["capabilities"] = require("cmp_nvim_lsp").default_capabilities( - lsp_opts.capabilities or {} - ) - require("lspconfig")[lsp].setup(lsp_opts) - end - end, - init = function() - vim.diagnostic.config({ - float = { - source = "always", - format = function(diagnostic) - -- should work for any LSP, see: https://github.com/neovim/neovim/pull/17510 - if diagnostic.code then - return string.format( - "(%s) %s", - diagnostic.code, - diagnostic.message - ) - end - return diagnostic.message - end, - }, - }) - end, - dependencies = { - { "SmiteshP/nvim-navic", opts = { highlight = true } }, - }, - }, -} diff --git a/public/nvim/.nvim/lua/plugins/lsp/null-ls.lua b/public/nvim/.nvim/lua/plugins/lsp/null-ls.lua deleted file mode 100644 index 5f71af7..0000000 --- a/public/nvim/.nvim/lua/plugins/lsp/null-ls.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "jose-elias-alvarez/null-ls.nvim", - opts = { sources = {}, debug = false }, - dependencies = { "nvim-lua/plenary.nvim" }, -} diff --git a/public/nvim/.nvim/lua/plugins/lsp/trouble.lua b/public/nvim/.nvim/lua/plugins/lsp/trouble.lua deleted file mode 100644 index 207edb5..0000000 --- a/public/nvim/.nvim/lua/plugins/lsp/trouble.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - { - "folke/trouble.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - require("trouble").setup({}) - end, - }, -} diff --git a/public/nvim/.nvim/lua/snippets/lua.lua b/public/nvim/.nvim/lua/snippets/lua.lua deleted file mode 100644 index dbec22a..0000000 --- a/public/nvim/.nvim/lua/snippets/lua.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - s("ignore", t("-- foo $0")), -} diff --git a/public/nvim/.nvim/lua/snippets/sh/bash-find.lua b/public/nvim/.nvim/lua/snippets/sh/bash-find.lua deleted file mode 100644 index be56beb..0000000 --- a/public/nvim/.nvim/lua/snippets/sh/bash-find.lua +++ /dev/null @@ -1,32 +0,0 @@ -local is_bash = function() - local shebang = vim.api.nvim_buf_get_lines(0, 0, 1, true) or {} - if shebang[1] and string.find(shebang[1], "bash") then - return true - end - return false -end - -return { - s( - { trig = "find-xargs", dscr = "" }, - fmt( -- The snippet code actually looks like the equation environment it produces. - [[ - find <> \ - -type <> \ - -name '*.<>' \ - -print0 | xargs -0 -r -P 0 <> - ]], - { - i(1, "."), -- search directory - c(2, { t("f"), t("d") }), -- file or directory - i(3, "ext"), -- file extension - i(4, "echo"), -- xaargs command - }, - { delimiters = "<>" } - ), - { - show_condition = is_bash, - condition = is_bash, - } - ), -} diff --git a/public/nvim/.nvim/lua/snippets/sh/bash-misc.lua b/public/nvim/.nvim/lua/snippets/sh/bash-misc.lua deleted file mode 100644 index f3a11eb..0000000 --- a/public/nvim/.nvim/lua/snippets/sh/bash-misc.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - s({ - trig = "no-source", - dscr = "Exit with an error if script is being sourced", - }, { - t({ - 'if [[ "${0}" != "${BASH_SOURCE[0]}" ]]; then', - '\techo "Error: script ${BASH_SOURCE[0]} is not supported to be sourced!"', - "\treturn 1", - "fi", - }), - }), -} - - - diff --git a/public/nvim/.nvim/neovim.yaml b/public/nvim/.nvim/neovim.yaml deleted file mode 100644 index 76f9b9e..0000000 --- a/public/nvim/.nvim/neovim.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -base: lua51 -globals: - vim: - any: true - assert: - args: - - type: bool - - type: string - required: false - after_each: - args: - - type: function - before_each: - args: - - type: function - describe: - args: - - type: string - - type: function - it: - args: - - type: string - - type: function diff --git a/public/nvim/.nvim/plugin/qf-dd.vim b/public/nvim/.nvim/plugin/qf-dd.vim deleted file mode 100644 index 385c0c7..0000000 --- a/public/nvim/.nvim/plugin/qf-dd.vim +++ /dev/null @@ -1,30 +0,0 @@ -" https://stackoverflow.com/questions/42905008/quickfix-list-how-to-add-and-remove-entries -" When using `dd` in the quickfix list, remove the item from the quickfix list. -function! RemoveQFItem(mode) range abort - let l:qf_list = getqflist() - - " distinguish mode for getting delete index and delete count - if a:mode == 'v' - let l:del_qf_idx = getpos("'<")[1] - 1 - let l:del_ct = getpos("'>")[1] - l:del_qf_idx - else - let l:del_qf_idx = line('.') - 1 - let l:del_ct = v:count > 1 ? v:count : 1 - endif - - " delete lines and update quickfix - for item in range(l:del_ct) - call remove(l:qf_list, l:del_qf_idx) - endfor - call setqflist(l:qf_list, 'r') - - if len(l:qf_list) > 0 - execute l:del_qf_idx + 1 . 'cfirst' - copen - else - cclose - endif -endfunction - -autocmd FileType qf nmap <buffer> dd :call RemoveQFItem('n')<cr> -autocmd FileType qf vmap <buffer> dd :call RemoveQFItem('v')<cr> diff --git a/public/nvim/.nvim/queries/markdown/highlights.scm b/public/nvim/.nvim/queries/markdown/highlights.scm deleted file mode 100644 index 5563428..0000000 --- a/public/nvim/.nvim/queries/markdown/highlights.scm +++ /dev/null @@ -1,94 +0,0 @@ -;From MDeiml/tree-sitter-markdown & Helix -;;same as the one shipped in nvim-treesitter without concealing codeblocks -(setext_heading (paragraph) @text.title.1 (setext_h1_underline) @text.title.1.marker) -(setext_heading (paragraph) @text.title.2 (setext_h2_underline) @text.title.2.marker) - -(atx_heading (atx_h1_marker) @text.title.1.marker (inline) @text.title.1) -(atx_heading (atx_h2_marker) @text.title.2.marker (inline) @text.title.2) -(atx_heading (atx_h3_marker) @text.title.3.marker (inline) @text.title.3) -(atx_heading (atx_h4_marker) @text.title.4.marker (inline) @text.title.4) -(atx_heading (atx_h5_marker) @text.title.5.marker (inline) @text.title.5) -(atx_heading (atx_h6_marker) @text.title.6.marker (inline) @text.title.6) - -(link_title) @text.literal -(indented_code_block) @text.literal.block -((fenced_code_block) @text.literal.block (#set! "priority" 90)) - -(info_string) @label - -(pipe_table_header (pipe_table_cell) @text.title) - -(pipe_table_header "|" @punctuation.special) -(pipe_table_row "|" @punctuation.special) -(pipe_table_delimiter_row "|" @punctuation.special) -(pipe_table_delimiter_cell) @punctuation.special - -[ - (fenced_code_block_delimiter) -] @punctuation.delimiter - -;; Conceal backticks -;(fenced_code_block - ;(fenced_code_block_delimiter) @conceal - ;(#set! conceal "")) -;(fenced_code_block - ;(info_string (language) @conceal - ;(#set! conceal ""))) - -; NOTE: The following has been commented out due to issues with spaces in the -; list marker nodes generated by the parser. If those spaces ever get captured -; by a different node (e.g. block_continuation) we can safely readd these -; conceals. -; ;; Conceal bullet points -; ([(list_marker_plus) (list_marker_star)] -; @punctuation.special -; (#offset! @punctuation.special 0 0 0 -1) -; (#set! conceal "•")) -; ([(list_marker_plus) (list_marker_star)] -; @punctuation.special -; (#any-of? @punctuation.special "+" "*") -; (#set! conceal "•")) -; ((list_marker_minus) -; @punctuation.special -; (#offset! @punctuation.special 0 0 0 -1) -; (#set! conceal "—")) -; ((list_marker_minus) -; @punctuation.special -; (#eq? @punctuation.special "-") -; (#set! conceal "—")) - -(code_fence_content) @none - -[ - (link_destination) -] @text.uri - -[ - (link_label) -] @text.reference - -[ - (list_marker_plus) - (list_marker_minus) - (list_marker_star) - (list_marker_dot) - (list_marker_parenthesis) - (thematic_break) -] @punctuation.special - - -(task_list_marker_unchecked) @text.todo.unchecked -(task_list_marker_checked) @text.todo.checked - -((block_quote) @text.quote (#set! "priority" 90)) - -[ - (block_continuation) - (block_quote_marker) -] @punctuation.special - -[ - (backslash_escape) -] @string.escape - -(inline) @spell diff --git a/public/nvim/.nvim/selene.toml b/public/nvim/.nvim/selene.toml deleted file mode 100644 index 032dba6..0000000 --- a/public/nvim/.nvim/selene.toml +++ /dev/null @@ -1 +0,0 @@ -std = "neovim" diff --git a/public/nvim/.nvim/spell/en.utf-8.add b/public/nvim/.nvim/spell/en.utf-8.add deleted file mode 100644 index 274c5fc..0000000 --- a/public/nvim/.nvim/spell/en.utf-8.add +++ /dev/null @@ -1,11 +0,0 @@ -Linkerd -CRD -linkerd -GKMS -Grafana -GCP -KTE -Prometheus -KTEs -multicluster -LBs diff --git a/public/nvim/.nvim/spell/en.utf-8.add.spl b/public/nvim/.nvim/spell/en.utf-8.add.spl Binary files differdeleted file mode 100644 index a77b56c..0000000 --- a/public/nvim/.nvim/spell/en.utf-8.add.spl +++ /dev/null diff --git a/public/nvim/.nvim/stylua.toml b/public/nvim/.nvim/stylua.toml deleted file mode 100644 index 87ca309..0000000 --- a/public/nvim/.nvim/stylua.toml +++ /dev/null @@ -1,5 +0,0 @@ -column_width = 80 -line_endings = "Unix" -indent_type = "Tabs" -indent_width = 2 -quote_style = "AutoPreferDouble" diff --git a/public/perl/.perlcriticrc b/public/perl/.perlcriticrc deleted file mode 100644 index 6bcc4a8..0000000 --- a/public/perl/.perlcriticrc +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/perlcritic - -severity = 5 -verbose = [%p] %m at line %l, column %c. (%e) (Severity: %s)\n -theme = core -criticism-fatal = 1 -color = 1 -allow-unsafe = 1 diff --git a/public/perl/.perltidyrc b/public/perl/.perltidyrc deleted file mode 100644 index b56aa96..0000000 --- a/public/perl/.perltidyrc +++ /dev/null @@ -1,7 +0,0 @@ ---ignore-side-comment-lengths ---minimum-space-to-comment=1 ---no-outdent-long-comments ---no-outdent-long-quotes ---variable-maximum-line-length ---character-encoding=utf8 --i=2 diff --git a/public/tmux/.tmux.conf b/public/tmux/.tmux.conf deleted file mode 100644 index 1ace947..0000000 --- a/public/tmux/.tmux.conf +++ /dev/null @@ -1,46 +0,0 @@ -# Enable mouse mode -set -g mouse on -set -g focus-events on - -# scrollback buffer -set-option -g history-limit 3000000 - -# 10ms escape time -set-option -sg escape-time 10 - -# Don't rename windows automatically -set-option -g allow-rename off - -# Remove the right status bar -set-option -g status-right "" - -set-option -g status-style fg=white,bg=black - -# Split panes using | and - -bind | split-window -h -bind - split-window -v -unbind '"' -unbind % - -# Synchronize panes using C-x -bind -n C-x setw synchronize-panes - -# Reload config file using r -bind r source-file ~/.tmux.conf - -# List of plugins -#set -g @plugin 'tmux-plugins/tpm' -#set -g @plugin 'tmux-plugins/tmux-sensible' - -set -g @scroll-down-exit-copy-mode "off" -set -g @scroll-in-moused-over-pane "off" -set -g @scroll-speed-num-lines-per-scroll "1" -set -g @emulate-scroll-for-no-mouse-alternate-buffer "on" - - -# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) -#run -b '~/.tmux/plugins/tpm/tpm' - -# Fixes colors -set -g default-terminal "xterm-256color" -set -ga terminal-overrides ",*256col*:Tc" diff --git a/public/zsh/.usr/local/bin/awk b/public/zsh/.usr/local/bin/awk deleted file mode 100755 index da814c3..0000000 --- a/public/zsh/.usr/local/bin/awk +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -gawk "$@" diff --git a/public/zsh/.usr/local/bin/date b/public/zsh/.usr/local/bin/date deleted file mode 100755 index 0a50c4e..0000000 --- a/public/zsh/.usr/local/bin/date +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -gdate "$@" diff --git a/public/zsh/.usr/local/bin/docker b/public/zsh/.usr/local/bin/docker deleted file mode 100755 index c16e0da..0000000 --- a/public/zsh/.usr/local/bin/docker +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -#podman "$@" -docker "$@" diff --git a/public/zsh/.usr/local/bin/find b/public/zsh/.usr/local/bin/find deleted file mode 100755 index 0df7b89..0000000 --- a/public/zsh/.usr/local/bin/find +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -gfind "$@" diff --git a/public/zsh/.usr/local/bin/grep b/public/zsh/.usr/local/bin/grep deleted file mode 100755 index e950d06..0000000 --- a/public/zsh/.usr/local/bin/grep +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -ggrep "$@" diff --git a/public/zsh/.usr/local/bin/sed b/public/zsh/.usr/local/bin/sed deleted file mode 100755 index 1077e99..0000000 --- a/public/zsh/.usr/local/bin/sed +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -gsed "$@" diff --git a/public/zsh/.zshenv b/public/zsh/.zshenv index 0a67ae5..3982588 100644 --- a/public/zsh/.zshenv +++ b/public/zsh/.zshenv @@ -65,6 +65,8 @@ export PATH="${HOME}/.usr/local/bin:${PATH}" # print("lddflags: " . $Config{lddlflags} . "\n"); export PERLBREW_CONFIGURE_FLAGS="-Dusrinc=/opt/homebrew/include -Dldflags=-L/opt/homebrew/lib -de" +#--configure-args="--cflags='-I/opt/homebrew/include -L/opt/homebrew/lib -de'" + # Otherwise I get weird GPG errors when signing commits #export GPG_TTY=$(tty) diff --git a/public/zsh/.zshrc b/public/zsh/.zshrc index 2d023b4..0a0074a 100644 --- a/public/zsh/.zshrc +++ b/public/zsh/.zshrc @@ -1,7 +1,7 @@ # ft=shell #zmodload zsh/zprof -source $HOMEBREW_PREFIX/share/antigen/antigen.zsh +source /etc/zsh/antigen.zsh antigen init $HOME/.antigenrc autoload -U compinit promptinit @@ -102,8 +102,8 @@ ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=8" DISABLE_MAGIC_FUNCTIONS=true # FZF -source "${HOMEBREW_PREFIX}/opt/fzf/shell/completion.zsh" -source "${HOMEBREW_PREFIX}/opt/fzf/shell/key-bindings.zsh" +#source "${HOMEBREW_PREFIX}/opt/fzf/shell/completion.zsh" +#source "${HOMEBREW_PREFIX}/opt/fzf/shell/key-bindings.zsh" export FZF_TMUX_OPTS='-d 40%' bindkey "ç" fzf-cd-widget |