Compare commits

...

5 commits

15 changed files with 62 additions and 104 deletions

View file

@ -4,3 +4,5 @@ git:
pager: delta --dark --paging=never --syntax-theme base16-256 --diff-so-fancy
useConfig: false
autoFetch: false
gui:
nerdFontsVersion: 3

View file

@ -1,5 +1,4 @@
vim.g.gruvbox_material_better_performance=1
vim.g.gruvbox_material_background="medium"
vim.g.gruvbox_material_foreground="material"
vim.g.everforest_better_performance=1
vim.g.everforest_background="hard"
vim.opt.background="dark"
vim.cmd('colorscheme gruvbox-material')
vim.cmd('colorscheme everforest')

View file

@ -2,7 +2,9 @@ return {
{
'saghen/blink.cmp',
lazy = false,
dependencies = 'rafamadriz/friendly-snippets',
dependencies = {
'rafamadriz/friendly-snippets',
},
version = "*",
opts = {
keymap = {
@ -26,6 +28,7 @@ return {
max_width = 160,
max_height = 30,
scrollbar = true,
show_documentation = false,
}
},
completion = {
@ -40,7 +43,7 @@ return {
winblend = 0,
draw = {
treesitter = { 'lsp' },
columns = { { 'kind_icon'}, { 'label' } },
columns = { { 'kind_icon' }, { 'label' } },
}
},
documentation = {

View file

@ -14,12 +14,7 @@ return {
config = function()
require('java').setup()
local lspconfig = require("lspconfig")
local lsp_defaults = lspconfig.util.default_config
local capabilities = require('blink.cmp').get_lsp_capabilities(lsp_defaults.capabilities)
capabilities.textDocument.foldingRange = {
dynamicRegistration = false,
lineFoldingOnly = true
}
local capabilities = require('blink.cmp').get_lsp_capabilities(nil, true)
lspconfig["jdtls"].setup({
capabilities = capabilities,
})
@ -79,12 +74,7 @@ return {
vim.keymap.set("n", "<space>fo", function() conform.format({ lsp_fallback = true }) end, bufopts)
end,
})
local lsp_defaults = lspconfig.util.default_config
local capabilities = require('blink.cmp').get_lsp_capabilities(lsp_defaults.capabilities)
capabilities.textDocument.foldingRange = {
dynamicRegistration = false,
lineFoldingOnly = true
}
local capabilities = require('blink.cmp').get_lsp_capabilities(nil, true)
lspconfig["gopls"].setup({
capabilities = capabilities,
settings = {
@ -158,17 +148,6 @@ return {
end
end
},
{
"jay-babu/mason-nvim-dap.nvim",
event = "VeryLazy",
dependencies = {
"williamboman/mason.nvim",
"mfussenegger/nvim-dap",
},
opts = {
handlers = {}
},
},
{
"mfussenegger/nvim-dap",
},

View file

@ -26,13 +26,11 @@ return {
dashboard = { enabled = true },
input = { enabled = true },
lazygit = {
enabled = true,
vim.keymap.set('n', '<leader>lg', function()
Snacks.lazygit.open()
end)
},
words = {
enabled = true,
debounce = 10,
vim.keymap.set('n', '<leader>gn', function()
Snacks.words.jump(1, true)
@ -48,11 +46,4 @@ return {
end
},
"tpope/vim-fugitive",
-- {
-- "nvzone/typr",
-- dependencies = {
-- "nvzone/volt"
-- },
-- opts = {}
-- }
}

View file

@ -38,41 +38,40 @@ return {
'kevinhwang91/nvim-ufo',
dependencies = 'kevinhwang91/promise-async',
config = function()
vim.o.foldcolumn = '1'
vim.o.foldcolumn = '0'
vim.o.foldlevel = 99
vim.o.foldlevelstart = 99
vim.o.foldenable = true
vim.keymap.set('n', 'zR', require('ufo').openAllFolds)
vim.keymap.set('n', 'zM', require('ufo').closeAllFolds)
local handler = function(virtText, lnum, endLnum, width, truncate)
local newVirtText = {}
local suffix = (' %d '):format(endLnum - lnum)
local sufWidth = vim.fn.strdisplaywidth(suffix)
local targetWidth = width - sufWidth
local curWidth = 0
for _, chunk in ipairs(virtText) do
local chunkText = chunk[1]
local chunkWidth = vim.fn.strdisplaywidth(chunkText)
if targetWidth > curWidth + chunkWidth then
table.insert(newVirtText, chunk)
else
chunkText = truncate(chunkText, targetWidth - curWidth)
local hlGroup = chunk[2]
table.insert(newVirtText, { chunkText, hlGroup })
chunkWidth = vim.fn.strdisplaywidth(chunkText)
-- str width returned from truncate() may less than 2nd argument, need padding
if curWidth + chunkWidth < targetWidth then
suffix = suffix .. (' '):rep(targetWidth - curWidth - chunkWidth)
end
break
end
curWidth = curWidth + chunkWidth
end
table.insert(newVirtText, { suffix, 'MoreMsg' })
return newVirtText
end
require('ufo').setup({
fold_virt_text_handler = handler
fold_virt_text_handler = function(virtText, lnum, endLnum, width, truncate)
local newVirtText = {}
local suffix = (' %d '):format(endLnum - lnum)
local sufWidth = vim.fn.strdisplaywidth(suffix)
local targetWidth = width - sufWidth
local curWidth = 0
for _, chunk in ipairs(virtText) do
local chunkText = chunk[1]
local chunkWidth = vim.fn.strdisplaywidth(chunkText)
if targetWidth > curWidth + chunkWidth then
table.insert(newVirtText, chunk)
else
chunkText = truncate(chunkText, targetWidth - curWidth)
local hlGroup = chunk[2]
table.insert(newVirtText, { chunkText, hlGroup })
chunkWidth = vim.fn.strdisplaywidth(chunkText)
-- str width returned from truncate() may less than 2nd argument, need padding
if curWidth + chunkWidth < targetWidth then
suffix = suffix .. (' '):rep(targetWidth - curWidth - chunkWidth)
end
break
end
curWidth = curWidth + chunkWidth
end
table.insert(newVirtText, { suffix, 'MoreMsg' })
return newVirtText
end
})
end
},

View file

@ -1,10 +1,10 @@
#!/usr/bin/env bash
# Hardcoded values
set -g status-bg "#282828"
set -g @unfocused-fg "#d4be98"
set -g @focused-bg "#d4be98"
set -g @focused-fg "#282828"
set -g status-bg "#272e33"
set -g @unfocused-fg "#3c4841"
set -g @focused-bg "#3c4841"
set -g @focused-fg "#d3c6aa"
# Set status bar position
set -g status-position top
@ -28,8 +28,8 @@ set -g window-status-current-format '#[bg=#{@focused-bg},fg=#{@focused-fg}] #I:#
# AUTO RENAME WINDOW
set-option -g status-interval 5
#set-option -g status-interval 5
set-option -g automatic-rename on
#set-option -g automatic-rename on
set-option -g automatic-rename-format "#{?#{==:#{pane_current_command},zsh},#{b:pane_current_path},#{pane_current_command}}"
#set-option -g automatic-rename-format "#{?#{==:#{pane_current_command},zsh},#{b:pane_current_path},#{pane_current_command}}"

View file

@ -4,15 +4,20 @@ if [[ ! $(tty) =~ ^/dev/tty[0-9]*$ ]]; then
if [[ -o INTERACTIVE ]]; then
exec "${SHELL}"
fi
}
}
fi
export XDG_CONFIG_HOME="${HOME}/.config"
export XDG_CACHE_HOME="${HOME}/.cache"
export XDG_DATA_HOME="${HOME}/.local/share"
export XDG_STATE_HOME="${HOME}/.local/state"
export XDG_RUNTIME_DIR=/tmp
# Add exports
if [[ $(uname) == "Darwin" ]]; then
#ONLY MACOS
export JAVA_HOME="/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home"
export JAVA_HOME=$(/usr/libexec/java_home)
export PATH="/opt/homebrew/bin:$PATH"
export PATH="/opt/homebrew/opt/openjdk@17/bin:$PATH"
export PATH="/opt/homebrew/opt/texlive/bin:$PATH"
export GEM_HOME=$HOME/.gem
export PATH=$PATH:$GEM_HOME/bin
@ -31,19 +36,10 @@ export PATH="$HOME/.cargo/bin:$PATH"
export PATH="$HOME/.ghcup/bin:$PATH"
export PATH="$HOME/.miniforge3/bin:$PATH"
export PATH="$HOME/.cabal/bin:$PATH"
export PATH="$XDG_CONFIG_HOME/emacs/bin:$PATH"
export GOPATH="$HOME/go"
export GOBIN="$GOPATH/bin"
#Android stuff
export ANDROID_HOME=~/android/sdk
export ANDROID_TOOLS_PATHS=$ANDROID_HOME/cmdline-tools/latest/bin:
export PATH=$ANDROID_TOOLS_PATHS:$PATH:
export XDG_CONFIG_HOME="${HOME}/.config"
export XDG_CACHE_HOME="${HOME}/.cache"
export XDG_DATA_HOME="${HOME}/.local/share"
export XDG_STATE_HOME="${HOME}/.local/state"
export XDG_RUNTIME_DIR=/tmp
. "$HOME/.cargo/env"

View file

@ -27,4 +27,3 @@ source $ZDOTDIR/plugins.zsh
if [[ $(uname) == "Darwin" ]]; then
eval "$(/opt/homebrew/bin/brew shellenv)"
fi

View file

@ -10,16 +10,6 @@ function vim {
fi
}
function sourceall(){
set -e
pids=$(pgrep zsh)
while IFS= read -r pid; do
kill -USR1 "$pid"
done <<< "$pids"
set +e
}
function routevpn {
sudo route -n add $@ 10.8.0.1
}

View file

@ -5,10 +5,10 @@ fpath+=$ZDOTDIR/plugins/zsh-completions/src
autoload -U compinit && compinit
source $ZDOTDIR/plugins/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh
source $ZDOTDIR/plugins/zsh-history-substring-search/zsh-history-substring-search.plugin.zsh
source $ZDOTDIR/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh
source $ZDOTDIR/plugins/zsh-history-substring-search/zsh-history-substring-search.plugin.zsh
zvm_after_init_commands+=('source <(fzf --zsh) && enable-fzf-tab')
source $ZDOTDIR/plugins/fzf-tab/fzf-tab.plugin.zsh

@ -1 +1 @@
Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5
Subproject commit 0e810e5afa27acbd074398eefbe28d13005dbc15

@ -1 +1 @@
Subproject commit d24f58d2f187a72697aa2781a730f65732cb2f6b
Subproject commit c160d09fddd28ceb3af5cf80e9253af80e450d96

@ -1 +1 @@
Subproject commit e0165eaa730dd0fa321a6a6de74f092fe87630b0
Subproject commit 5eb677bb0fa9a3e60f0eff031dc13926e093df92

View file

@ -35,4 +35,4 @@
[alias]
count-lines = "! git log --author=\"$1\" --pretty=tformat: --numstat | awk '{ add += $1; subs += $2; loc += $1 - $2 } END { printf \"added lines: %s, removed lines: %s, total lines: %s\\n\", add, subs, loc }' #"
[gpg "ssh"]
allowedSignersFile = /home/afonso/.ssh/allowed_signers
allowedSignersFile = ~/.ssh/allowed_signers