From 0637a4c8db585b468f80a75d21d63d413a6a9ec8 Mon Sep 17 00:00:00 2001 From: Bruno Montezano Date: Wed, 8 Mar 2023 14:30:29 -0300 Subject: [PATCH] Add lua config for Neovim and change autostart from dwm. --- .config/dwm/autostart.sh | 4 +- nvim-lua/after/plugin/colors.lua | 9 ++ nvim-lua/after/plugin/fugitive.lua | 1 + nvim-lua/after/plugin/harpoon.lua | 10 ++ nvim-lua/after/plugin/iron.lua | 49 ++++++ nvim-lua/after/plugin/lsp.lua | 58 ++++++++ nvim-lua/after/plugin/telescope.lua | 6 + nvim-lua/after/plugin/treesitter.lua | 23 +++ nvim-lua/after/plugin/undotree.lua | 1 + nvim-lua/after/plugin/vimtex.lua | 1 + nvim-lua/init.lua | 1 + nvim-lua/lua/bruno/init.lua | 3 + nvim-lua/lua/bruno/packer.lua | 50 +++++++ nvim-lua/lua/bruno/remap.lua | 24 +++ nvim-lua/lua/bruno/set.lua | 31 ++++ nvim-lua/plugin/packer_compiled.lua | 214 +++++++++++++++++++++++++++ 16 files changed, 484 insertions(+), 1 deletion(-) create mode 100644 nvim-lua/after/plugin/colors.lua create mode 100644 nvim-lua/after/plugin/fugitive.lua create mode 100644 nvim-lua/after/plugin/harpoon.lua create mode 100644 nvim-lua/after/plugin/iron.lua create mode 100644 nvim-lua/after/plugin/lsp.lua create mode 100644 nvim-lua/after/plugin/telescope.lua create mode 100644 nvim-lua/after/plugin/treesitter.lua create mode 100644 nvim-lua/after/plugin/undotree.lua create mode 100644 nvim-lua/after/plugin/vimtex.lua create mode 100644 nvim-lua/init.lua create mode 100644 nvim-lua/lua/bruno/init.lua create mode 100644 nvim-lua/lua/bruno/packer.lua create mode 100644 nvim-lua/lua/bruno/remap.lua create mode 100644 nvim-lua/lua/bruno/set.lua create mode 100644 nvim-lua/plugin/packer_compiled.lua diff --git a/.config/dwm/autostart.sh b/.config/dwm/autostart.sh index 3dc72f1..aa64f08 100755 --- a/.config/dwm/autostart.sh +++ b/.config/dwm/autostart.sh @@ -3,4 +3,6 @@ picom & feh --bg-scale ~/img/wallpaper.jpg & dwmblocks & -dualmonitor & +aoc_monitor & +xset r rate 300 50 & +redshift -l -31.8:-52.3 -t 4500:3000 -b 1.0:1.0 -g 0.8 -m randr & diff --git a/nvim-lua/after/plugin/colors.lua b/nvim-lua/after/plugin/colors.lua new file mode 100644 index 0000000..ff6fd84 --- /dev/null +++ b/nvim-lua/after/plugin/colors.lua @@ -0,0 +1,9 @@ +function ColorMyPencils(color) + color = color or "material" + vim.cmd.colorscheme(color) + + vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) + vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) +end + +ColorMyPencils() diff --git a/nvim-lua/after/plugin/fugitive.lua b/nvim-lua/after/plugin/fugitive.lua new file mode 100644 index 0000000..73b78b8 --- /dev/null +++ b/nvim-lua/after/plugin/fugitive.lua @@ -0,0 +1 @@ +vim.keymap.set("n", "gs", vim.cmd.Git); diff --git a/nvim-lua/after/plugin/harpoon.lua b/nvim-lua/after/plugin/harpoon.lua new file mode 100644 index 0000000..eed35ed --- /dev/null +++ b/nvim-lua/after/plugin/harpoon.lua @@ -0,0 +1,10 @@ +local mark = require("harpoon.mark") +local ui = require("harpoon.ui") + +vim.keymap.set("n", "a", mark.add_file) +vim.keymap.set("n", "", ui.toggle_quick_menu) + +vim.keymap.set("n", "", function() ui.nav_file(1) end) +vim.keymap.set("n", "", function() ui.nav_file(2) end) +vim.keymap.set("n", "", function() ui.nav_file(3) end) +vim.keymap.set("n", "", function() ui.nav_file(4) end) diff --git a/nvim-lua/after/plugin/iron.lua b/nvim-lua/after/plugin/iron.lua new file mode 100644 index 0000000..95af608 --- /dev/null +++ b/nvim-lua/after/plugin/iron.lua @@ -0,0 +1,49 @@ +local iron = require("iron.core") +local view = require("iron.view") + +iron.setup { + config = { + -- Whether a repl should be discarded or not + scratch_repl = true, + -- Your repl definitions come here + repl_definition = { + sh = { + -- Can be a table or a function that + -- returns a table (see below) + command = {"bash"} + }, + r = { + command = {"R"} + } + }, + repl_open_cmd = view.split.vertical.botright(0.5), + }, + -- Iron doesn't set keymaps by default anymore. + -- You can set them here or manually add keymaps to the functions in iron.core + keymaps = { + send_motion = "sc", + visual_send = "sc", + send_file = "sf", + send_line = "sl", + send_mark = "sm", + mark_motion = "mc", + mark_visual = "mc", + remove_mark = "md", + cr = "s", + interrupt = "s", + exit = "sq", + clear = "cl", + }, + -- If the highlight is on, you can change how it looks + -- For the available options, check nvim_set_hl + highlight = { + italic = true + }, + ignore_blank_lines = true, -- ignore blank lines when sending visual select lines +} + +-- iron also has a list of commands, see :h iron-commands for all available commands +vim.keymap.set('n', 'rs', 'IronRepl') +vim.keymap.set('n', 'rr', 'IronRestart') +vim.keymap.set('n', 'rf', 'IronFocus') +vim.keymap.set('n', 'rh', 'IronHide') diff --git a/nvim-lua/after/plugin/lsp.lua b/nvim-lua/after/plugin/lsp.lua new file mode 100644 index 0000000..84763e6 --- /dev/null +++ b/nvim-lua/after/plugin/lsp.lua @@ -0,0 +1,58 @@ +local lsp = require('lsp-zero') + +lsp.preset('recommended') + +local cmp = require('cmp') +local cmp_select = {behavior = cmp.SelectBehavior.Select} +local cmp_mappings = lsp.defaults.cmp_mappings({ + [''] = cmp.mapping.select_prev_item(cmp_select), + [''] = cmp.mapping.select_next_item(cmp_select), + [''] = cmp.mapping.confirm({ select = true }), + [""] = cmp.mapping.complete(), +}) + +-- disable completion with tab +-- this helps with copilot setup +cmp_mappings[''] = nil +cmp_mappings[''] = nil + +lsp.setup_nvim_cmp({ + mapping = cmp_mappings +}) + +lsp.set_preferences({ + suggest_lsp_servers = false, + sign_icons = { + error = 'E', + warn = 'W', + hint = 'H', + info = 'I' + } +}) + +vim.diagnostic.config({ + virtual_text = true, +}) + +lsp.on_attach(function(client, bufnr) + local opts = {buffer = bufnr, remap = false} + + if client.name == "eslint" then + vim.cmd [[ LspStop eslint ]] + return + end + + vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts) + vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts) + vim.keymap.set("n", "vws", function() vim.lsp.buf.workspace_symbol() end, opts) + vim.keymap.set("n", "vd", function() vim.diagnostic.open_float() end, opts) + vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts) + vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts) + vim.keymap.set("n", "vca", function() vim.lsp.buf.code_action() end, opts) + vim.keymap.set("n", "vrr", function() vim.lsp.buf.references() end, opts) + vim.keymap.set("n", "vrn", function() vim.lsp.buf.rename() end, opts) + vim.keymap.set("i", "", function() vim.lsp.buf.signature_help() end, opts) +end) + +lsp.preset('recommended') +lsp.setup() diff --git a/nvim-lua/after/plugin/telescope.lua b/nvim-lua/after/plugin/telescope.lua new file mode 100644 index 0000000..4806008 --- /dev/null +++ b/nvim-lua/after/plugin/telescope.lua @@ -0,0 +1,6 @@ +local builtin = require('telescope.builtin') +vim.keymap.set('n', 'pf', builtin.find_files, {}) +vim.keymap.set('n', '', builtin.git_files, {}) +vim.keymap.set('n', 'ps', function() + builtin.grep_string({ search = vim.fn.input("Grep > ") }); +end) diff --git a/nvim-lua/after/plugin/treesitter.lua b/nvim-lua/after/plugin/treesitter.lua new file mode 100644 index 0000000..7786f43 --- /dev/null +++ b/nvim-lua/after/plugin/treesitter.lua @@ -0,0 +1,23 @@ +require'nvim-treesitter.configs'.setup { + -- A list of parser names, or "all" + ensure_installed = { "help", "javascript", "typescript", "r", "sql", "bash", "bibtex", "cmake", "cpp", "css", "gitignore", "go", "html", "java", "julia", "latex", "markdown", "make", "python", "yaml", "perl", "arduino", "c", "lua", "rust" }, + + -- Install parsers synchronously (only applied to `ensure_installed`) + sync_install = false, + + -- Automatically install missing parsers when entering buffer + -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally + auto_install = true, + + highlight = { + -- `false` will disable the whole extension + enable = true, + disable = { "latex" }, + + -- Setting this to true will run `:h syntax` and tree-sitter at the same time. + -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). + -- Using this option may slow down your editor, and you may see some duplicate highlights. + -- Instead of true it can also be a list of languages + additional_vim_regex_highlighting = false, + }, +} diff --git a/nvim-lua/after/plugin/undotree.lua b/nvim-lua/after/plugin/undotree.lua new file mode 100644 index 0000000..b6b9276 --- /dev/null +++ b/nvim-lua/after/plugin/undotree.lua @@ -0,0 +1 @@ +vim.keymap.set("n", "u", vim.cmd.UndotreeToggle) diff --git a/nvim-lua/after/plugin/vimtex.lua b/nvim-lua/after/plugin/vimtex.lua new file mode 100644 index 0000000..c3b5804 --- /dev/null +++ b/nvim-lua/after/plugin/vimtex.lua @@ -0,0 +1 @@ +vim.g.vimtex_view_method = 'zathura' diff --git a/nvim-lua/init.lua b/nvim-lua/init.lua new file mode 100644 index 0000000..e0087ce --- /dev/null +++ b/nvim-lua/init.lua @@ -0,0 +1 @@ +require("bruno") diff --git a/nvim-lua/lua/bruno/init.lua b/nvim-lua/lua/bruno/init.lua new file mode 100644 index 0000000..e61f62a --- /dev/null +++ b/nvim-lua/lua/bruno/init.lua @@ -0,0 +1,3 @@ +require("bruno.packer") +require("bruno.remap") +require("bruno.set") diff --git a/nvim-lua/lua/bruno/packer.lua b/nvim-lua/lua/bruno/packer.lua new file mode 100644 index 0000000..8560c00 --- /dev/null +++ b/nvim-lua/lua/bruno/packer.lua @@ -0,0 +1,50 @@ +return require('packer').startup(function(use) + + use 'wbthomason/packer.nvim' + + use { + 'nvim-telescope/telescope.nvim', tag = '0.1.0', + requires = { {'nvim-lua/plenary.nvim'} } + } + + use('marko-cerovac/material.nvim') + + use('nvim-treesitter/nvim-treesitter', {run = ':TsUpdate'}) + + use('nvim-treesitter/playground') + + use('theprimeagen/harpoon') + + use('mbbill/undotree') + + use('tpope/vim-fugitive') + + use { + 'VonHeikemen/lsp-zero.nvim', + requires = { + -- LSP Support + {'neovim/nvim-lspconfig'}, + {'williamboman/mason.nvim'}, + {'williamboman/mason-lspconfig.nvim'}, + + -- Autocompletion + {'hrsh7th/nvim-cmp'}, + {'hrsh7th/cmp-buffer'}, + {'hrsh7th/cmp-path'}, + {'saadparwaiz1/cmp_luasnip'}, + {'hrsh7th/cmp-nvim-lsp'}, + {'hrsh7th/cmp-nvim-lua'}, + + -- Snippets + {'L3MON4D3/LuaSnip'}, + {'rafamadriz/friendly-snippets'}, + } + } + + use('chrisbra/csv.vim') + + use('hkupty/iron.nvim') + + use('lervag/vimtex') + +end) diff --git a/nvim-lua/lua/bruno/remap.lua b/nvim-lua/lua/bruno/remap.lua new file mode 100644 index 0000000..678fe3b --- /dev/null +++ b/nvim-lua/lua/bruno/remap.lua @@ -0,0 +1,24 @@ +vim.g.mapleader = " " +vim.keymap.set("n", "pv", vim.cmd.Ex) + +vim.keymap.set("v", "J", ":m '>+1gv=gv") +vim.keymap.set("v", "K", ":m '<-2gv=gv") + +vim.keymap.set("n", "J", "mzJ`z") +vim.keymap.set("n", "", "zz") +vim.keymap.set("n", "", "zz") +vim.keymap.set("n", "n", "nzzzv") +vim.keymap.set("n", "N", "Nzzzv") + +-- greatest remap ever +vim.keymap.set("x", "p", "\"_dP") + +-- next greatest remap ever : asbjornHaland +vim.keymap.set("n", "y", "\"+y") +vim.keymap.set("n", "Y", "\"+Y") + +vim.keymap.set("n", "d", "\"_d") +vim.keymap.set("v", "d", "\"_d") + +vim.keymap.set("n", "s", ":%s/\\<\\>//gI") +vim.keymap.set("n", "x", "!chmod +x %", { silent = true }) diff --git a/nvim-lua/lua/bruno/set.lua b/nvim-lua/lua/bruno/set.lua new file mode 100644 index 0000000..078ce73 --- /dev/null +++ b/nvim-lua/lua/bruno/set.lua @@ -0,0 +1,31 @@ +vim.opt.nu = true +vim.opt.relativenumber = true + +vim.opt.tabstop = 4 +vim.opt.softtabstop = 4 +vim.opt.shiftwidth = 4 +vim.opt.expandtab = true + +vim.opt.smartindent = true + +vim.opt.wrap = false + +vim.opt.swapfile = false +vim.opt.backup = false +vim.opt.undofile = true + +vim.opt.incsearch = true +vim.opt.ignorecase = true + +vim.opt.termguicolors = true + +vim.opt.scrolloff = 8 +vim.opt.signcolumn = 'yes' +vim.opt.isfname:append('@-@') + +vim.opt.updatetime = 50 + +vim.opt.colorcolumn = '80' + +vim.g.material_style = 'deep ocean' +vim.cmd 'colorscheme material' diff --git a/nvim-lua/plugin/packer_compiled.lua b/nvim-lua/plugin/packer_compiled.lua new file mode 100644 index 0000000..88efe89 --- /dev/null +++ b/nvim-lua/plugin/packer_compiled.lua @@ -0,0 +1,214 @@ +-- Automatically generated packer.nvim plugin loader code + +if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then + vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') + return +end + +vim.api.nvim_command('packadd packer.nvim') + +local no_errors, error_msg = pcall(function() + +_G._packer = _G._packer or {} +_G._packer.inside_compile = true + +local time +local profile_info +local should_profile = false +if should_profile then + local hrtime = vim.loop.hrtime + profile_info = {} + time = function(chunk, start) + if start then + profile_info[chunk] = hrtime() + else + profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 + end + end +else + time = function(chunk, start) end +end + +local function save_profiles(threshold) + local sorted_times = {} + for chunk_name, time_taken in pairs(profile_info) do + sorted_times[#sorted_times + 1] = {chunk_name, time_taken} + end + table.sort(sorted_times, function(a, b) return a[2] > b[2] end) + local results = {} + for i, elem in ipairs(sorted_times) do + if not threshold or threshold and elem[2] > threshold then + results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' + end + end + if threshold then + table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') + end + + _G._packer.profile_output = results +end + +time([[Luarocks path setup]], true) +local package_path_str = "/home/pepper/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/pepper/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/pepper/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/pepper/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/pepper/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +if not string.find(package.path, package_path_str, 1, true) then + package.path = package.path .. ';' .. package_path_str +end + +if not string.find(package.cpath, install_cpath_pattern, 1, true) then + package.cpath = package.cpath .. ';' .. install_cpath_pattern +end + +time([[Luarocks path setup]], false) +time([[try_loadstring definition]], true) +local function try_loadstring(s, component, name) + local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) + if not success then + vim.schedule(function() + vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) + end) + end + return result +end + +time([[try_loadstring definition]], false) +time([[Defining packer_plugins]], true) +_G.packer_plugins = { + LuaSnip = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/LuaSnip", + url = "https://github.com/L3MON4D3/LuaSnip" + }, + ["cmp-buffer"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/cmp-buffer", + url = "https://github.com/hrsh7th/cmp-buffer" + }, + ["cmp-nvim-lsp"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", + url = "https://github.com/hrsh7th/cmp-nvim-lsp" + }, + ["cmp-nvim-lua"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua", + url = "https://github.com/hrsh7th/cmp-nvim-lua" + }, + ["cmp-path"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/cmp-path", + url = "https://github.com/hrsh7th/cmp-path" + }, + cmp_luasnip = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/cmp_luasnip", + url = "https://github.com/saadparwaiz1/cmp_luasnip" + }, + ["csv.vim"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/csv.vim", + url = "https://github.com/chrisbra/csv.vim" + }, + ["friendly-snippets"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/friendly-snippets", + url = "https://github.com/rafamadriz/friendly-snippets" + }, + harpoon = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/harpoon", + url = "https://github.com/theprimeagen/harpoon" + }, + ["iron.nvim"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/iron.nvim", + url = "https://github.com/hkupty/iron.nvim" + }, + ["lsp-zero.nvim"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim", + url = "https://github.com/VonHeikemen/lsp-zero.nvim" + }, + ["mason-lspconfig.nvim"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", + url = "https://github.com/williamboman/mason-lspconfig.nvim" + }, + ["mason.nvim"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/mason.nvim", + url = "https://github.com/williamboman/mason.nvim" + }, + ["material.nvim"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/material.nvim", + url = "https://github.com/marko-cerovac/material.nvim" + }, + ["nvim-cmp"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/nvim-cmp", + url = "https://github.com/hrsh7th/nvim-cmp" + }, + ["nvim-lspconfig"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + url = "https://github.com/neovim/nvim-lspconfig" + }, + ["nvim-treesitter"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + url = "https://github.com/nvim-treesitter/nvim-treesitter" + }, + ["packer.nvim"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/packer.nvim", + url = "https://github.com/wbthomason/packer.nvim" + }, + playground = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/playground", + url = "https://github.com/nvim-treesitter/playground" + }, + ["plenary.nvim"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/plenary.nvim", + url = "https://github.com/nvim-lua/plenary.nvim" + }, + ["telescope.nvim"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/telescope.nvim", + url = "https://github.com/nvim-telescope/telescope.nvim" + }, + undotree = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/undotree", + url = "https://github.com/mbbill/undotree" + }, + ["vim-fugitive"] = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/vim-fugitive", + url = "https://github.com/tpope/vim-fugitive" + }, + vimtex = { + loaded = true, + path = "/home/pepper/.local/share/nvim/site/pack/packer/start/vimtex", + url = "https://github.com/lervag/vimtex" + } +} + +time([[Defining packer_plugins]], false) + +_G._packer.inside_compile = false +if _G._packer.needs_bufread == true then + vim.cmd("doautocmd BufRead") +end +_G._packer.needs_bufread = false + +if should_profile then save_profiles() end + +end) + +if not no_errors then + error_msg = error_msg:gsub('"', '\\"') + vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') +end