From 78bee4d2f0e9d168f905a650aa00cdde3bc3a8af Mon Sep 17 00:00:00 2001 From: Ivar Fatland Date: Mon, 24 Feb 2025 07:40:23 +0100 Subject: [PATCH 1/4] updated cd and cu to use zz instead of M at the end --- init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index b29b6b1..ed09a7f 100644 --- a/init.lua +++ b/init.lua @@ -26,8 +26,8 @@ vim.cmd [[ set incsearch set scrolloff=8 - nnoremap M - nnoremap M + nnoremap zz + nnoremap zz nnoremap ,co :copen nnoremap ,cc :cclose From 2127e6a82932e50438bea8f379a36e0e76930b52 Mon Sep 17 00:00:00 2001 From: Ivar Fatland Date: Tue, 25 Feb 2025 09:44:59 +0100 Subject: [PATCH 2/4] fixed stupid mkview/loadview default, switched from oil to nvim-tree --- init.lua | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/init.lua b/init.lua index ed09a7f..d91355c 100644 --- a/init.lua +++ b/init.lua @@ -1,5 +1,8 @@ ---@diagnostic disable: missing-fields -- vim:foldmethod=marker +vim.g.loaded_netrw = 1 +vim.g.loaded_netrwPlugin = 1 + local function get_python_venv_path() --{{{1 return vim.fn.stdpath('config') .. '/.venv/bin/python' end @@ -47,6 +50,8 @@ vim.cmd [[ autocmd BufEnter * if &buftype == 'terminal' | :startinsert | endif nnoremap ,t vl:terminala + " Don't include curdir, it just causes pain. + set viewoptions=folds,cursor autocmd BufWinLeave *.* silent! mkview autocmd BufWinEnter *.* silent! loadview @@ -124,6 +129,19 @@ require'lazy'.setup{ --{{{1 require'mini.align'.setup() end, }, + { 'nvim-tree/nvim-tree.lua', --{{{2 + dependencies = {"nvim-tree/nvim-web-devicons"}, + config = function () + require'nvim-tree'.setup{ + update_focused_file = { + enable = true, + update_root = { + enable = true + } + } + } + end + }, { 'sainnhe/everforest', --{{{2 lazy = false, priority = 1000, @@ -144,28 +162,6 @@ require'lazy'.setup{ --{{{1 ) end }, - { 'stevearc/oil.nvim', --{{{2 - dependencies = { 'nvim-tree/nvim-web-devicons', }, - config = function () - local oil = require('oil') - oil.setup{ - default_file_explorer = true, - columns = {'icon'}, - view_options = { - show_hidden = true, - }, - lsp_file_methods = { - enables = true, - timeout_ms = 1000, - autosave_changes = true, - }, - keymaps = { - [",cd"] = { "actions.cd", mode = "n" }, - }, - } - vim.keymap.set("n", "-", vim.cmd.Oil, { desc = "Open parent directory" }) - end, - }, { 'seblyng/roslyn.nvim', --{{{2 --WARN: requires html-lsp, roslyn and rzls installed via Mason dependencies = { 'tris203/rzls.nvim', }, From 0dc5381c4355ead6c951ef8115ff6845f173ceef Mon Sep 17 00:00:00 2001 From: Ivar Fatland Date: Tue, 25 Feb 2025 09:49:04 +0100 Subject: [PATCH 3/4] remove update_root from nvim-tree --- init.lua | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/init.lua b/init.lua index d91355c..9bb6e8a 100644 --- a/init.lua +++ b/init.lua @@ -133,12 +133,7 @@ require'lazy'.setup{ --{{{1 dependencies = {"nvim-tree/nvim-web-devicons"}, config = function () require'nvim-tree'.setup{ - update_focused_file = { - enable = true, - update_root = { - enable = true - } - } + update_focused_file = { enable = true, } } end }, From 0190c248ebe660b05f69e3d780bcaaf198acbc78 Mon Sep 17 00:00:00 2001 From: Ivar Fatland Date: Tue, 25 Feb 2025 16:28:56 +0100 Subject: [PATCH 4/4] proper toggle for nvim-tree --- init.lua | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/init.lua b/init.lua index 9bb6e8a..8b77098 100644 --- a/init.lua +++ b/init.lua @@ -132,9 +132,34 @@ require'lazy'.setup{ --{{{1 { 'nvim-tree/nvim-tree.lua', --{{{2 dependencies = {"nvim-tree/nvim-web-devicons"}, config = function () + + local function map_toggle(bufnr) + bufnr = bufnr or nil + local api = require("nvim-tree.api") + vim.keymap.set( + "n", "-", api.tree.toggle, + { + desc = "nvim-tree: Toggle", + buffer = bufnr, + noremap = true, + silent = true, + nowait = true, + } + ) + end + + local function my_on_attach(bufnr) + local api = require("nvim-tree.api") + api.config.mappings.default_on_attach(bufnr) + map_toggle(bufnr) + end + require'nvim-tree'.setup{ + on_attach = my_on_attach, update_focused_file = { enable = true, } } + + map_toggle() end }, { 'sainnhe/everforest', --{{{2 @@ -437,6 +462,7 @@ require'lazy'.setup{ --{{{1 noremap ,fm :lua require'telescope.builtin'.marks() noremap ,fb :lua require'telescope.builtin'.buffers() + noremap ,fcm :lua require'telescope.builtin'.commands() noremap ,fct :lua require'telescope.builtin'.tags() noremap ,fea :lua require'telescope.builtin'.diagnostics()