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

Updated scripts

Browse Source
This commit is contained in:
Christoffer Martinsson
2024-10-26 10:58:05 +02:00
parent 6fd989a641
commit a3ba35ab9e
4 changed files with 35 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
config/nvim/init.lua
View File

@@ -22,7 +22,6 @@ vim.o.undofile = true
vim.o.ignorecase = true
vim.o.smartcase = true
-- Keep signcolumn on by default
vim.wo.signcolumn = 'yes'
@@ -251,57 +250,6 @@ require('lazy').setup({
require("fzf-lua").setup({})
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",
@@ -476,10 +424,6 @@ require('lazy').setup({
-- GUI ------------------------------------------------------
-- {
-- 'https://github.com/fresh2dev/zellij.vim.git',
-- lazy = false,
-- },
{
'mrjones2014/smart-splits.nvim',
@@ -502,7 +446,7 @@ require('lazy').setup({
sections = {
lualine_a = { 'mode' },
lualine_b = { 'branch', 'diff' },
lualine_c = { 'filename' },
lualine_c = { 'diagnostics', 'filename' },
lualine_x = {
{
-- Lsp server name .
@@ -835,7 +779,6 @@ require 'lspconfig'.lua_ls.setup {
}
-- Setup neovim lua configuration
-- require("telescope").load_extension "file_browser"
-- [[ Configure nvim-cmp ]]
local cmp = require 'cmp'
@@ -942,10 +885,8 @@ cmp.setup.cmdline(':', {
-- [[ Configure Treesitter ]]
require('nvim-treesitter.configs').setup {
-- Add languages to be installed here that you want installed for treesitter
ensure_installed = { 'markdown', 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim' },
-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
auto_install = false,
ensure_installed = { 'markdown_inline', 'markdown', 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim' },
auto_install = true,
highlight = { enable = true },
indent = { enable = true },
@@ -1019,29 +960,14 @@ vim.keymap.set('n', '<leader><leader>h', require('smart-splits').swap_buf_left,
vim.keymap.set('n', '<leader><leader>j', require('smart-splits').swap_buf_down, { desc = 'Swap buffer down' })
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' })
-- telescope
-- vim.keymap.set('n', '<leader>fo', require('telescope.builtin').oldfiles, { desc = 'Find recently opened files' })
-- vim.keymap.set('n', '<leader>ff',
-- ":lua require('telescope.builtin').find_files()<cr>",
-- { desc = 'Find files', silent = true })
-- vim.keymap.set('n', '<leader>fh',
-- ":lua require('telescope.builtin').find_files({ hidden = true})<cr>",
-- { desc = 'Find files', silent = true })
-- 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>sg', require('telescope.builtin').live_grep, { desc = 'Search by grep' })
-- vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = 'Search diagnostics' })
--Other
vim.keymap.set('n', 's', ":HopWord<cr>", { desc = 'hop', 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', '<leader>gg', ":LazyGitCurrentFile<cr>", { desc = 'Format code', silent = true })
vim.keymap.set('n', '<C-m>', ":make<cr>", { desc = 'Format code', silent = true })
vim.keymap.set('n', '<C-n>', ":make clean<cr>", { desc = 'Format code', silent = true })
vim.keymap.set('n', '<C-s>', ":write<cr>", { desc = 'Save', silent = true })
vim.keymap.set('n', '<C-q>', ":quit<cr>", { desc = 'Quit', silent = true })
vim.keymap.set('n', '<leader>n', ":tabnew<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', 's', ":HopWord<cr>", { desc = 'hop', silent = true })
vim.keymap.set('n', '<leader>t', ":Trouble diagnostics toggle<cr>", { desc = 'Diagnostic view', silent = true })
vim.keymap.set('n', '<leader>d', ":Trouble diagnostics toggle<cr>", { desc = 'Diagnostic view', silent = true })
vim.keymap.set('n', '<leader>f', ":FzfLua files<cr>", { desc = 'Find file', silent = true })