mirror of
https://github.com/szymon-jozef/superior_dotfiles.git
synced 2026-09-07 12:10:38 +02:00
Remove .config/nvim/init.lua
Remove .config/nvim/lazy-lock.json Remove .config/nvim/lua/nvim_is_strange/lazy.lua Remove .config/nvim/lua/nvim_is_strange/plugins/colorscheme.lua Remove .config/nvim/lua/nvim_is_strange/plugins/git.lua Remove .config/nvim/lua/nvim_is_strange/plugins/harpoon.lua Remove .config/nvim/lua/nvim_is_strange/plugins/lsp.lua Remove .config/nvim/lua/nvim_is_strange/plugins/telescope.lua Remove .config/nvim/lua/nvim_is_strange/plugins/treesitter.lua Remove .config/nvim/lua/nvim_is_strange/plugins/undotree.lua Remove .config/nvim/lua/nvim_is_strange/plugins/whichkey.lua Remove .config/nvim/lua/nvim_is_strange/remaps.lua Remove .config/nvim/lua/nvim_is_strange/set.lua Remove .config/nvim/spell/pl.cp1250.spl Remove .config/nvim/spell/pl.iso-8859-2.spl Remove .config/nvim/spell/pl.utf-8.spl
This commit is contained in:
@@ -1,5 +0,0 @@
|
||||
require("nvim_is_strange.lazy")
|
||||
require("nvim_is_strange.set")
|
||||
require("nvim_is_strange.remaps")
|
||||
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
{
|
||||
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
||||
"LuaSnip": { "branch": "master", "commit": "b3104910bb5ebf40492aadffae18f2528fa757d9" },
|
||||
"autoclose.nvim": { "branch": "main", "commit": "3f86702b54a861a17d7994b2e32a7c648cb12fb1" },
|
||||
"catppuccin": { "branch": "main", "commit": "f19cab18ec4dc86d415512c7a572863b2adbcc18" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
|
||||
"cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
|
||||
"cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
|
||||
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
|
||||
"fidget.nvim": { "branch": "main", "commit": "4d5858bd4c471c895060e1b9f3575f1551184dc5" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "f780609807eca1f783a36a8a31c30a48fbe150c5" },
|
||||
"harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "a1067cf84b4ff81b66d2bf4d01f4cbdb5de40bd0" },
|
||||
"mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "107c2458cdc780c4ed2c2b5e1b7800cd019010bd" },
|
||||
"nvim-surround": { "branch": "main", "commit": "75de1782c781961e392efcca57601bf436f4d550" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"phpactor.nvim": { "branch": "main", "commit": "f4aba0b309f74b015f4a19a07e2befd6f1a0e6ca" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
|
||||
"undotree": { "branch": "main", "commit": "511984f0f2528a53dc27044feb2f63023b7b0027" },
|
||||
"vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
vim.g.mapleader = " "
|
||||
|
||||
-- Bootstrap lazy.nvim
|
||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
|
||||
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
|
||||
if vim.v.shell_error ~= 0 then
|
||||
vim.api.nvim_echo({
|
||||
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
|
||||
{ out, "WarningMsg" },
|
||||
{ "\nPress any key to exit..." },
|
||||
}, true, {})
|
||||
vim.fn.getchar()
|
||||
os.exit(1)
|
||||
end
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
vim.opt.rtp:prepend(vim.fn.stdpath("data") .. "/lazy/")
|
||||
|
||||
-- Setup lazy.nvim
|
||||
require("lazy").setup({
|
||||
spec = {
|
||||
-- import your plugins
|
||||
{ import = "nvim_is_strange.plugins" },
|
||||
},
|
||||
install = { colorscheme = { "minimal" } },
|
||||
checker = { enabled = true },
|
||||
ui = {
|
||||
border = "rounded"
|
||||
}
|
||||
})
|
||||
@@ -1,3 +0,0 @@
|
||||
return {
|
||||
"catppuccin/nvim", name = "catppuccin", priority = 1000
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
return {
|
||||
"lewis6991/gitsigns.nvim",
|
||||
|
||||
config = function()
|
||||
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, -- Toggle with `:Gitsigns toggle_signs`
|
||||
numhl = false, -- Toggle with `:Gitsigns toggle_numhl`
|
||||
linehl = false, -- Toggle with `:Gitsigns toggle_linehl`
|
||||
word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff`
|
||||
watch_gitdir = {
|
||||
follow_files = true
|
||||
},
|
||||
auto_attach = true,
|
||||
attach_to_untracked = false,
|
||||
current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
|
||||
current_line_blame_opts = {
|
||||
virt_text = true,
|
||||
virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
|
||||
delay = 1000,
|
||||
ignore_whitespace = false,
|
||||
virt_text_priority = 100,
|
||||
use_focus = true,
|
||||
},
|
||||
current_line_blame_formatter = '<author>, <author_time:%R> - <summary>',
|
||||
sign_priority = 6,
|
||||
update_debounce = 100,
|
||||
status_formatter = nil, -- Use default
|
||||
max_file_length = 40000, -- Disable if file is longer than this (in lines)
|
||||
preview_config = {
|
||||
-- Options passed to nvim_open_win
|
||||
border = 'single',
|
||||
style = 'minimal',
|
||||
relative = 'cursor',
|
||||
row = 0,
|
||||
col = 1
|
||||
},
|
||||
}
|
||||
end
|
||||
}
|
||||
@@ -1,48 +0,0 @@
|
||||
return {
|
||||
"ThePrimeagen/harpoon",
|
||||
|
||||
branch = "harpoon2",
|
||||
dependencies = { "nvim-lua/plenary.nvim" },
|
||||
|
||||
config = function()
|
||||
local harpoon = require("harpoon")
|
||||
|
||||
-- REQUIRED
|
||||
harpoon:setup()
|
||||
-- REQUIRED
|
||||
|
||||
vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end, { desc = "Add file to harpoon" })
|
||||
vim.keymap.set("n", "<leader>r", function() harpoon:list():remove() end, { desc = "Remove file from harpoon" })
|
||||
vim.keymap.set("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
|
||||
|
||||
vim.keymap.set("n", "<C-h>", function() harpoon:list():select(1) end)
|
||||
vim.keymap.set("n", "<C-j>", function() harpoon:list():select(2) end)
|
||||
vim.keymap.set("n", "<C-k>", function() harpoon:list():select(3) end)
|
||||
vim.keymap.set("n", "<C-l>", function() harpoon:list():select(4) end)
|
||||
|
||||
-- Toggle previous & next buffers stored within Harpoon list
|
||||
vim.keymap.set("n", "<C-S-P>", function() harpoon:list():prev() end)
|
||||
vim.keymap.set("n", "<C-S-N>", function() harpoon:list():next() end)
|
||||
|
||||
-- basic telescope configuration
|
||||
local conf = require("telescope.config").values
|
||||
local function toggle_telescope(harpoon_files)
|
||||
local file_paths = {}
|
||||
for _, item in ipairs(harpoon_files.items) do
|
||||
table.insert(file_paths, item.value)
|
||||
end
|
||||
|
||||
require("telescope.pickers").new({}, {
|
||||
prompt_title = "Harpoon",
|
||||
finder = require("telescope.finders").new_table({
|
||||
results = file_paths,
|
||||
}),
|
||||
previewer = conf.file_previewer({}),
|
||||
sorter = conf.generic_sorter({}),
|
||||
}):find()
|
||||
end
|
||||
|
||||
vim.keymap.set("n", "<C-e>", function() toggle_telescope(harpoon:list()) end,
|
||||
{ desc = "Open harpoon window" })
|
||||
end
|
||||
}
|
||||
@@ -1,195 +0,0 @@
|
||||
return {
|
||||
'neovim/nvim-lspconfig',
|
||||
dependencies = {
|
||||
"williamboman/mason.nvim",
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
"hrsh7th/cmp-nvim-lsp",
|
||||
"hrsh7th/cmp-buffer",
|
||||
"hrsh7th/cmp-path",
|
||||
"hrsh7th/cmp-cmdline",
|
||||
"hrsh7th/nvim-cmp",
|
||||
"L3MON4D3/LuaSnip",
|
||||
"saadparwaiz1/cmp_luasnip",
|
||||
"j-hui/fidget.nvim",
|
||||
"numToStr/Comment.nvim",
|
||||
"lukas-reineke/indent-blankline.nvim",
|
||||
"kylechui/nvim-surround",
|
||||
'm4xshen/autoclose.nvim',
|
||||
"gbprod/phpactor.nvim",
|
||||
"RRethy/vim-illuminate",
|
||||
},
|
||||
config = function()
|
||||
local cmp_lsp = require("cmp_nvim_lsp")
|
||||
local capabilities = vim.tbl_deep_extend(
|
||||
"force",
|
||||
{},
|
||||
vim.lsp.protocol.make_client_capabilities(),
|
||||
cmp_lsp.default_capabilities()
|
||||
)
|
||||
|
||||
|
||||
vim.diagnostic.config({
|
||||
virtual_text = {
|
||||
prefix = "●", -- możesz zmienić na "▎", "x", "" itd.
|
||||
spacing = 2, -- odstęp od kodu
|
||||
source = "if_many", -- pokaż źródło błędu (np. rust-analyzer)
|
||||
},
|
||||
signs = true, -- znaki w kolumnie po lewej
|
||||
underline = true, -- podkreślenie błędnych fragmentów
|
||||
update_in_insert = false, -- nie aktualizuj w trybie insert
|
||||
})
|
||||
|
||||
|
||||
vim.keymap.set('n', '<leader>ci', function()
|
||||
vim.diagnostic.open_float(nil, {
|
||||
focus = true,
|
||||
scope = "cursor",
|
||||
border = "rounded",
|
||||
source = "always",
|
||||
})
|
||||
end, { desc = "Pokaż diagnostykę LSP w popupie" })
|
||||
|
||||
require("fidget").setup({})
|
||||
require("mason").setup()
|
||||
|
||||
require('mason-lspconfig').setup({
|
||||
ensure_installed = {
|
||||
"lua_ls",
|
||||
"emmet_language_server",
|
||||
"marksman",
|
||||
"rust-analyzer"
|
||||
},
|
||||
handlers = { -- config lsp
|
||||
function(server_name)
|
||||
require("lspconfig")[server_name].setup({
|
||||
capabilities = capabilities,
|
||||
})
|
||||
end,
|
||||
lua_ls = function()
|
||||
require('lspconfig').lua_ls.setup({
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
Lua = {
|
||||
runtime = {
|
||||
version = 'LuaJIT'
|
||||
},
|
||||
diagnostics = {
|
||||
globals = { 'vim', 'love' },
|
||||
},
|
||||
workspace = {
|
||||
library = {
|
||||
vim.env.VIMRUNTIME,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
end,
|
||||
|
||||
rust_analyzer = function()
|
||||
require('lspconfig').rust_analyzer.setup({
|
||||
settings = {
|
||||
["rust-analyzer"] = {
|
||||
diagnostics = {
|
||||
enable = true
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
end,
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
local cmp = require("cmp")
|
||||
local cmp_select = { behavior = cmp.SelectBehavior.Select }
|
||||
|
||||
require("luasnip.loaders.from_vscode").lazy_load()
|
||||
|
||||
cmp.setup({
|
||||
sources = {
|
||||
{ name = 'path' },
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "luasnip", keyword_lenght = 2 },
|
||||
{ name = "buffer", keyword_lenght = 3 },
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
|
||||
['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
|
||||
['<C-y>'] = cmp.mapping.confirm({ select = true }),
|
||||
}),
|
||||
snippets = {
|
||||
expand = function(args)
|
||||
require('luasnip').lsp_expand(args.body)
|
||||
end,
|
||||
},
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
formatting = {
|
||||
fields = { 'menu', 'abbr', 'kind' },
|
||||
|
||||
format = function(entry, item)
|
||||
local menu_icon = {
|
||||
nvim_lsp = 'λ',
|
||||
luasnip = '⋗',
|
||||
buffer = 'Ω',
|
||||
path = '🖫',
|
||||
nvim_lua = 'Π',
|
||||
}
|
||||
|
||||
item.menu = menu_icon[entry.source.name]
|
||||
return item
|
||||
end,
|
||||
}
|
||||
})
|
||||
|
||||
-- autoformat --
|
||||
local buffer_autoformat = function(bufnr)
|
||||
local group = 'lsp_autoformat'
|
||||
vim.api.nvim_create_augroup(group, { clear = false })
|
||||
vim.api.nvim_clear_autocmds({ group = group, buffer = bufnr })
|
||||
|
||||
vim.api.nvim_create_autocmd('BufWritePre', {
|
||||
buffer = bufnr,
|
||||
group = group,
|
||||
desc = "LSP format on save",
|
||||
callback = function()
|
||||
vim.lsp.buf.format({ async = false, timeout_ms = 10000 })
|
||||
end
|
||||
})
|
||||
end
|
||||
|
||||
vim.api.nvim_create_autocmd('LspAttach', {
|
||||
callback = function(event)
|
||||
local id = vim.tbl_get(event, 'data', 'client_id')
|
||||
local client = id and vim.lsp.get_client_by_id(id)
|
||||
|
||||
if client == nil then
|
||||
return
|
||||
end
|
||||
|
||||
if client.supports_method('textDocument/formatting') then
|
||||
buffer_autoformat(event.buf)
|
||||
end
|
||||
end
|
||||
})
|
||||
|
||||
require("Comment").setup({
|
||||
mappings = {
|
||||
basic = true
|
||||
},
|
||||
opleader = {
|
||||
line = '<leader>cl',
|
||||
block = '<leader>cb',
|
||||
}
|
||||
})
|
||||
|
||||
require("ibl").setup()
|
||||
|
||||
require("nvim-surround").setup()
|
||||
require("autoclose").setup()
|
||||
end
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
return {
|
||||
'nvim-telescope/telescope.nvim', tag = '0.1.8',
|
||||
dependencies = { 'nvim-lua/plenary.nvim' }
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
return {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
return {
|
||||
"jiaoshijie/undotree",
|
||||
dependencies = "nvim-lua/plenary.nvim",
|
||||
keys = { -- load the plugin only when using it's keybinding:
|
||||
{ "<leader>u", "<cmd>lua require('undotree').toggle()<cr>", desc = "Show undotree" },
|
||||
},
|
||||
config = function()
|
||||
require('undotree').setup({
|
||||
float_diff = true, -- using float window previews diff, set this `true` will disable layout option
|
||||
layout = "left_bottom", -- "left_bottom", "left_left_bottom"
|
||||
position = "left", -- "right", "bottom"
|
||||
ignore_filetype = { 'undotree', 'undotreeDiff', 'qf', 'TelescopePrompt', 'spectre_panel', 'tsplayground' },
|
||||
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",
|
||||
},
|
||||
}
|
||||
|
||||
)
|
||||
end
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
return {
|
||||
"folke/which-key.nvim",
|
||||
event = "VeryLazy",
|
||||
opts = {
|
||||
-- your configuration comes here
|
||||
-- or leave it empty to use the default settings
|
||||
-- refer to the configuration section below
|
||||
},
|
||||
keys = {
|
||||
{
|
||||
"<leader>?",
|
||||
function()
|
||||
require("which-key").show({ global = false })
|
||||
end,
|
||||
desc = "Buffer Local Keymaps (which-key)",
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
-- telescope --
|
||||
|
||||
local builtin = require('telescope.builtin')
|
||||
vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = 'Telescope find files' })
|
||||
vim.keymap.set('n', '<leader>fg', builtin.git_files, { desc = 'Telescope find git' })
|
||||
|
||||
-- lsp --
|
||||
vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, { noremap = true, silent = true, desc = "Code action" })
|
||||
|
||||
vim.keymap.set('n', '<leader>cf', vim.lsp.buf.format, { desc = "Code format" })
|
||||
|
||||
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = "Go to definition" })
|
||||
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { desc = "Go to implementation" })
|
||||
|
||||
vim.keymap.set('n', '<leader>r', vim.lsp.buf.rename, { desc = "Rename symbol" })
|
||||
|
||||
-- move shit --
|
||||
vim.keymap.set('x', '>', ">gv", { desc = "Move code right" })
|
||||
vim.keymap.set('x', '<', "<gv", { desc = "Move code left" })
|
||||
|
||||
-- autosave in markdown--
|
||||
vim.api.nvim_create_autocmd("InsertLeave", {
|
||||
callback = function()
|
||||
if vim.bo.modified and vim.bo.ft == "markdown" then
|
||||
vim.cmd("w");
|
||||
end
|
||||
end
|
||||
})
|
||||
-- other --
|
||||
vim.keymap.set('n', '<space>', '<Nop>')
|
||||
@@ -1,45 +0,0 @@
|
||||
-- Kolorystyka
|
||||
vim.cmd.colorscheme "catppuccin-latte"
|
||||
|
||||
-- Wygląd
|
||||
vim.opt.relativenumber = true
|
||||
vim.opt.number = true
|
||||
vim.opt.signcolumn = 'yes'
|
||||
vim.opt.cursorline = false
|
||||
|
||||
-- Automatyczne podświetlanie skopiowanej linii po użyciu 'yy'
|
||||
vim.api.nvim_create_augroup("YankHighlight", { clear = true })
|
||||
vim.api.nvim_create_autocmd("TextYankPost", {
|
||||
group = "YankHighlight",
|
||||
callback = function()
|
||||
vim.highlight.on_yank({ higroup = "IncSearch", timeout = 200 })
|
||||
end,
|
||||
})
|
||||
|
||||
-- Włącz widoczność whitespaces
|
||||
vim.opt.list = true
|
||||
|
||||
-- Tabulatory i wcięcia
|
||||
vim.opt.tabstop = 4
|
||||
vim.opt.softtabstop = 4
|
||||
vim.opt.shiftwidth = 4
|
||||
vim.opt.expandtab = true
|
||||
vim.opt.smartindent = true
|
||||
|
||||
-- Przewijanie i kursor
|
||||
vim.opt.scrolloff = 8
|
||||
vim.o.sidescrolloff = 8
|
||||
vim.opt.cursorline = true
|
||||
|
||||
-- Wyszukiwanie
|
||||
vim.opt.incsearch = true
|
||||
vim.opt.hlsearch = false
|
||||
|
||||
-- Ogólne ustawienia
|
||||
vim.opt.clipboard = "unnamedplus"
|
||||
vim.opt.wrap = false
|
||||
vim.opt.updatetime = 50
|
||||
|
||||
-- Język --
|
||||
vim.opt.spell = true
|
||||
vim.opt.spelllang = { 'pl', 'en' }
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user