From f6873678e2a8921da1726c9a6216996e6d7991f8 Mon Sep 17 00:00:00 2001 From: Yevhenii Moruhyi Date: Fri, 19 May 2023 19:23:21 -0400 Subject: [PATCH] new default nvim config based on LazyVim --- lua/config/keymaps.lua | 17 ++++++++++ lua/config/lazy.lua | 6 ++-- lua/config/options.lua | 6 ++++ lua/plugins/disable.lua | 8 +++++ lua/plugins/logo.lua | 20 ++++++++++++ lua/plugins/neo-tree.lua | 70 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 lua/plugins/disable.lua create mode 100644 lua/plugins/logo.lua create mode 100644 lua/plugins/neo-tree.lua diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index 2c134f7b..6abbd497 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -1,3 +1,20 @@ -- Keymaps are automatically loaded on the VeryLazy event -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua -- Add any additional keymaps here +vim.keymap.set("v", "J", ":m '>+1gv=gv") +vim.keymap.set("v", "K", ":m '<-2gv=gv") + +vim.keymap.set("n", "J", "mzJ`z") +vim.keymap.set("n", "", "zz") +vim.keymap.set("n", "", "zz") +vim.keymap.set("n", "n", "nzzzv") +vim.keymap.set("n", "N", "Nzzzv") +vim.keymap.set("n", "*", "*zzzv") +vim.keymap.set("n", "#", "#zzzv") + +-- greatest remap ever +vim.keymap.set("x", "p", [["_dP]]) + +-- next greatest remap ever : asbjornHaland +vim.keymap.set({ "n", "v" }, "y", [["+y]]) +vim.keymap.set("n", "Y", [["+Y]]) diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index 891b1901..6a871e29 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -8,11 +8,11 @@ vim.opt.rtp:prepend(vim.env.LAZY or lazypath) require("lazy").setup({ spec = { - -- add LazyVim and import its plugins { "LazyVim/LazyVim", import = "lazyvim.plugins" }, -- import any extras modules here - -- { import = "lazyvim.plugins.extras.lang.typescript" }, - -- { import = "lazyvim.plugins.extras.lang.json" }, + { import = "lazyvim.plugins.extras.lang.typescript" }, + { import = "lazyvim.plugins.extras.lang.json" }, + { import = "lazyvim.plugins.extras.util.project" }, -- { import = "lazyvim.plugins.extras.ui.mini-animate" }, -- import/override with your plugins { import = "plugins" }, diff --git a/lua/config/options.lua b/lua/config/options.lua index 3ea1454f..8e33d9f2 100644 --- a/lua/config/options.lua +++ b/lua/config/options.lua @@ -1,3 +1,9 @@ -- Options are automatically loaded before lazy.nvim startup -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua -- Add any additional options here +vim.g.loaded_netrw = 1 +vim.g.loaded_netrwPlugin = 1 +vim.o.mouse = "" +vim.o.nu = true +vim.o.guicursor = "" +vim.o.cursorline = false diff --git a/lua/plugins/disable.lua b/lua/plugins/disable.lua new file mode 100644 index 00000000..0a50f3db --- /dev/null +++ b/lua/plugins/disable.lua @@ -0,0 +1,8 @@ +return { + { "rcarriga/nvim-notify", enabled = false }, + { "folke/todo-comments.nvim", enabled = false }, + -- this one is the command line popup + { "folke/noice.nvim", enabled = false }, + { "indent-blankline.nvim", enabled = false }, + { "mini.indentscope", enabled = false }, +} diff --git a/lua/plugins/logo.lua b/lua/plugins/logo.lua new file mode 100644 index 00000000..9721a53b --- /dev/null +++ b/lua/plugins/logo.lua @@ -0,0 +1,20 @@ +-- dashboard +return { + "goolord/alpha-nvim", + event = "VimEnter", + opts = function() + local dashboard = require("alpha.themes.dashboard") + local logo = [[ + ██╗ █████╗ ███████╗██╗ ██╗██╗ ██╗██╗███╗ ███╗ Z + ██║ ██╔══██╗╚══███╔╝╚██╗ ██╔╝██║ ██║██║████╗ ████║ Z + ██║ ███████║ ███╔╝ ╚████╔╝ ██║ ██║██║██╔████╔██║ z + ██║ ██╔══██║ ███╔╝ ╚██╔╝ ╚██╗ ██╔╝██║██║╚██╔╝██║ z + ███████╗██║ ██║███████╗ ██║ ╚████╔╝ ██║██║ ╚═╝ ██║ + ╚══════╝╚═╝ ╚═╝╚══════╝ ╚═╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ + + [@ymoruhyi] + ]] + + dashboard.section.header.val = vim.split(logo, "\n") + end, +} diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua new file mode 100644 index 00000000..c55486eb --- /dev/null +++ b/lua/plugins/neo-tree.lua @@ -0,0 +1,70 @@ +-- return { +-- +-- -- file explorer +-- { +-- "nvim-neo-tree/neo-tree.nvim", +-- cmd = "Neotree", +-- keys = { +-- { +-- "fe", +-- function() +-- require("neo-tree.command").execute({ toggle = true, dir = require("lazyvim.util").get_root() }) +-- end, +-- desc = "Explorer NeoTree (root dir)", +-- }, +-- { +-- "fE", +-- function() +-- require("neo-tree.command").execute({ toggle = true, dir = vim.loop.cwd() }) +-- end, +-- desc = "Explorer NeoTree (cwd)", +-- }, +-- { "e", "fe", desc = "Explorer NeoTree (root dir)", remap = true }, +-- { "E", "fE", desc = "Explorer NeoTree (cwd)", remap = true }, +-- }, +-- deactivate = function() +-- vim.cmd([[Neotree close]]) +-- end, +-- init = function() +-- vim.g.neo_tree_remove_legacy_commands = 1 +-- if vim.fn.argc() == 1 then +-- local stat = vim.loop.fs_stat(vim.fn.argv(0)) +-- if stat and stat.type == "directory" then +-- require("neo-tree") +-- end +-- end +-- end, +-- opts = { +-- enable_git_status = false, +-- filesystem = { +-- bind_to_cwd = false, +-- follow_current_file = true, +-- use_libuv_file_watcher = true, +-- }, +-- window = { +-- mappings = { +-- [""] = "none", +-- }, +-- }, +-- default_component_configs = { +-- indent = { +-- with_expanders = true, -- if nil and file nesting is enabled, will enable expanders +-- expander_collapsed = "", +-- expander_expanded = "", +-- expander_highlight = "NeoTreeExpander", +-- }, +-- }, +-- }, +-- config = function(_, opts) +-- require("neo-tree").setup(opts) +-- vim.api.nvim_create_autocmd("TermClose", { +-- pattern = "*lazygit", +-- callback = function() +-- if package.loaded["neo-tree.sources.git_status"] then +-- require("neo-tree.sources.git_status").refresh() +-- end +-- end, +-- }) +-- end, +-- }, +-- }