mirror of
https://git.aramjonghu.nl/AramJonghu/nvim.git
synced 2026-06-08 14:18:24 +02:00
Compare commits
22 Commits
12c16a649a
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
0dc34abcc0
|
|||
|
fd7a0daede
|
|||
|
fb24c7430b
|
|||
|
9eab1602d0
|
|||
|
4ff8b00b46
|
|||
|
96caa99e91
|
|||
|
cae71c8c69
|
|||
| 1443924f9b | |||
| 82ffdf6ef4 | |||
| 626a11d76f | |||
| 26e76a065b | |||
| bdf07b7f2d | |||
| a53ff4ebca | |||
| 761297c7e8 | |||
| b46a6e8537 | |||
| 1e21f81c50 | |||
| eb9a46aa65 | |||
| 5baacf2a15 | |||
| c14eb51fad | |||
| f19c66766f | |||
| 6dafec86f9 | |||
| 863a27f195 |
@@ -0,0 +1,14 @@
|
||||
function! neoformat#formatters#qml#enabled() abort
|
||||
return ['qmlformat']
|
||||
endfunction
|
||||
|
||||
function! neoformat#formatters#qml#qmlformat() abort
|
||||
return {
|
||||
\ 'exe': '/usr/lib/qt6/bin/qmlformat',
|
||||
\ 'args': ['-t', '-n', '--objects-spacing', '--functions-spacing', '-i'],
|
||||
\ 'replace': 1,
|
||||
\ 'stderr': 1,
|
||||
\ 'stdin': 0
|
||||
\ }
|
||||
endfunction
|
||||
|
||||
@@ -4,10 +4,6 @@ require "config.lazy"
|
||||
require "mappings"
|
||||
require "autocmd"
|
||||
vim.cmd "source ~/.config/nvim/suda.vim"
|
||||
local time = tonumber(os.date "%H")
|
||||
-- local time = tonumber(os.date "%H")
|
||||
|
||||
vim.filetype.add {
|
||||
pattern = {[".*/hypr/.*%.conf"] = "hyprlang", [".*/uwsm/env.*"] = "zsh"}
|
||||
}
|
||||
|
||||
vim.cmd [[colorscheme catppuccin-macchiato]]
|
||||
vim.cmd [[colorscheme catppuccin-mocha]]
|
||||
|
||||
@@ -1 +1,17 @@
|
||||
local autocmd = vim.api.nvim_create_autocmd
|
||||
local augroup = vim.api.nvim_create_augroup
|
||||
|
||||
local neoformat_group = augroup("NeoformatOnSave", { clear = true })
|
||||
|
||||
autocmd("BufWritePost", {
|
||||
group = neoformat_group,
|
||||
callback = function()
|
||||
if vim.bo.buftype ~= "" or vim.bo.modifiable == false or vim.bo.readonly then
|
||||
return
|
||||
end
|
||||
if vim.fn.exists ":Neoformat" ~= 2 then
|
||||
return
|
||||
end
|
||||
vim.cmd "silent! Neoformat"
|
||||
end,
|
||||
})
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
require("gitsigns").setup {
|
||||
signs = {
|
||||
add = { text = "┃" },
|
||||
change = { text = "┃" },
|
||||
delete = { text = "_" },
|
||||
topdelete = { text = "‾" },
|
||||
changedelete = { text = "~" },
|
||||
untracked = { text = "┆" },
|
||||
},
|
||||
signs_staged = {
|
||||
add = { text = "┃" },
|
||||
change = { text = "┃" },
|
||||
delete = { text = "_" },
|
||||
topdelete = { text = "‾" },
|
||||
changedelete = { text = "~" },
|
||||
untracked = { text = "┆" },
|
||||
},
|
||||
signs_staged_enable = true,
|
||||
signcolumn = true,
|
||||
numhl = false,
|
||||
linehl = false,
|
||||
word_diff = false,
|
||||
watch_gitdir = {
|
||||
follow_files = true,
|
||||
},
|
||||
auto_attach = true,
|
||||
attach_to_untracked = false,
|
||||
current_line_blame = false,
|
||||
current_line_blame_opts = {
|
||||
virt_text = true,
|
||||
virt_text_pos = "eol",
|
||||
delay = 1000,
|
||||
ignore_whitespace = false,
|
||||
virt_text_priority = 100,
|
||||
use_focus = true,
|
||||
},
|
||||
current_line_blame_formatter = "<author>, <author_time:%R> - <summary>",
|
||||
blame_formatter = nil,
|
||||
sign_priority = 6,
|
||||
update_debounce = 100,
|
||||
status_formatter = nil,
|
||||
max_file_length = 40000,
|
||||
preview_config = {
|
||||
style = "minimal",
|
||||
relative = "cursor",
|
||||
row = 0,
|
||||
col = 1,
|
||||
},
|
||||
}
|
||||
@@ -3,8 +3,10 @@ local cmp_cap = require("config.cmp").capabilities
|
||||
local servers = {
|
||||
"zls",
|
||||
"ts_ls",
|
||||
"eslint",
|
||||
"yamlls",
|
||||
"vimls",
|
||||
"ruff",
|
||||
"pyright",
|
||||
"denols",
|
||||
"lua_ls",
|
||||
@@ -17,13 +19,12 @@ local servers = {
|
||||
"nginx_language_server",
|
||||
"docker_compose_language_service",
|
||||
"dockerls",
|
||||
"rust_analyzer",
|
||||
"html",
|
||||
"cssls",
|
||||
"tailwindcss",
|
||||
"jdtls",
|
||||
"odinls",
|
||||
"powershell_es",
|
||||
"rust_analyzer",
|
||||
}
|
||||
|
||||
for _, server in ipairs(servers) do
|
||||
@@ -32,3 +33,28 @@ for _, server in ipairs(servers) do
|
||||
})
|
||||
vim.lsp.enable(server)
|
||||
end
|
||||
|
||||
vim.lsp.config("powershell_es", {
|
||||
capabilities = cmp_cap,
|
||||
bundle_path = "/opt/powershell-editor-services",
|
||||
})
|
||||
|
||||
vim.lsp.config("rust_analyzer", {
|
||||
capabilities = cmp_cap,
|
||||
settings = {
|
||||
["rust-analyzer"] = {
|
||||
check = {
|
||||
command = "clippy",
|
||||
trigger = "onType",
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
vim.lsp.config("eslint", {
|
||||
settings = {
|
||||
experimental = {
|
||||
useFlatConfig = true,
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
let g:neoformat_enabled_yaml = ['prettierd']
|
||||
|
||||
let g:neoformat_ps1_psscriptanalyzer = {
|
||||
\ 'exe': 'pwsh',
|
||||
\ 'args': ['-NoProfile', '-Command',
|
||||
\ '"Import-Module (Resolve-Path \"/opt/powershell-editor-services/PSScriptAnalyzer/*/PSScriptAnalyzer.psd1\" | Select-Object -ExpandProperty Path); Invoke-Formatter -ScriptDefinition (\$input | Out-String)"'],
|
||||
\ 'stdin': 1,
|
||||
\ }
|
||||
let g:neoformat_enabled_ps1 = ['psscriptanalyzer']
|
||||
|
||||
let g:neoformat_enabled_qml = ['qmlformat']
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
require("neorg").setup {
|
||||
load = {
|
||||
["core.defaults"] = {},
|
||||
},
|
||||
}
|
||||
@@ -1 +1,14 @@
|
||||
if not vim.F then
|
||||
vim.F = {}
|
||||
end
|
||||
|
||||
if not vim.F.if_nil and not vim.nonnil then
|
||||
vim.F.if_nil = function(value, default)
|
||||
if value == nil then
|
||||
return default
|
||||
end
|
||||
return value
|
||||
end
|
||||
end
|
||||
|
||||
require("telescope").setup {}
|
||||
|
||||
@@ -12,13 +12,13 @@ require("undotree").setup {
|
||||
},
|
||||
window = { winblend = 30 },
|
||||
keymaps = {
|
||||
["j"] = "move_next",
|
||||
["k"] = "move_prev",
|
||||
["gj"] = "move2parent",
|
||||
["J"] = "move_change_next",
|
||||
["K"] = "move_change_prev",
|
||||
["<cr>"] = "action_enter",
|
||||
["p"] = "enter_diffbuf",
|
||||
["q"] = "quit",
|
||||
["move_next"] = "j",
|
||||
["move_prev"] = "k",
|
||||
["move2parent"] = "gj",
|
||||
["move_change_next"] = "J",
|
||||
["move_change_prev"] = "K",
|
||||
["action_enter"] = "<cr>",
|
||||
["enter_diffbuf"] = "p",
|
||||
["quit"] = "q",
|
||||
},
|
||||
}
|
||||
|
||||
+5
-1
@@ -8,10 +8,14 @@ end)
|
||||
map(
|
||||
"n",
|
||||
"<leader>ff",
|
||||
"<cmd>lua require'telescope.builtin'.find_files({ find_command = {'rg', '--files', '--hidden', '-g', '!.git' }})<cr>",
|
||||
"<cmd>lua require('telescope.builtin').live_grep({ additional_args = function() return { '--hidden', '-g', '!.git' } end })<cr>",
|
||||
default_opts
|
||||
)
|
||||
|
||||
map("n", "<leader>fn", "<Cmd>Telescope find_files<CR>")
|
||||
|
||||
map("n", "<leader>ww", "<Cmd>lua vim.diagnostic.open_float()<CR>")
|
||||
|
||||
map({ "n", "v" }, "<leader>ap", require("actions-preview").code_actions)
|
||||
|
||||
map("n", "<Tab>", "<Cmd>BufferLineCycleNext<CR>")
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
return {
|
||||
{
|
||||
"mg979/vim-visual-multi",
|
||||
},
|
||||
{
|
||||
"lewis6991/gitsigns.nvim",
|
||||
config = function()
|
||||
require "gitsigns"
|
||||
end,
|
||||
},
|
||||
{ "vimpostor/vim-tpipeline" },
|
||||
{
|
||||
"aznhe21/actions-preview.nvim",
|
||||
|
||||
Reference in New Issue
Block a user