From 88297963cf88b01a5bad8377ad5f9568440f2454 Mon Sep 17 00:00:00 2001 From: Raoul Branten Date: Mon, 8 Jan 2024 13:28:36 +0100 Subject: [PATCH] working --- init.lua | 1 + lua/core/aliases.lua | 5 ++ lua/core/keymaps.lua | 3 ++ lua/core/options.lua | 10 ++-- lua/core/plugin_config/colorizer.lua | 0 lua/core/plugin_config/deadcolumn.lua | 4 +- lua/core/plugin_config/gruvbox.lua | 8 ++++ lua/core/plugin_config/init.lua | 5 ++ lua/core/plugin_config/lsp_config.lua | 12 +++++ lua/core/plugin_config/marks.lua | 34 ++++++++++++++ lua/core/plugin_config/rainbow-delimiters.lua | 24 ++++++++++ lua/core/plugin_config/synattr.lua | 1 + lua/core/plugin_config/tagbar.lua | 1 + lua/core/plugin_config/treesitter.lua | 2 +- lua/core/plugins.lua | 17 ++++++- plugin/packer_compiled.lua | 46 +++++++++++++++++-- 16 files changed, 160 insertions(+), 13 deletions(-) create mode 100644 lua/core/aliases.lua create mode 100644 lua/core/plugin_config/colorizer.lua create mode 100644 lua/core/plugin_config/lsp_config.lua create mode 100644 lua/core/plugin_config/marks.lua create mode 100644 lua/core/plugin_config/rainbow-delimiters.lua create mode 100644 lua/core/plugin_config/synattr.lua diff --git a/init.lua b/init.lua index 3777049..0d7eda1 100644 --- a/init.lua +++ b/init.lua @@ -1,4 +1,5 @@ require("core.options") require("core.keymaps") require("core.plugins") +require("core.aliases") require("core.plugin_config") diff --git a/lua/core/aliases.lua b/lua/core/aliases.lua new file mode 100644 index 0000000..f83f36e --- /dev/null +++ b/lua/core/aliases.lua @@ -0,0 +1,5 @@ +-- alias for clearing all buffers +--vim.cmd [[ command Bclr bufdo! bd! ]] + +-- alias for reloading all buffers +--vim.cmd [[ command Bclr bufdo! e!]] diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua index c5b8b1b..222261c 100644 --- a/lua/core/keymaps.lua +++ b/lua/core/keymaps.lua @@ -11,3 +11,6 @@ vim.keymap.set('n', '', ':echoe "Yo retard use l"') vim.keymap.set('n', '', ':echoe "Yo retard use k"') vim.keymap.set('n', '', ':echoe "Yo retard use j"') vim.opt.mouse = '' + +--" dont automatically jump when searching +vim.keymap.set('n', '*', '*```') diff --git a/lua/core/options.lua b/lua/core/options.lua index b340a5b..e2d4e77 100644 --- a/lua/core/options.lua +++ b/lua/core/options.lua @@ -2,7 +2,7 @@ vim.opt.backspace = '2' vim.opt.showcmd = true vim.opt.laststatus = 2 -vim.opt.autowrite = true +--vim.opt.autowrite = true -- general look and feel vim.opt.cursorline = true @@ -16,16 +16,16 @@ vim.opt.wildmode = 'longest,list' vim.opt.ttyfast = true vim.opt.pastetoggle = '' --- spacing +-- formatting +vim.opt.expandtab = true vim.opt.tabstop = 4 vim.opt.shiftwidth = 4 vim.opt.shiftround = true -vim.opt.expandtab = true - --- formatting vim.opt.autoindent = true vim.opt.list = true vim.opt.listchars = 'eol:¬,tab:>·,trail:~,extends:>,precedes:<,space:·' +vim.opt.smartindent = true +vim.opt.wrap = false -- ERROR vim.opt.smartindend = true -- ERROR vim.opt.nowrap = true diff --git a/lua/core/plugin_config/colorizer.lua b/lua/core/plugin_config/colorizer.lua new file mode 100644 index 0000000..e69de29 diff --git a/lua/core/plugin_config/deadcolumn.lua b/lua/core/plugin_config/deadcolumn.lua index e596ed7..a1f9728 100644 --- a/lua/core/plugin_config/deadcolumn.lua +++ b/lua/core/plugin_config/deadcolumn.lua @@ -1,9 +1,9 @@ local opts = { scope = 'line', - modes = { 'i', 'ic', 'ix', 'R', 'Rc', 'Rx', 'Rv', 'Rvc', 'Rvx' }, + modes = { 'i', 'ic', 'ix', 'n', 'R', 'Rc', 'Rx', 'Rv', 'Rvc', 'Rvx' }, blending = { threshold = 0.75, - colorcode = '#000000', + colorcode = '#FFF000', hlgroup = { 'Normal', 'background', diff --git a/lua/core/plugin_config/gruvbox.lua b/lua/core/plugin_config/gruvbox.lua index c5f8d69..7b7b280 100644 --- a/lua/core/plugin_config/gruvbox.lua +++ b/lua/core/plugin_config/gruvbox.lua @@ -1,2 +1,10 @@ +-- see https://github.com/morhetz/gruvbox/ +print("foo") +vim.g.gruvbox_italic_keyword = true vim.o.termguicolors = true +vim.o.background = 'dark' +vim.cmd [[ highlight Normal ctermbg=black ]] +vim.cmd [[ highlight GruvboxBlue guifg=#83a598 ]] +vim.o.fillchars = "vert:|" +vim.cmd [[ hi! VertSplit term=reverse ctermfg=236 ctermbg=132 ]] vim.cmd [[ colorscheme gruvbox ]] diff --git a/lua/core/plugin_config/init.lua b/lua/core/plugin_config/init.lua index 6769369..0a87ba6 100644 --- a/lua/core/plugin_config/init.lua +++ b/lua/core/plugin_config/init.lua @@ -7,4 +7,9 @@ require("core.plugin_config.vim-fugitive") require("core.plugin_config.tagbar") require("core.plugin_config.vim-gitgutter") require("core.plugin_config.deadcolumn") +require("core.plugin_config.colorizer") +require("core.plugin_config.synattr") +require("core.plugin_config.rainbow-delimiters") +require("core.plugin_config.marks") +require("core.plugin_config.lsp_config") diff --git a/lua/core/plugin_config/lsp_config.lua b/lua/core/plugin_config/lsp_config.lua new file mode 100644 index 0000000..090d10a --- /dev/null +++ b/lua/core/plugin_config/lsp_config.lua @@ -0,0 +1,12 @@ +require("mason").setup() +require("mason-lspconfig").setup({ +}) +require("lspconfig").phpactor.setup({ + on_attach = on_attach, + init_options = { + ["language_server_phpstan.enabled"] = false, + ["language_server_psalm.enabled"] = false, + } +}) + +--require("lspconfig").sumneko_lua.setup {} diff --git a/lua/core/plugin_config/marks.lua b/lua/core/plugin_config/marks.lua new file mode 100644 index 0000000..b5113f5 --- /dev/null +++ b/lua/core/plugin_config/marks.lua @@ -0,0 +1,34 @@ +require'marks'.setup { + -- whether to map keybinds or not. default true + default_mappings = true, + -- which builtin marks to show. default {} + builtin_marks = { ".", "<", ">", "^" }, + -- whether movements cycle back to the beginning/end of buffer. default true + cyclic = true, + -- whether the shada file is updated after modifying uppercase marks. default false + force_write_shada = false, + -- how often (in ms) to redraw signs/recompute mark positions. + -- higher values will have better performance but may cause visual lag, + -- while lower values may cause performance penalties. default 150. + refresh_interval = 250, + -- sign priorities for each type of mark - builtin marks, uppercase marks, lowercase + -- marks, and bookmarks. + -- can be either a table with all/none of the keys, or a single number, in which case + -- the priority applies to all marks. + -- default 10. + sign_priority = { lower=10, upper=15, builtin=8, bookmark=20 }, + -- disables mark tracking for specific filetypes. default {} + excluded_filetypes = {}, + -- marks.nvim allows you to configure up to 10 bookmark groups, each with its own + -- sign/virttext. Bookmarks can be used to group together positions and quickly move + -- across multiple buffers. default sign is '!@#$%^&*()' (from 0 to 9), and + -- default virt_text is "". + bookmark_0 = { + sign = "⚑", + virt_text = "hello world", + -- explicitly prompt for a virtual line annotation when setting a bookmark from this group. + -- defaults to false. + annotate = false, + }, + mappings = {} +} diff --git a/lua/core/plugin_config/rainbow-delimiters.lua b/lua/core/plugin_config/rainbow-delimiters.lua new file mode 100644 index 0000000..9ef210e --- /dev/null +++ b/lua/core/plugin_config/rainbow-delimiters.lua @@ -0,0 +1,24 @@ +-- This module contains a number of default definitions +local rainbow_delimiters = require 'rainbow-delimiters' + +vim.g.rainbow_delimiters = { + strategy = { + [''] = rainbow_delimiters.strategy['global'], + commonlisp = rainbow_delimiters.strategy['local'], + }, + query = { + [''] = 'rainbow-delimiters', + lua = 'rainbow-blocks', + }, + highlight = { + 'RainbowDelimiterRed', + 'RainbowDelimiterYellow', + 'RainbowDelimiterBlue', + 'RainbowDelimiterOrange', + 'RainbowDelimiterGreen', + 'RainbowDelimiterViolet', + 'RainbowDelimiterCyan', + }, + blacklist = {'c', 'cpp'}, +} + diff --git a/lua/core/plugin_config/synattr.lua b/lua/core/plugin_config/synattr.lua new file mode 100644 index 0000000..e361fd9 --- /dev/null +++ b/lua/core/plugin_config/synattr.lua @@ -0,0 +1 @@ +-- map -a :call SyntaxAttr() diff --git a/lua/core/plugin_config/tagbar.lua b/lua/core/plugin_config/tagbar.lua index e69de29..5966176 100644 --- a/lua/core/plugin_config/tagbar.lua +++ b/lua/core/plugin_config/tagbar.lua @@ -0,0 +1 @@ +vim.keymap.set('n', '', ':TagbarToggle') diff --git a/lua/core/plugin_config/treesitter.lua b/lua/core/plugin_config/treesitter.lua index 745b3fe..2da59fe 100644 --- a/lua/core/plugin_config/treesitter.lua +++ b/lua/core/plugin_config/treesitter.lua @@ -5,6 +5,6 @@ require 'nvim-treesitter.configs'.setup { sync_install = false, auto_install = true, highlight = { - enable = true, + enable = false, }, } diff --git a/lua/core/plugins.lua b/lua/core/plugins.lua index 485b2b7..d1e7827 100644 --- a/lua/core/plugins.lua +++ b/lua/core/plugins.lua @@ -15,11 +15,14 @@ return require('packer').startup(function(use) use 'wbthomason/packer.nvim' -- My plugins here - use 'ellisonleao/gruvbox.nvim' + use 'morhetz/gruvbox' use 'nvim-tree/nvim-tree.lua' use 'nvim-tree/nvim-web-devicons' use 'nvim-lualine/lualine.nvim' - use 'nvim-treesitter/nvim-treesitter' + use { + 'nvim-treesitter/nvim-treesitter', + run = ':TSUpdate' + } use { 'nvim-telescope/telescope.nvim', tag = '0.1.3', @@ -29,6 +32,16 @@ return require('packer').startup(function(use) use 'majutsushi/tagbar' use 'airblade/vim-gitgutter' use 'Bekaboo/deadcolumn.nvim' + use { + "williamboman/mason.nvim", + "williamboman/mason-lspconfig.nvim", + "neovim/nvim-lspconfig", + } + use 'norcalli/nvim-colorizer.lua' + use 'vim-scripts/SyntaxAttr.vim' + --use 'romgrk/barbar.nvim' + use 'HiPhish/rainbow-delimiters.nvim' + use 'chentoast/marks.nvim' -- Automatically set up your configuration after cloning packer.nvim -- Put this at the end after all plugins diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index 61926a2..f514788 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -74,16 +74,51 @@ end time([[try_loadstring definition]], false) time([[Defining packer_plugins]], true) _G.packer_plugins = { - ["gruvbox.nvim"] = { + ["SyntaxAttr.vim"] = { loaded = true, - path = "/home/raoul/.local/share/nvim/site/pack/packer/start/gruvbox.nvim", - url = "https://github.com/ellisonleao/gruvbox.nvim" + path = "/home/raoul/.local/share/nvim/site/pack/packer/start/SyntaxAttr.vim", + url = "https://github.com/vim-scripts/SyntaxAttr.vim" + }, + ["deadcolumn.nvim"] = { + loaded = true, + path = "/home/raoul/.local/share/nvim/site/pack/packer/start/deadcolumn.nvim", + url = "https://github.com/Bekaboo/deadcolumn.nvim" + }, + gruvbox = { + loaded = true, + path = "/home/raoul/.local/share/nvim/site/pack/packer/start/gruvbox", + url = "https://github.com/morhetz/gruvbox" }, ["lualine.nvim"] = { loaded = true, path = "/home/raoul/.local/share/nvim/site/pack/packer/start/lualine.nvim", url = "https://github.com/nvim-lualine/lualine.nvim" }, + ["marks.nvim"] = { + loaded = true, + path = "/home/raoul/.local/share/nvim/site/pack/packer/start/marks.nvim", + url = "https://github.com/chentoast/marks.nvim" + }, + ["mason-lspconfig.nvim"] = { + loaded = true, + path = "/home/raoul/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", + url = "https://github.com/williamboman/mason-lspconfig.nvim" + }, + ["mason.nvim"] = { + loaded = true, + path = "/home/raoul/.local/share/nvim/site/pack/packer/start/mason.nvim", + url = "https://github.com/williamboman/mason.nvim" + }, + ["nvim-colorizer.lua"] = { + loaded = true, + path = "/home/raoul/.local/share/nvim/site/pack/packer/start/nvim-colorizer.lua", + url = "https://github.com/norcalli/nvim-colorizer.lua" + }, + ["nvim-lspconfig"] = { + loaded = true, + path = "/home/raoul/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + url = "https://github.com/neovim/nvim-lspconfig" + }, ["nvim-tree.lua"] = { loaded = true, path = "/home/raoul/.local/share/nvim/site/pack/packer/start/nvim-tree.lua", @@ -109,6 +144,11 @@ _G.packer_plugins = { path = "/home/raoul/.local/share/nvim/site/pack/packer/start/plenary.nvim", url = "https://github.com/nvim-lua/plenary.nvim" }, + ["rainbow-delimiters.nvim"] = { + loaded = true, + path = "/home/raoul/.local/share/nvim/site/pack/packer/start/rainbow-delimiters.nvim", + url = "https://github.com/HiPhish/rainbow-delimiters.nvim" + }, tagbar = { loaded = true, path = "/home/raoul/.local/share/nvim/site/pack/packer/start/tagbar",