cm/linuxbox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More testing

Browse Source
This commit is contained in:
Christoffer Martinsson 2024-10-20 20:18:59 +02:00
parent ea4d53dbb9
commit 79aee22045
1 changed files with 109 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
config/nvim/init.lua
View File

@ -208,74 +208,99 @@ require('lazy').setup({
}, },
-- File explorer ------------------------------------------- -- File explorer -------------------------------------------
-- {
-- 's1n7ax/nvim-window-picker',
-- version = '2.*',
-- config = function()
-- require 'window-picker'.setup({
-- filter_rules = {
-- include_current_win = false,
-- autoselect_one = true,
-- -- filter using buffer options
-- bo = {
-- -- if the file type is one of following, the window will be ignored
-- filetype = { 'neo-tree', "neo-tree-popup", "notify" },
-- -- if the buffer type is one of following, the window will be ignored
-- buftype = { 'terminal', "quickfix" },
-- },
-- },
-- highlights = {
-- statusline = {
-- unfocused = {
-- fg = '#d7af5f',
-- bg = '#262626',
-- bold = true,
-- },
-- focused = {
-- fg = '#d7af5f',
-- bg = '#262626',
-- bold = true,
-- },
-- },
-- },
-- })
-- end,
-- },
{ {
'nvim-telescope/telescope.nvim', "ibhagwan/fzf-lua",
dependencies = { 'nvim-lua/plenary.nvim' }, -- optional for icon support
opts = function() dependencies = { "nvim-tree/nvim-web-devicons" },
local actions = require "telescope.actions"
return {
defaults = {
path_display = { "truncate" },
mappings = {
i = {
["<C-n>"] = actions.cycle_history_next,
["<C-p>"] = actions.cycle_history_prev,
["<C-j>"] = actions.move_selection_next,
["<C-k>"] = actions.move_selection_previous,
["<C-l>"] = actions.select_default,
["<C-c>"] = actions.close,
},
n = {
["q"] = actions.close,
["<C-c>"] = actions.close,
},
},
},
}
end,
},
{
"nvim-telescope/telescope-file-browser.nvim",
dependencies = {
"nvim-telescope/telescope.nvim",
"nvim-lua/plenary.nvim",
},
},
{
's1n7ax/nvim-window-picker',
version = '2.*',
config = function() config = function()
require 'window-picker'.setup({ -- calling `setup` is optional for customization
filter_rules = { require("fzf-lua").setup({})
include_current_win = false, end
autoselect_one = true,
-- filter using buffer options
bo = {
-- if the file type is one of following, the window will be ignored
filetype = { 'neo-tree', "neo-tree-popup", "notify" },
-- if the buffer type is one of following, the window will be ignored
buftype = { 'terminal', "quickfix" },
},
},
highlights = {
statusline = {
unfocused = {
fg = '#d7af5f',
bg = '#262626',
bold = true,
},
focused = {
fg = '#d7af5f',
bg = '#262626',
bold = true,
},
},
},
})
end,
}, },
-- {
-- 'nvim-telescope/telescope.nvim',
-- dependencies = { 'nvim-lua/plenary.nvim' },
-- opts = function()
-- local actions = require "telescope.actions"
-- return {
-- defaults = {
-- previewer = false,
-- path_display = { "truncate" },
-- mappings = {
-- i = {
-- ["<C-n>"] = actions.cycle_history_next,
-- ["<C-p>"] = actions.cycle_history_prev,
-- ["<C-j>"] = actions.move_selection_next,
-- ["<C-k>"] = actions.move_selection_previous,
-- ["<C-l>"] = actions.select_default,
-- ["<C-c>"] = actions.close,
-- ["<C-v>"] = function(prompt_bufnr)
-- -- Use nvim-window-picker to choose the window by dynamically attaching a function
-- local action_set = require('telescope.actions.set')
-- local action_state = require('telescope.actions.state')
--
-- local picker = action_state.get_current_picker(prompt_bufnr)
-- picker.get_selection_window = function(picker, entry)
-- local picked_window_id = require('window-picker').pick_window() or
-- vim.api.nvim_get_current_win()
-- -- Unbind after using so next instance of the picker acts normally
-- picker.get_selection_window = nil
-- return picked_window_id
-- end
--
-- return action_set.edit(prompt_bufnr, 'edit')
-- end,
-- },
-- n = {
-- ["q"] = actions.close,
-- ["<C-c>"] = actions.close,
-- },
-- },
-- },
-- }
-- end,
-- },
-- {
-- "nvim-telescope/telescope-file-browser.nvim",
-- dependencies = {
-- "nvim-telescope/telescope.nvim",
-- "nvim-lua/plenary.nvim",
-- },
-- },
{ {
"nvim-neo-tree/neo-tree.nvim", "nvim-neo-tree/neo-tree.nvim",
@ -294,13 +319,6 @@ require('lazy').setup({
open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, -- when opening files, do not use windows containing these filetypes or buftypes open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, -- when opening files, do not use windows containing these filetypes or buftypes
sort_case_insensitive = false, -- used when sorting files and directories in the tree sort_case_insensitive = false, -- used when sorting files and directories in the tree
sort_function = nil, -- use a custom function for sorting files and directories in the tree sort_function = nil, -- use a custom function for sorting files and directories in the tree
-- sort_function = function (a,b)
-- if a.type == b.type then
-- return a.path > b.path
-- else
-- return a.type > b.type
-- end
-- end , -- this sorts files and directories descendantly
default_component_configs = { default_component_configs = {
container = { container = {
enable_character_fade = true enable_character_fade = true
@ -402,7 +420,7 @@ require('lazy').setup({
require("neo-tree.ui.renderer").focus_node(state, node:get_child_ids()[1]) require("neo-tree.ui.renderer").focus_node(state, node:get_child_ids()[1])
end end
else -- if not a directory just open it else -- if not a directory just open it
state.commands.open_with_window_picker(state) state.commands.open(state)
end end
end, end,
copy_selector = function(state) copy_selector = function(state)
@ -443,7 +461,7 @@ require('lazy').setup({
}, },
window = { window = {
position = "float", position = "float",
width = 30, width = 40,
mappings = { mappings = {
["<space>"] = false, -- disable space until we figure out which-key disabling ["<space>"] = false, -- disable space until we figure out which-key disabling
h = "parent_or_close", h = "parent_or_close",
@ -683,13 +701,13 @@ local on_attach = function(_, bufnr)
nmap('gd', vim.lsp.buf.definition, 'Goto Definition') nmap('gd', vim.lsp.buf.definition, 'Goto Definition')
nmap('gD', vim.lsp.buf.declaration, 'Goto Declaration') nmap('gD', vim.lsp.buf.declaration, 'Goto Declaration')
nmap('gI', vim.lsp.buf.implementation, 'Goto Implementation') nmap('gI', vim.lsp.buf.implementation, 'Goto Implementation')
nmap('gr', require('telescope.builtin').lsp_references, 'Goto References') -- nmap('gr', require('telescope.builtin').lsp_references, 'Goto References')
nmap('<leader>D', vim.lsp.buf.type_definition, 'Type Definition') nmap('<leader>D', vim.lsp.buf.type_definition, 'Type Definition')
nmap('K', vim.lsp.buf.hover, 'Hover Documentation') nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation') nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
-- nmap('<A-f>', vim.lsp.buf.format(), 'Format current buffer') -- nmap('<A-f>', vim.lsp.buf.format(), 'Format current buffer')
nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, 'Document Symbols') -- nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, 'Document Symbols')
nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Workspace Symbols') -- nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Workspace Symbols')
-- Create a command `:Format` local to the LSP buffer -- Create a command `:Format` local to the LSP buffer
vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_) vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
@ -816,7 +834,7 @@ require 'lspconfig'.lua_ls.setup {
} }
-- Setup neovim lua configuration -- Setup neovim lua configuration
require("telescope").load_extension "file_browser" -- require("telescope").load_extension "file_browser"
-- [[ Configure nvim-cmp ]] -- [[ Configure nvim-cmp ]]
local cmp = require 'cmp' local cmp = require 'cmp'
@ -1001,18 +1019,17 @@ vim.keymap.set('n', '<leader><leader>j', require('smart-splits').swap_buf_down,
vim.keymap.set('n', '<leader><leader>k', require('smart-splits').swap_buf_up, { desc = 'Swap buffer up' }) vim.keymap.set('n', '<leader><leader>k', require('smart-splits').swap_buf_up, { desc = 'Swap buffer up' })
vim.keymap.set('n', '<leader><leader>l', require('smart-splits').swap_buf_right, { desc = 'Swap buffer right' }) vim.keymap.set('n', '<leader><leader>l', require('smart-splits').swap_buf_right, { desc = 'Swap buffer right' })
-- telescope -- telescope
vim.keymap.set('n', '<leader>fo', require('telescope.builtin').oldfiles, { desc = 'Find recently opened files' }) -- vim.keymap.set('n', '<leader>fo', require('telescope.builtin').oldfiles, { desc = 'Find recently opened files' })
vim.keymap.set('n', '<leader>ff', -- vim.keymap.set('n', '<leader>ff',
":lua require('telescope.builtin').find_files()<cr>", -- ":lua require('telescope.builtin').find_files()<cr>",
{ desc = 'Find files', silent = true }) -- { desc = 'Find files', silent = true })
vim.keymap.set('n', '<leader>fh', -- vim.keymap.set('n', '<leader>fh',
":lua require('telescope.builtin').find_files({ hidden = true})<cr>", -- ":lua require('telescope.builtin').find_files({ hidden = true})<cr>",
{ desc = 'Find files', silent = true }) -- { desc = 'Find files', silent = true })
vim.keymap.set('n', '<leader>fb', ":Telescope file_browser<cr>", { desc = 'File browser', silent = true }) -- vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = 'Search help' })
vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = 'Search help' }) -- vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string, { desc = 'Search current word' })
vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string, { desc = 'Search current word' }) -- vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc = 'Search by grep' })
vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc = 'Search by grep' }) -- vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = 'Search diagnostics' })
vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = 'Search diagnostics' })
--Other --Other
vim.keymap.set('n', '<tab>', ":tabNext<cr>", { desc = 'Next tab', silent = true }) vim.keymap.set('n', '<tab>', ":tabNext<cr>", { desc = 'Next tab', silent = true })
vim.keymap.set('n', '<A-f>', ":Format<cr>", { desc = 'Format code', silent = true }) vim.keymap.set('n', '<A-f>', ":Format<cr>", { desc = 'Format code', silent = true })
@ -1025,4 +1042,5 @@ vim.keymap.set('n', '<leader>n', ":tabnew<cr>", { desc = 'Format code', silent =
vim.keymap.set('n', '<leader>c', ":tabclose<cr>", { desc = 'Format code', silent = true }) vim.keymap.set('n', '<leader>c', ":tabclose<cr>", { desc = 'Format code', silent = true })
vim.keymap.set('n', '<leader>e', ":Neotree filesystem reveal float toggle<cr>", { desc = 'File explorer', silent = true }) vim.keymap.set('n', '<leader>e', ":Neotree filesystem reveal float toggle<cr>", { desc = 'File explorer', silent = true })
vim.keymap.set('n', 's', ":HopWord<cr>", { desc = 'hop', silent = true }) vim.keymap.set('n', 's', ":HopWord<cr>", { desc = 'hop', silent = true })
vim.keymap.set('n', '<leader>t', ":TroubleToggle<cr>", { desc = 'Trouble view', silent = true }) vim.keymap.set('n', '<leader>t', ":Trouble diagnostics toggle<cr>", { desc = 'Diagnostic view', silent = true })
vim.keymap.set('n', '<leader>f', ":FzfLua files<cr>", { desc = 'Find file', silent = true })