From f5c012f1c69b1ce0efa82392f71c1ff5f5f422d6 Mon Sep 17 00:00:00 2001 From: sevi-kun Date: Fri, 4 Aug 2023 07:36:32 +0000 Subject: [PATCH] Rebase office branch to move to lazy. Additional minor fixes --- after/plugin/neorg.lua | 7 ------- init.lua | 2 +- lua/sevi-kun/plugins.lua | 28 +++------------------------- lua/sevi-kun/set.lua | 3 ++- 4 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 after/plugin/neorg.lua diff --git a/after/plugin/neorg.lua b/after/plugin/neorg.lua deleted file mode 100644 index c9c722f..0000000 --- a/after/plugin/neorg.lua +++ /dev/null @@ -1,7 +0,0 @@ --- Note keymaps -vim.keymap.set("n", "ni", ":Neorg index") -vim.keymap.set("n", "nr", ":Neorg return") -vim.keymap.set("n", "nj", ":Neorg journal custom") - -vim.keymap.set("n", "nim", ":Neorg inject-metadata") -vim.keymap.set("n", "nis", ":Neorg inject-metadata") diff --git a/init.lua b/init.lua index c7a896a..ae9725d 100644 --- a/init.lua +++ b/init.lua @@ -1,6 +1,6 @@ require("sevi-kun") -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +local lazypath = vim.fn.stdpath("data") .. "\\lazy\\lazy.nvim" if not vim.loop.fs_stat(lazypath) then vim.fn.system({ "git", diff --git a/lua/sevi-kun/plugins.lua b/lua/sevi-kun/plugins.lua index 062b35f..7e3d6fd 100644 --- a/lua/sevi-kun/plugins.lua +++ b/lua/sevi-kun/plugins.lua @@ -22,7 +22,7 @@ return { }, { "ThePrimeagen/harpoon", - version = "harpoon2", + branch = "harpoon2", dependencies = { "nvim-lua/plenary.nvim" }, }, @@ -32,28 +32,6 @@ return { { "stevearc/oil.nvim" }, - { "nvim-neorg/neorg", - version = "*", - build = ":Neorg sync-parsers", - dependencies = { "nvim-lua/plenary.nvim" }, - config = function() - require("neorg").setup { - load = { - ["core.defaults"] = {}, -- Loads default behaviour - ["core.concealer"] = {}, -- Adds pretty icons to your documents - ["core.dirman"] = { -- Manages Neorg workspaces - config = { - workspaces = { - notes = "~/Documents/Notes", - }, - default_workspace = "notes", - }, - }, - }, - } - end, - }, - { "kylechui/nvim-surround", version = "*", config = function() @@ -78,11 +56,11 @@ return { -- pretty - { "navarasu/onedark.nvim", + { "loctvl842/monokai-pro.nvim", lazy = false, priority = 1000, config = function() - vim.cmd("colorscheme onedark") + vim.cmd("colorscheme monokai-pro") end }, diff --git a/lua/sevi-kun/set.lua b/lua/sevi-kun/set.lua index 65a3e16..f333812 100644 --- a/lua/sevi-kun/set.lua +++ b/lua/sevi-kun/set.lua @@ -3,6 +3,7 @@ vim.g.mapleader = " " vim.opt.nu = true vim.opt.relativenumber = true vim.opt.ignorecase = true +vim.opt.cursorline = true vim.opt.tabstop = 4 vim.opt.softtabstop = 4 @@ -15,7 +16,7 @@ vim.opt.wrap = false vim.opt.swapfile = false vim.opt.backup = false -vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir" +vim.opt.undodir = os.getenv("LOCALAPPDATA") .. "\\nvim-data\\undodir" vim.opt.undofile = true vim.opt.hlsearch = true