diff options
-rw-r--r-- | .config/nvim/lua/general.lua | 8 | ||||
-rw-r--r-- | .config/nvim/lua/lsp.lua | 2 | ||||
-rw-r--r-- | .config/nvim/lua/plugins.lua | 25 | ||||
-rwxr-xr-x | bootstrap.sh | 7 |
4 files changed, 37 insertions, 5 deletions
diff --git a/.config/nvim/lua/general.lua b/.config/nvim/lua/general.lua index 79bdf67..03b01e7 100644 --- a/.config/nvim/lua/general.lua +++ b/.config/nvim/lua/general.lua @@ -11,7 +11,7 @@ vim.opt.wrap = false vim.opt.colorcolumn = "120" vim.opt.scrolloff = 5 vim.opt.spelllang = "en,nb" -vim.opt.cursorline = false +vim.opt.cursorline = true -- vim.opt.tabstop = 4 -- vim.opt.softtabstop = -1 @@ -40,6 +40,12 @@ vim.opt.listchars:append("tab:-->") vim.cmd [[colorscheme dracula]] vim.cmd [[hi Normal guibg=NONE ctermbg=NONE]] +vim.cmd [[highlight CursorLine ctermbg=none guibg=#0f0f0f gui=NONE cterm=NONE]] +vim.cmd [[augroup CursorLineTransparency + autocmd! + autocmd ColorScheme * highlight CursorLine guibg=#0f0f0f ctermbg=none +augroup END]] + vim.opt.spell = false vim.g.markdown_fenced_languages = { diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua index 1a828ec..d7715f5 100644 --- a/.config/nvim/lua/lsp.lua +++ b/.config/nvim/lua/lsp.lua @@ -292,7 +292,7 @@ null_ls.setup({ vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, - { border = "rounded"; relative = "cursor"; max_width = 80 }) + { border = "rounded"; relative = "cursor" }) -- Debugging local dap, dapui = require("dap"), require("dapui") diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index a1e342d..679cf6e 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -20,6 +20,7 @@ local PKGS = { { url = "https://github.com/echasnovski/mini.nvim.git" }; { url = "https://github.com/catppuccin/nvim.git" }; { url = "https://github.com/mbbill/undotree.git" }; + { url = "https://github.com/chentoast/marks.nvim.git" }; -- Status line { url = "https://github.com/akinsho/bufferline.nvim.git" }; @@ -275,6 +276,30 @@ local function init_plugins() yadm = { enable = false }; } + require("marks").setup({ + -- whether to map keybinds or not. default true + default_mappings = false; + -- 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 = { "" }; + mappings = {}; + }) + require("neotest").setup({ adapters = { require("neotest-dotnet") } }) end diff --git a/bootstrap.sh b/bootstrap.sh index 528cc18..12247fb 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,8 +1,9 @@ #!/usr/bin/env sh +# vi: ft=sh SYMLINKDIR="$(readlink -f "$0")" BASEDIR="$(dirname "$SYMLINKDIR")" -cd $BASEDIR +cd "$BASEDIR" || exit 1 doIt() { git submodule update --init --recursive @@ -24,9 +25,9 @@ then doIt; else printf "This may overwrite existing files in your home directory. Are you sure? (y/n) " - read REPLY + read -r REPLY echo "" - if [ "$REPLY" = "y" -o "$REPLY" = "Y" ] + if [ "$REPLY" = "y" ] || [ "$REPLY" = "Y" ] then doIt else exit 1 |