pnx/dotfiles
1
0
Fork 0
mirror of https://github.com/pnx/dotfiles synced 2026-06-16 19:30:01 +02:00
Code Activity

touching nvim in special places

Browse source
This commit is contained in:
Henrik Hautakoski 2024-05-27 18:51:54 +02:00
parent 1c5dd5bd9c
commit e8d1b84519
11 changed files with 121 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

13
nvim/lua/config/cmp.lua
View file

@ -11,7 +11,8 @@ return function()
local windowstyle = {
border = vim.g.float_border or "none",
winhighlight = "Normal:Pmenu,FloatBorder:FloatBorder,CursorLine:PmenuSel,Search:None",
}
}
return {
preselect = false,
@ -20,10 +21,12 @@ return function()
},
view = {
entries = { name = "custom", selection_order = "near_cursor" },
},
},
window = {
documentation = windowstyle,
completion = windowstyle,
completion = vim.tbl_deep_extend("force", windowstyle, {
scrolloff = 4,
}),
},
mapping = {
["<Up>"] = selectPrev,
@ -49,8 +52,8 @@ return function()
}),
},
sources = {
{ name = "nvim_lsp" },
{ name = "luasnip" },
{ name = "nvim_lsp" },
{ name = "luasnip" },
{ name = "buffer" },
{ name = "path" },
{

7
nvim/lua/config/filetypes.lua
View file

@ -50,6 +50,13 @@ autocmd('Filetype', {
command = 'setlocal ts=2 sts=2 sw=2 expandtab'
})
-- Softtab (4) for CSS types
autocmd('Filetype', {
group = 'indent',
pattern = { 'css', 'scss', 'less' },
command = 'setlocal ts=4 sts=4 sw=4 expandtab'
})
-- Hardtabs for c/cpp
autocmd('Filetype', {
group = 'indent',

8
nvim/lua/config/keymaps.lua
View file

@ -1,4 +1,5 @@
local cmd = vim.cmd
local buffers = require('utils.buffers')
return {
leader = " ",
@ -46,7 +47,7 @@ return {
{ { "n", "v" }, "<leader>p", [["+p]], { desc = "Paste from system clipboard register" } },
-- File operations
{ "n", "gf", "<cmd>e <cfile><CR>", { silent = true, desc = "Open (or create) file under cursor" } },
--{ "n", "gf", "<cmd>e <cfile><CR>", { silent = true, desc = "Open (or create) file under cursor" } },
{ "n", "<leader>Fc", ":CreateFile ", { silent = true, desc = "Create new file" } },
{ "n", "<leader>Fx", "<cmd>!chmod +x %<CR>", { silent = true, desc = "Set execute flag on current file" } },
@ -54,8 +55,8 @@ return {
{ "n", "<leader>bn", cmd.bn, { silent = true, desc = "Move to next buffer" } },
{ "n", "<leader>bb", cmd.bp, { silent = true, desc = "Move to previous buffer" } },
{ "n", "<leader>bd", cmd.bd, { silent = true, desc = "Close current buffer" } },
{ "n", "<leader>bc", "<cmd>BufferLineCloseOthers<cr>", { silent = true, desc = "Close all other buffers" } },
{ "n", "<leader>bD", "<cmd>%bd<cr>", { silent = true, desc = "Close all buffers" } },
{ "n", "<leader>bc", buffers.CloseOthers, { silent = true, desc = "Close all other buffers" } },
{ "n", "<leader>bD", buffers.CloseAll, { silent = true, desc = "Close all buffers" } },
-- Indent
{ 'n', "<Tab>", "^=$" },
@ -133,6 +134,7 @@ return {
{ '<leader>sf', '<cmd>Telescope find_files<cr>', desc = 'Search files' },
{ '<leader>sF', '<cmd>lua require("telescope.builtin").find_files({no_ignore=true})<cr>', desc = 'Search all files' },
{ '<leader>sb', '<cmd>Telescope buffers<cr>', desc = 'Search buffers' },
--{ '<leader>sb', '<cmd>lua require("utils.telescope").buffers()<cr>', desc = 'Search buffers' },
{ '<leader>sa', '<cmd>Telescope live_grep<cr>', desc = 'Search in files' },
{ '<leader>sg', '<cmd>Telescope git_files<cr>', desc = 'Search Git files' },
{ '<leader>so', '<cmd>Telescope oldfiles<cr>', desc = 'Search Old files' },

10
nvim/lua/config/lsp.lua
View file

@ -2,10 +2,20 @@ vim.g.lsp_zero_ui_float_border = vim.g.float_border or 'none'
return {
document_highlight = true,
nonels = function()
local null_ls = require("null-ls")
return {
--null_ls.builtins.completion.luasnip,
null_ls.builtins.code_actions.impl,
null_ls.builtins.code_actions.gitsigns,
null_ls.builtins.diagnostics.phpstan,
}
end,
servers = {
-- Bash
bashls = {},
-- PHP
-- intelephense = {},
phpactor = {
settings = {
init_options = {

2
nvim/lua/config/options.lua
View file

@ -115,6 +115,8 @@ vim.diagnostic.config({
},
float = {
border = vim.g.float_border,
header = false,
source = true,
}
})

77
nvim/lua/config/telescope.lua
View file

@ -1,37 +1,46 @@
local icons = require('config.icons')
local icons = require("config.icons")
return function()
local actions = require("telescope.actions")
return {
defaults = {
border = {
prompt = { 1, 1, 1, 1 },
results = { 1, 1, 1, 1 },
preview = { 1, 1, 1, 1 },
},
path_display = { truncate = 1 },
prompt_prefix = ' ',
selection_caret = icons.current .. ' ',
multi_icon = icons.selected .. ' ',
file_ignore_patterns = {
".git/",
"node_modules/"
},
mappings = {
i = {
["<esc>"] = actions.close
}
}
},
pickers = {
find_files = {
hidden = true
}
},
extensions = {
["ui-select"] = {
require("telescope.themes").get_dropdown()
}
}
}
local actions = require("telescope.actions")
return {
defaults = {
border = {
prompt = { 1, 1, 1, 1 },
results = { 1, 1, 1, 1 },
preview = { 1, 1, 1, 1 },
},
path_display = { truncate = 1 },
prompt_prefix = " ",
selection_caret = icons.current .. " ",
multi_icon = icons.selected .. " ",
file_ignore_patterns = {
".git/",
"node_modules/",
},
mappings = {
i = {
["<esc>"] = actions.close,
},
},
},
pickers = {
find_files = {
hidden = true,
},
buffers = {
theme = "dropdown",
previewer = false,
mappings = {
i = {
["<c-d>"] = actions.delete_buffer + actions.move_to_top,
},
},
},
},
extensions = {
["ui-select"] = {
require("telescope.themes").get_dropdown(),
},
},
}
end

8
nvim/lua/plugins/lsp.lua
View file

@ -4,7 +4,13 @@ return {
dependencies = {
"neovim/nvim-lspconfig",
"hrsh7th/cmp-nvim-lsp",
{
"nvimtools/none-ls.nvim",
opts = require("config.lsp").nonels,
config = function(_, opts)
require("null-ls").setup({sources = opts})
end,
},
-- completion
{
"hrsh7th/nvim-cmp",

17
nvim/lua/utils/buffers.lua Normal file
View file

@ -0,0 +1,17 @@
local M = {}
function M.CloseOthers()
for _, i in ipairs(vim.api.nvim_list_bufs()) do
if i ~= vim.api.nvim_get_current_buf() then
vim.api.nvim_buf_delete(i, {})
end
end
end
function M.CloseAll()
for _, i in ipairs(vim.api.nvim_list_bufs()) do
vim.api.nvim_buf_delete(i, {})
end
end
return M