Rebase office branch to move to lazy. Additional minor fixes

after/plugin/neorg.lua

@@ -1,7 +0,0 @@
--- Note keymaps
-vim.keymap.set("n", "<leader>ni", ":Neorg index<CR>")
-vim.keymap.set("n", "<leader>nr", ":Neorg return<CR>")
-vim.keymap.set("n", "<leader>nj", ":Neorg journal custom<CR>")
-
-vim.keymap.set("n", "<leader>nim", ":Neorg inject-metadata<CR>")
-vim.keymap.set("n", "<leader>nis", ":Neorg inject-metadata<CR>")

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",

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
     },
 

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