From 4c312e027d4f9a63cade269c91e9837eb15be04b Mon Sep 17 00:00:00 2001 From: Henrik Bakken Date: Thu, 21 Apr 2022 16:23:39 +0200 Subject: [PATCH] updates --- nvim/init.lua | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/nvim/init.lua b/nvim/init.lua index b339048..815d452 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -13,7 +13,7 @@ opt.updatetime = 300 opt.timeoutlen = 200 vim.g.BASH_Ctrl_j = "off" vim.g.BASH_Ctrl_l = "off" -vim.g.python3_host_prog = "/usr/bin/python3.9" +vim.g.python3_host_prog = "/usr/bin/python3.10" -- looks opt.termguicolors = true @@ -22,7 +22,7 @@ opt.background = "dark" opt.listchars = "tab:→ ,trail:·,extends:↷,precedes:↶,nbsp:+,eol:↵" opt.list = true -- Show listchars opt.showtabline = 2 -opt.laststatus = 3 +opt.laststatus = 2 -- undo opt.undodir = "/home/hjalmarlucius/.cache/vim/undo" @@ -300,9 +300,7 @@ require("packer").startup { use {"arcticicestudio/nord-vim", config = function() end} - use { - "junegunn/seoul256.vim", - } + use {"junegunn/seoul256.vim"} vim.cmd "colorscheme seoul256" -- coloring of colornames @@ -312,9 +310,6 @@ require("packer").startup { config = function() vim.g.Hexokinase_highlighters = {"virtual"} end } - -- edgedb syntax highlighting - use {"edgedb/edgedb-vim"} - -- flashing cursor on move use { "danilamihailov/beacon.nvim", @@ -380,7 +375,7 @@ require("packer").startup { requires = {"kyazdani42/nvim-web-devicons"}, config = function() require("lualine").setup { - options = {theme = "auto", globalstatus = true}, + options = {theme = "auto", globalstatus = false}, extensions = {"fugitive"}, sections = { lualine_a = {"mode"}, @@ -436,8 +431,6 @@ require("packer").startup { use {"psf/black", config = function() vim.g.black_fast = 1 end} - use {"numirias/semshi", config = function() end} - -- treesitter use { "nvim-treesitter/nvim-treesitter", @@ -449,7 +442,25 @@ require("packer").startup { "fish", "graphql", "help", "html", "java", "javascript", "json", "json5", "julia", "latex", "lua", "make", "markdown", "ninja", "python", "regex", "toml", "vim", "yaml" - } + }, + 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 + }, + incremental_selection = { + enable = true, + keymaps = { + init_selection = "gnn", + node_decremental = "", + node_incremental = "", + scope_incremental = "" + } + }, + indent = {enable = true} } vim.opt.foldexpr = "nvim_treesitter#foldexpr()" end