Compare commits
5 Commits
b11e2ec42c
...
d91c913358
Author | SHA1 | Date | |
---|---|---|---|
d91c913358 | |||
035c49b127 | |||
482caeb821 | |||
14cee7d351 | |||
8dd7fe61fc |
|
@ -1,2 +1,3 @@
|
||||||
gitignore
|
gitignore
|
||||||
profiles
|
profiles
|
||||||
|
configs
|
||||||
|
|
54
git/configs/delta.gitconfig
Normal file
54
git/configs/delta.gitconfig
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
[delta "gruvmax-fang"]
|
||||||
|
# author: https://github.com/maxfangx
|
||||||
|
# Modified by: Dreaded_X
|
||||||
|
# General appearance
|
||||||
|
dark = true
|
||||||
|
syntax-theme = gruvbox-dark
|
||||||
|
# File
|
||||||
|
file-style = "#FFFFFF" bold
|
||||||
|
file-added-label = [+]
|
||||||
|
file-copied-label = [==]
|
||||||
|
file-modified-label = [*]
|
||||||
|
file-removed-label = [-]
|
||||||
|
file-renamed-label = [->]
|
||||||
|
file-decoration-style = "#434C5E" ul
|
||||||
|
file-decoration-style = "#84786A" ul
|
||||||
|
# No hunk headers
|
||||||
|
hunk-header-style = omit
|
||||||
|
# Line numbers
|
||||||
|
line-numbers = true
|
||||||
|
line-numbers-left-style = "#84786A"
|
||||||
|
line-numbers-right-style = "#84786A"
|
||||||
|
line-numbers-minus-style = "#A02A11"
|
||||||
|
line-numbers-plus-style = "#479B36"
|
||||||
|
line-numbers-zero-style = "#84786A"
|
||||||
|
line-numbers-left-format = " {nm:>3} │"
|
||||||
|
line-numbers-right-format = " {np:>3} │"
|
||||||
|
# Diff contents
|
||||||
|
inline-hint-style = syntax
|
||||||
|
minus-non-emph-style = syntax auto
|
||||||
|
plus-non-emph-style = syntax auto
|
||||||
|
whitespace-error-style = "#FB4934" reverse
|
||||||
|
# Blame
|
||||||
|
blame-code-style = syntax
|
||||||
|
# Merge conflicts
|
||||||
|
merge-conflict-begin-symbol = ⌃
|
||||||
|
merge-conflict-end-symbol = ⌄
|
||||||
|
merge-conflict-ours-diff-header-style = "#FABD2F" bold
|
||||||
|
merge-conflict-theirs-diff-header-style = "#FABD2F" bold overline
|
||||||
|
merge-conflict-ours-diff-header-decoration-style = ''
|
||||||
|
merge-conflict-theirs-diff-header-decoration-style = ''
|
||||||
|
|
||||||
|
[core]
|
||||||
|
pager = delta
|
||||||
|
|
||||||
|
[interactive]
|
||||||
|
diffFilter = delta --color-only
|
||||||
|
|
||||||
|
[delta]
|
||||||
|
features = gruvmax-fang
|
||||||
|
navigate = true
|
||||||
|
side-by-side = true
|
||||||
|
|
||||||
|
[merge]
|
||||||
|
conflictstyle = zdiff3
|
5
git/configs/lfs.gitconfig
Normal file
5
git/configs/lfs.gitconfig
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
[filter "lfs"]
|
||||||
|
process = git-lfs filter-process
|
||||||
|
required = true
|
||||||
|
clean = git-lfs clean -- %f
|
||||||
|
smudge = git-lfs smudge -- %f
|
|
@ -1,11 +1,9 @@
|
||||||
[include]
|
[include]
|
||||||
path = ~/.dotfiles/git/profiles/common
|
path = ~/.dotfiles/git/configs/common.gitconfig
|
||||||
path = ~/.dotfiles/git/profiles/Dreaded_X
|
path = ~/.dotfiles/git/configs/lfs.gitconfig
|
||||||
|
path = ~/.dotfiles/git/configs/delta.gitconfig
|
||||||
|
|
||||||
|
path = ~/.dotfiles/git/profiles/ALTEN.gitconfig
|
||||||
|
|
||||||
[includeIf "gitdir:~/Projects/ALTEN/"]
|
[includeIf "gitdir:~/Projects/ALTEN/"]
|
||||||
path = ~/.dotfiles/git/profiles/ALTEN
|
path = ~/.dotfiles/git/profiles/ALTEN.gitconfig
|
||||||
[filter "lfs"]
|
|
||||||
process = git-lfs filter-process
|
|
||||||
required = true
|
|
||||||
clean = git-lfs clean -- %f
|
|
||||||
smudge = git-lfs smudge -- %f
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{
|
{
|
||||||
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
||||||
|
"actions-preview.nvim": { "branch": "master", "commit": "36513ad213855d497b7dd3391a24d1d75d58e36f" },
|
||||||
"blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
|
"blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
|
||||||
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
||||||
"conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" },
|
"conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" },
|
||||||
|
@ -17,7 +18,7 @@
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "67da97f8c2fd12d05427bb485ce07ee6418e0a51" },
|
"mason-lspconfig.nvim": { "branch": "main", "commit": "67da97f8c2fd12d05427bb485ce07ee6418e0a51" },
|
||||||
"mason-tool-installer.nvim": { "branch": "main", "commit": "93a9ff9b34c91c0cb0f7de8d5f7e4abce51d8903" },
|
"mason-tool-installer.nvim": { "branch": "main", "commit": "93a9ff9b34c91c0cb0f7de8d5f7e4abce51d8903" },
|
||||||
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
|
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
|
||||||
"neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" },
|
"neo-tree.nvim": { "branch": "v3.x", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" },
|
||||||
"nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" },
|
"nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" },
|
||||||
"nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" },
|
"nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" },
|
||||||
"nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" },
|
"nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" },
|
||||||
|
|
|
@ -27,7 +27,9 @@ map("<leader>th", function()
|
||||||
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
|
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
|
||||||
end, "Toggle inlay hints")
|
end, "Toggle inlay hints")
|
||||||
|
|
||||||
map("gra", vim.lsp.buf.code_action, "Code actions", { "n", "x" })
|
map("gra", function()
|
||||||
|
require("actions-preview").code_actions()
|
||||||
|
end, "Code actions", { "n", "x" })
|
||||||
map("grD", vim.lsp.buf.declaration, "Goto declaration")
|
map("grD", vim.lsp.buf.declaration, "Goto declaration")
|
||||||
map("grd", function()
|
map("grd", function()
|
||||||
require("telescope.builtin").lsp_definitions({ jump_type = "never" })
|
require("telescope.builtin").lsp_definitions({ jump_type = "never" })
|
||||||
|
|
28
nvim/dot-config/nvim/lua/plugins/actions-preview.lua
Normal file
28
nvim/dot-config/nvim/lua/plugins/actions-preview.lua
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
-- https://github.com/aznhe21/actions-preview.nvim
|
||||||
|
--- @module "lazy"
|
||||||
|
--- @type LazySpec
|
||||||
|
return {
|
||||||
|
"aznhe21/actions-preview.nvim",
|
||||||
|
opts = function()
|
||||||
|
local hl = require("actions-preview.highlight")
|
||||||
|
return {
|
||||||
|
backend = { "telescope" },
|
||||||
|
highlight_command = {
|
||||||
|
hl.delta(),
|
||||||
|
},
|
||||||
|
telescope = {
|
||||||
|
sorting_strategy = "ascending",
|
||||||
|
layout_strategy = "vertical",
|
||||||
|
layout_config = {
|
||||||
|
width = 0.8,
|
||||||
|
height = 0.9,
|
||||||
|
prompt_position = "top",
|
||||||
|
preview_cutoff = 20,
|
||||||
|
preview_height = function(_, _, max_lines)
|
||||||
|
return max_lines - 15
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
end,
|
||||||
|
}
|
|
@ -6,7 +6,7 @@ local file = require("symbols.file")
|
||||||
--- @type LazySpec
|
--- @type LazySpec
|
||||||
return {
|
return {
|
||||||
"nvim-neo-tree/neo-tree.nvim",
|
"nvim-neo-tree/neo-tree.nvim",
|
||||||
version = "v3.x",
|
branch = "v3.x",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
"MunifTanjim/nui.nvim",
|
"MunifTanjim/nui.nvim",
|
||||||
|
|
|
@ -48,6 +48,7 @@ ZSH_TMUX_FIXTERM=true
|
||||||
source $ZSH/oh-my-zsh.sh
|
source $ZSH/oh-my-zsh.sh
|
||||||
|
|
||||||
less_termcap[so]="${fg_bold[black]}${bg[white]}"
|
less_termcap[so]="${fg_bold[black]}${bg[white]}"
|
||||||
|
export LESS="-F -R -i --incsearch -M"
|
||||||
|
|
||||||
export PATH="${HOME}/.local/bin:${HOME}/.cargo/bin:$PATH"
|
export PATH="${HOME}/.local/bin:${HOME}/.cargo/bin:$PATH"
|
||||||
export EDITOR=nvim
|
export EDITOR=nvim
|
||||||
|
|
Loading…
Reference in New Issue
Block a user