diff options
Diffstat (limited to '.config/nvim/lua')
| -rw-r--r-- | .config/nvim/lua/jacob/init.lua | 3 | ||||
| -rw-r--r-- | .config/nvim/lua/jacob/plugins.lua | 69 | ||||
| -rw-r--r-- | .config/nvim/lua/jacob/remaps.lua | 68 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins.lua | 42 | ||||
| -rw-r--r-- | .config/nvim/lua/remaps.lua | 38 | ||||
| -rw-r--r-- | .config/nvim/lua/set.lua (renamed from .config/nvim/lua/jacob/set.lua) | 8 |
6 files changed, 86 insertions, 142 deletions
diff --git a/.config/nvim/lua/jacob/init.lua b/.config/nvim/lua/jacob/init.lua deleted file mode 100644 index db8a563..0000000 --- a/.config/nvim/lua/jacob/init.lua +++ /dev/null @@ -1,3 +0,0 @@ -require("jacob.remaps") -require("jacob.plugins") -require("jacob.set") diff --git a/.config/nvim/lua/jacob/plugins.lua b/.config/nvim/lua/jacob/plugins.lua deleted file mode 100644 index fe07a27..0000000 --- a/.config/nvim/lua/jacob/plugins.lua +++ /dev/null @@ -1,69 +0,0 @@ --- Lazy.nvim plugin manager -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) -end -vim.opt.rtp:prepend(lazypath) - - -require("lazy").setup({ - { - 'nvim-telescope/telescope.nvim', tag = '0.1.6', - dependencies = { 'nvim-lua/plenary.nvim' } - }, - { - "ThePrimeagen/harpoon", - branch = "harpoon2", - dependencies = { "nvim-lua/plenary.nvim" } - }, - { - "NLKNguyen/papercolor-theme", - -- config = function() - -- vim.cmd('set t_Co=256') - -- vim.cmd('set background=light') - -- vim.cmd('colorscheme PaperColor') - -- end - }, - { - 'folke/tokyonight.nvim', - priority = 1000, - --init = function() - -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - --vim.cmd.colorscheme 'tokyonight-day' - --end, - }, - { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", }, - { - "mbbill/undotree", - config = function() - vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle) - end - }, - {'VonHeikemen/lsp-zero.nvim', branch = 'v3.x'}, - {'neovim/nvim-lspconfig'}, - {'hrsh7th/cmp-nvim-lsp'}, - {'hrsh7th/nvim-cmp'}, - {'L3MON4D3/LuaSnip'}, - {'williamboman/mason.nvim'}, - {"mfussenegger/nvim-dap" }, - { - 'alljokecake/naysayer-theme.nvim', - }, - { - "sainnhe/everforest", - init = function() - vim.cmd.colorscheme 'everforest' - vim.cmd('set background=dark') - end, - }, - {"shaunsingh/nord.nvim"}, - {"EdenEast/nightfox.nvim"}, - {"Civitasv/cmake-tools.nvim"}, -}) diff --git a/.config/nvim/lua/jacob/remaps.lua b/.config/nvim/lua/jacob/remaps.lua deleted file mode 100644 index f06585c..0000000 --- a/.config/nvim/lua/jacob/remaps.lua +++ /dev/null @@ -1,68 +0,0 @@ -vim.g.mapleader = " " - --- Netrw Directory Listing -vim.keymap.set("n", "<leader>pv", vim.cmd.Ex) - -vim.keymap.set("n", "<leader>mk", vim.cmd.make) - --- Quick Save -vim.keymap.set("n", "<leader>w", vim.cmd.w) - -vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv") -vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv") - -vim.keymap.set("n", "J", "mzJ`z") -vim.keymap.set("n", "<C-d>", "<C-d>zz") -vim.keymap.set("n", "<C-u>", "<C-u>zz") -vim.keymap.set("n", "n", "nzzzv") -vim.keymap.set("n", "N", "Nzzzv") - --- greatest remap ever -vim.keymap.set("x", "<leader>p", [["_dP]]) - --- next greatest remap ever : asbjornHaland -vim.keymap.set({"n", "v"}, "<leader>y", [["+y]]) -vim.keymap.set("n", "<leader>Y", [["+Y]]) - -vim.keymap.set({"n", "v"}, "<leader>d", [["_d]]) - -vim.keymap.set("n", "Q", "<nop>") -vim.keymap.set("n", "<C-f>", "<cmd>silent !tmux neww tmux-sessionizer<CR>") -vim.keymap.set("n", "<leader>f", vim.lsp.buf.format) - -vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz") -vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz") -vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz") -vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz") - -vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]]) -vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true }) - -vim.keymap.set("n", "<leader><leader>", function() - vim.cmd("so") -end) - --- remaps for debugger -vim.keymap.set('n', '<leader>c', function() require('dap').continue() end) -vim.keymap.set('n', '<leader>n', function() require('dap').step_over() end) -vim.keymap.set('n', '<leader>i', function() require('dap').step_into() end) -vim.keymap.set('n', '<leader>o', function() require('dap').step_out() end) -vim.keymap.set('n', '<Leader>b', function() require('dap').toggle_breakpoint() end) -vim.keymap.set('n', '<Leader>B', function() require('dap').set_breakpoint() end) -vim.keymap.set('n', '<Leader>lp', function() require('dap').set_breakpoint(nil, nil, vim.fn.input('Log point message: ')) end) -vim.keymap.set('n', '<Leader>dr', function() require('dap').repl.open() end) -vim.keymap.set('n', '<Leader>dl', function() require('dap').run_last() end) -vim.keymap.set({'n', 'v'}, '<Leader>dh', function() - require('dap.ui.widgets').hover() -end) -vim.keymap.set({'n', 'v'}, '<Leader>dp', function() - require('dap.ui.widgets').preview() -end) -vim.keymap.set('n', '<Leader>df', function() - local widgets = require('dap.ui.widgets') - widgets.centered_float(widgets.frames) -end) -vim.keymap.set('n', '<Leader>ds', function() - local widgets = require('dap.ui.widgets') - widgets.centered_float(widgets.scopes) -end) diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua new file mode 100644 index 0000000..fb1ed73 --- /dev/null +++ b/.config/nvim/lua/plugins.lua @@ -0,0 +1,42 @@ +-- Lazy.nvim plugin manager +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + + +require("lazy").setup({ + { 'nvim-telescope/telescope.nvim', tag = '0.1.6', dependencies = { 'nvim-lua/plenary.nvim' } }, + { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" }, + { "mbbill/undotree" }, + {'neovim/nvim-lspconfig'}, + { "sainnhe/everforest" }, + {"Civitasv/cmake-tools.nvim"}, +}) + +-- Enable preconfigured LSP's +vim.lsp.enable({"clangd", "gopls", "texlab"}) + +require'nvim-treesitter.configs'.setup { + ensure_installed = { "c" }, + sync_install = false, + auto_install = true, + + highlight = { + enable = true, + + -- 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/.config/nvim/lua/remaps.lua b/.config/nvim/lua/remaps.lua new file mode 100644 index 0000000..e2cbea9 --- /dev/null +++ b/.config/nvim/lua/remaps.lua @@ -0,0 +1,38 @@ +vim.g.mapleader = " " + +-- Netrw Directory Listing +vim.keymap.set("n", "<leader>pv", vim.cmd.Ex) + +-- Quick Make +vim.keymap.set("n", "<leader>mk", vim.cmd.make) + +-- Quick Save +vim.keymap.set("n", "<leader>w", vim.cmd.w) + +-- Swap down +vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv") +-- Swap up +vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv") + +-- Concat line below with space +vim.keymap.set("n", "J", "mzJ`z") +-- Page down with recenter +vim.keymap.set("n", "<C-d>", "<C-d>zz") +-- Page up with recenter +vim.keymap.set("n", "<C-u>", "<C-u>zz") + +vim.keymap.set("n", "<C-h>", "<C-w>h") +vim.keymap.set("n", "<C-j>", "<C-w>j") +vim.keymap.set("n", "<C-k>", "<C-w>k") +vim.keymap.set("n", "<C-l>", "<C-w>l") + +-- Telescope keybinds +local tsBuiltin = require('telescope.builtin') +vim.keymap.set('n', '<leader>ff', tsBuiltin.find_files, {}) +vim.keymap.set('n', '<leader>fp', tsBuiltin.git_files, {}) +vim.keymap.set('n', '<leader>ps', function() + tsBuiltin.grep_string({ search = vim.fn.input("Grep > ") }) +end) + +vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle) + diff --git a/.config/nvim/lua/jacob/set.lua b/.config/nvim/lua/set.lua index 51996c2..ece5395 100644 --- a/.config/nvim/lua/jacob/set.lua +++ b/.config/nvim/lua/set.lua @@ -24,15 +24,19 @@ vim.opt.isfname:append("@-@") vim.opt.updatetime = 50 -vim.opt.colorcolumn = "80" +vim.opt.colorcolumn = "120" vim.opt.mouse = 'a' vim.opt.list = true -vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } +vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣', leadmultispace = '·' } -- Remove trailing whitespace vim.api.nvim_create_autocmd({ "BufWritePre" }, { pattern = { "*" }, command = [[%s/\s\+$//e]], }) + +vim.cmd.colorscheme 'everforest' +vim.cmd('set background=dark') + |