mirror of
https://github.com/don-philipe/dotfiles.git
synced 2025-11-08 14:47:03 +01:00
Compare commits
29 Commits
ec3b6b27b7
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f6bbc705f8 | ||
|
|
30d3a8c29a | ||
|
|
a414890f69 | ||
|
|
2df66474db | ||
|
|
3e30bb71a0 | ||
|
|
177716cdbe | ||
|
|
f8cf65bda9 | ||
|
|
bea47efec4 | ||
|
|
10de9c300b | ||
|
|
5feff36b73 | ||
|
|
8f50d2cb75 | ||
|
|
b62f1697a2 | ||
|
|
4260c7876c | ||
|
|
ff7deb9cee | ||
|
|
f84673ed16 | ||
|
|
5bdd07c204 | ||
|
|
469435454e | ||
|
|
3e51152da9 | ||
|
|
6a710bac5f | ||
|
|
af50ddd8ea | ||
|
|
7128760315 | ||
|
|
f078314b0d | ||
|
|
9803f705e4 | ||
|
|
b3d8e46003 | ||
|
|
cfafeb5c04 | ||
|
|
33f864dea8 | ||
|
|
7b473872b4 | ||
|
|
6934c87709 | ||
|
|
6f4a75353f |
@@ -2,9 +2,17 @@
|
|||||||
cursor = "#00ff00"
|
cursor = "#00ff00"
|
||||||
text = "#000000"
|
text = "#000000"
|
||||||
|
|
||||||
|
[env]
|
||||||
|
# set this to have true color when using nvim etc. in remote tmux session
|
||||||
|
TERM = "xterm-256color"
|
||||||
|
|
||||||
[font]
|
[font]
|
||||||
size = 9
|
size = 9
|
||||||
|
|
||||||
|
[font.normal]
|
||||||
|
family = "Jet Brains Mono Nerd Font"
|
||||||
|
#family = "Mononoki Nerd Font"
|
||||||
|
|
||||||
[general]
|
[general]
|
||||||
# https://github.com/alacritty/alacritty-theme
|
# https://github.com/alacritty/alacritty-theme
|
||||||
import = ["~/.config/alacritty/themes/themes/gruvbox_dark.toml"]
|
import = ["~/.config/alacritty/themes/themes/gruvbox_dark.toml"]
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
require("config.remap")
|
require("config.remap")
|
||||||
require("config.set")
|
require("config.set")
|
||||||
require("config.commands")
|
require("config.commands")
|
||||||
|
-- env vars used only for neovim
|
||||||
|
require("config.env")
|
||||||
|
-- configurations for various filetypes
|
||||||
|
require("config.filetypes")
|
||||||
|
|
||||||
-- plugin manager
|
-- plugin manager
|
||||||
require("config.lazy")
|
require("config.lazy")
|
||||||
@@ -11,9 +15,13 @@ require("config.gen-private")
|
|||||||
require("config.lsp")
|
require("config.lsp")
|
||||||
require("config.mason")
|
require("config.mason")
|
||||||
require("config.treesitter")
|
require("config.treesitter")
|
||||||
|
require("config.treesitter-context")
|
||||||
require("config.gitsigns")
|
require("config.gitsigns")
|
||||||
require("config.lualine")
|
require("config.lualine")
|
||||||
require("config.telescope")
|
require("config.telescope")
|
||||||
|
require("config.indentline")
|
||||||
|
require("config.redmine")
|
||||||
|
require("config.diffview")
|
||||||
|
|
||||||
-- for some reason this must be placed in init.lua file
|
-- for some reason this must be placed in init.lua file
|
||||||
-- it doesn't work in any lua/config/*.lua files
|
-- it doesn't work in any lua/config/*.lua files
|
||||||
|
|||||||
@@ -24,4 +24,9 @@ cmp.setup({
|
|||||||
vim.snippet.expand(args.body)
|
vim.snippet.expand(args.body)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
-- switch on rounded borders in floating completion windows
|
||||||
|
window = {
|
||||||
|
completion = cmp.config.window.bordered(),
|
||||||
|
documentation = cmp.config.window.bordered(),
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
2
.config/nvim/lua/config/diffview.lua
Normal file
2
.config/nvim/lua/config/diffview.lua
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
require("diffview").setup({
|
||||||
|
})
|
||||||
1
.config/nvim/lua/config/env.lua
Normal file
1
.config/nvim/lua/config/env.lua
Normal file
@@ -0,0 +1 @@
|
|||||||
|
vim.env.LLM_KEY = "None"
|
||||||
23
.config/nvim/lua/config/filetypes.lua
Normal file
23
.config/nvim/lua/config/filetypes.lua
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
vim.api.nvim_create_autocmd('Filetype', {
|
||||||
|
pattern = {
|
||||||
|
'xml',
|
||||||
|
'html',
|
||||||
|
'xhtml',
|
||||||
|
'css',
|
||||||
|
'scss',
|
||||||
|
'javascript',
|
||||||
|
'typescript',
|
||||||
|
'lua',
|
||||||
|
'jsx',
|
||||||
|
'tsx',
|
||||||
|
'typescriptreact',
|
||||||
|
'javascriptreact',
|
||||||
|
'htmldjango'
|
||||||
|
},
|
||||||
|
command = 'setlocal shiftwidth=4 tabstop=4 expandtab'
|
||||||
|
})
|
||||||
|
vim.api.nvim_create_autocmd('Filetype', {
|
||||||
|
pattern = { 'yaml',
|
||||||
|
},
|
||||||
|
command = 'setlocal shiftwidth=2 tabstop=2 expandtab'
|
||||||
|
})
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
require('gitsigns').setup()
|
require('gitsigns').setup()
|
||||||
local gitsigns = require('gitsigns')
|
local gitsigns = require('gitsigns')
|
||||||
vim.keymap.set('n', '<leader>gm', gitsigns.blame_line, { desc = 'Show git message for current line' })
|
vim.keymap.set('n', '<leader>gm', gitsigns.blame_line, { desc = 'Show git message for current line' })
|
||||||
vim.keymap.set('n', '<leader>gd', gitsigns.diffthis, { desc = 'Show diff for current line' })
|
vim.keymap.set('n', '<leader>gd', ':Gitsigns diffthis ~ vertical=true<CR>:wincmd w<CR>', { desc = 'Show diff for current line' })
|
||||||
|
vim.keymap.set('n', '<leader>gr', gitsigns.reset_hunk, { desc = 'Reset current hunk' })
|
||||||
vim.keymap.set('n', '<leader>h', gitsigns.next_hunk, { desc = 'Move to next hunk' })
|
vim.keymap.set('n', '<leader>h', gitsigns.next_hunk, { desc = 'Move to next hunk' })
|
||||||
vim.keymap.set('n', '<leader>H', gitsigns.prev_hunk, { desc = 'Move to previous hunk' })
|
vim.keymap.set('n', '<leader>H', gitsigns.prev_hunk, { desc = 'Move to previous hunk' })
|
||||||
|
vim.keymap.set('n', '<leader>ph', gitsigns.preview_hunk, { desc = 'Preview hunk in popup' })
|
||||||
|
|||||||
3
.config/nvim/lua/config/indentline.lua
Normal file
3
.config/nvim/lua/config/indentline.lua
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
require'indentmini'.setup()
|
||||||
|
vim.cmd.highlight('IndentLine guifg=#444444')
|
||||||
|
vim.cmd.highlight('IndentLineCurrent guifg=#557755')
|
||||||
@@ -33,6 +33,9 @@ require("lazy").setup({
|
|||||||
install = { colorscheme = { "habamax" } },
|
install = { colorscheme = { "habamax" } },
|
||||||
-- automatically check for plugin updates
|
-- automatically check for plugin updates
|
||||||
checker = { enabled = true },
|
checker = { enabled = true },
|
||||||
|
ui = {
|
||||||
|
border = "rounded",
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Open lazy menu with :Lazy check
|
-- Open lazy menu with :Lazy check
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ lspconfig_defaults.capabilities = vim.tbl_deep_extend(
|
|||||||
require('cmp_nvim_lsp').default_capabilities()
|
require('cmp_nvim_lsp').default_capabilities()
|
||||||
)
|
)
|
||||||
|
|
||||||
|
require'lspconfig'.ts_ls.setup{}
|
||||||
|
|
||||||
-- This is where you enable features that only work
|
-- This is where you enable features that only work
|
||||||
-- if there is a language server active in the file
|
-- if there is a language server active in the file
|
||||||
vim.api.nvim_create_autocmd('LspAttach', {
|
vim.api.nvim_create_autocmd('LspAttach', {
|
||||||
|
|||||||
@@ -11,3 +11,8 @@ vim.opt.incsearch = true
|
|||||||
|
|
||||||
vim.opt.signcolumn = "yes"
|
vim.opt.signcolumn = "yes"
|
||||||
|
|
||||||
|
vim.o.termguicolors = true
|
||||||
|
|
||||||
|
vim.diagnostic.config({
|
||||||
|
virtual_text = true,
|
||||||
|
})
|
||||||
|
|||||||
@@ -4,12 +4,29 @@ vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = 'Telescope live gr
|
|||||||
vim.keymap.set('n', '<leader>fb', builtin.buffers, { desc = 'Telescope buffers' })
|
vim.keymap.set('n', '<leader>fb', builtin.buffers, { desc = 'Telescope buffers' })
|
||||||
vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = 'Telescope help tags' })
|
vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = 'Telescope help tags' })
|
||||||
vim.keymap.set('n', '<leader>ft', builtin.treesitter, { desc = 'Telescope treesitter picker' })
|
vim.keymap.set('n', '<leader>ft', builtin.treesitter, { desc = 'Telescope treesitter picker' })
|
||||||
|
-- find selected text in visual mode with Ctrl-f via telescope:
|
||||||
|
vim.keymap.set('v', '<C-f>', 'y<ESC>:Telescope live_grep default_text=<C-r>0<CR>', default_opts)
|
||||||
|
|
||||||
|
-- grep hidden files as well
|
||||||
|
local telescopeConfig = require("telescope.config")
|
||||||
|
local vimgrep_arguments = { unpack(telescopeConfig.values.vimgrep_arguments) }
|
||||||
|
-- I want to search in hidden/dot files.
|
||||||
|
table.insert(vimgrep_arguments, "--hidden")
|
||||||
|
-- I don't want to search in the `.git` directory.
|
||||||
|
table.insert(vimgrep_arguments, "--glob")
|
||||||
|
table.insert(vimgrep_arguments, "!**/.git/*")
|
||||||
|
|
||||||
require('telescope').setup({
|
require('telescope').setup({
|
||||||
defaults = {
|
defaults = {
|
||||||
layout_strategy = 'vertical',
|
vimgrep_arguments = vimgrep_arguments,
|
||||||
layout_config = {
|
layout_strategy = 'vertical',
|
||||||
vertical = { width = 0.95 }
|
layout_config = {
|
||||||
|
vertical = { width = 0.95 }
|
||||||
|
},
|
||||||
|
},
|
||||||
|
pickers = {
|
||||||
|
find_files = {
|
||||||
|
find_command = { "rg", "--files", "--hidden", "--glob", "!**/.git/*" },
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
|
||||||
})
|
})
|
||||||
|
|||||||
3
.config/nvim/lua/config/treesitter-context.lua
Normal file
3
.config/nvim/lua/config/treesitter-context.lua
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
require'treesitter-context'.setup{
|
||||||
|
enable = true,
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
require'nvim-treesitter.configs'.setup {
|
require'nvim-treesitter.configs'.setup {
|
||||||
-- A list of parser names, or "all" (the listed parsers MUST always be installed)
|
-- A list of parser names, or "all" (the listed parsers MUST always be installed)
|
||||||
ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "markdown", "markdown_inline", "python", "javascript", "css", "html", "yaml", "java", "bash", "csv", "dockerfile", "htmldjango", "json", "nginx" },
|
ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "markdown", "markdown_inline", "python", "javascript", "css", "html", "yaml", "java", "bash", "csv", "dockerfile", "htmldjango", "json", "nginx", "latex" },
|
||||||
|
|
||||||
-- Install parsers synchronously (only applied to `ensure_installed`)
|
-- Install parsers synchronously (only applied to `ensure_installed`)
|
||||||
sync_install = false,
|
sync_install = false,
|
||||||
@@ -34,4 +34,9 @@ require'nvim-treesitter.configs'.setup {
|
|||||||
-- Instead of true it can also be a list of languages
|
-- Instead of true it can also be a list of languages
|
||||||
additional_vim_regex_highlighting = false,
|
additional_vim_regex_highlighting = false,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
-- indent with treesitter is currently experimental, just mark text and hit "="
|
||||||
|
indent = {
|
||||||
|
enable = true,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
3
.config/nvim/lua/plugins/diffview.lua
Normal file
3
.config/nvim/lua/plugins/diffview.lua
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
return {
|
||||||
|
"sindrets/diffview.nvim"
|
||||||
|
}
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
return {
|
return {
|
||||||
{'lewis6991/gitsigns.nvim'}
|
{'lewis6991/gitsigns.nvim', version='^1.0.2'}
|
||||||
}
|
}
|
||||||
|
|||||||
3
.config/nvim/lua/plugins/indentline.lua
Normal file
3
.config/nvim/lua/plugins/indentline.lua
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
return {
|
||||||
|
"nvimdev/indentmini.nvim",
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
return {
|
return {
|
||||||
{'neovim/nvim-lspconfig'},
|
{'neovim/nvim-lspconfig', tag = 'v1.7.0'}, -- pin to a version thats compatible with nvim < 0.10
|
||||||
{'hrsh7th/cmp-nvim-lsp'},
|
{'hrsh7th/cmp-nvim-lsp'},
|
||||||
{'hrsh7th/nvim-cmp'},
|
{'hrsh7th/nvim-cmp'},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
return {
|
return {
|
||||||
|
-- pin version due to https://github.com/mason-org/mason.nvim/issues/1929
|
||||||
-- mason for downloading language servers
|
-- mason for downloading language servers
|
||||||
{'williamboman/mason.nvim'},
|
{'williamboman/mason.nvim', version = "^1.0.0"},
|
||||||
-- mason-lspconfig to configure auto setup of language servers
|
-- mason-lspconfig to configure auto setup of language servers
|
||||||
{'williamboman/mason-lspconfig.nvim'},
|
{'williamboman/mason-lspconfig.nvim', version = "^1.0.0"},
|
||||||
}
|
}
|
||||||
|
|||||||
6
.config/nvim/lua/plugins/redmine.lua
Normal file
6
.config/nvim/lua/plugins/redmine.lua
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
return {
|
||||||
|
"sgross-emlix/angerona.nvim",
|
||||||
|
dependencies = {
|
||||||
|
"nvim-lua/plenary.nvim",
|
||||||
|
},
|
||||||
|
}
|
||||||
4
.config/nvim/lua/plugins/treesitter-context.lua
Normal file
4
.config/nvim/lua/plugins/treesitter-context.lua
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
return {
|
||||||
|
{'nvim-treesitter/nvim-treesitter-context',
|
||||||
|
},
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
return {
|
return {
|
||||||
{'nvim-treesitter/nvim-treesitter'}
|
{'nvim-treesitter/nvim-treesitter',
|
||||||
|
tag = 'v0.9.3'}, -- pin to a version that works with nvim < 0.10
|
||||||
-- configure parsers via config/treesitter.lua
|
-- configure parsers via config/treesitter.lua
|
||||||
-- update parsers with :TSUpdate
|
-- update parsers with :TSUpdate
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -87,6 +87,12 @@ handle_extension() {
|
|||||||
pandoc -s -t markdown -- "${FILE_PATH}" && exit 5
|
pandoc -s -t markdown -- "${FILE_PATH}" && exit 5
|
||||||
exit 1;;
|
exit 1;;
|
||||||
|
|
||||||
|
## DOCX
|
||||||
|
docx)
|
||||||
|
## Uses: https://github.com/bgreenwell/doxx
|
||||||
|
doxx "${FILE_PATH}" && exit 5
|
||||||
|
exit 1;;
|
||||||
|
|
||||||
## XLSX
|
## XLSX
|
||||||
xlsx)
|
xlsx)
|
||||||
## Preview as csv conversion
|
## Preview as csv conversion
|
||||||
|
|||||||
@@ -3,6 +3,11 @@ set -g default-shell /usr/bin/zsh
|
|||||||
set-window-option -g window-active-style bg=terminal
|
set-window-option -g window-active-style bg=terminal
|
||||||
# grayed background for inactive panes
|
# grayed background for inactive panes
|
||||||
set-window-option -g window-style bg="#32302f"
|
set-window-option -g window-style bg="#32302f"
|
||||||
|
# ensure "autoread" works in nvim (auto reload files when changed)
|
||||||
|
set-option -g focus-events on
|
||||||
|
# https://gist.github.com/andersevenrud/015e61af2fd264371032763d4ed965b6
|
||||||
|
set -g default-terminal "tmux-256color"
|
||||||
|
set -ag terminal-overrides ",xterm-256color:RGB"
|
||||||
|
|
||||||
# List of plugins
|
# List of plugins
|
||||||
|
|
||||||
|
|||||||
@@ -59,6 +59,26 @@ m4a2mp3()
|
|||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Show all blob objects in repo sorted from smalles to largest
|
||||||
|
# https://stackoverflow.com/a/42544963
|
||||||
|
git-blobs()
|
||||||
|
{
|
||||||
|
git rev-list --objects --all --missing=print |
|
||||||
|
git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' |
|
||||||
|
sed -n 's/^blob //p' |
|
||||||
|
sort --numeric-sort --key=2 |
|
||||||
|
cut -c 1-12,41- |
|
||||||
|
$(command -v gnumfmt || echo numfmt) --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest
|
||||||
|
}
|
||||||
|
|
||||||
|
sshs()
|
||||||
|
{
|
||||||
|
tmprc=$(ssh $1 "mktemp --directory")
|
||||||
|
scp -q $HOME/.zshrc $1:$tmprc
|
||||||
|
ssh -t $1 "export ZDOTDIR=${tmprc}; exec zsh"
|
||||||
|
ssh $1 "rm -rf ${tmprc}"
|
||||||
|
}
|
||||||
|
|
||||||
# show the current mode:
|
# show the current mode:
|
||||||
#PR_VIMODE="#"
|
#PR_VIMODE="#"
|
||||||
#function zle-keymap-select
|
#function zle-keymap-select
|
||||||
|
|||||||
Reference in New Issue
Block a user