From c51164f6e00cc011e8aadf30deb8a244be807a8a Mon Sep 17 00:00:00 2001 From: sevi-kun Date: Fri, 4 Aug 2023 07:36:32 +0000 Subject: [PATCH 1/6] Added branch for office/windows environment --- lua/sevi-kun/packer.lua | 6 +++--- lua/sevi-kun/set.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/sevi-kun/packer.lua b/lua/sevi-kun/packer.lua index 7e678a1..beb3995 100644 --- a/lua/sevi-kun/packer.lua +++ b/lua/sevi-kun/packer.lua @@ -57,10 +57,10 @@ return require('packer').startup(function(use) -- pretty use { - 'catppuccin/nvim', - as = 'mocha', + "loctvl842/monokai-pro.nvim", config = function() - vim.cmd('colorscheme catppuccin-mocha') + require("monokai-pro").setup() + vim.cmd([[colorscheme monokai-pro]]) end } diff --git a/lua/sevi-kun/set.lua b/lua/sevi-kun/set.lua index 1979535..b87215d 100644 --- a/lua/sevi-kun/set.lua +++ b/lua/sevi-kun/set.lua @@ -12,7 +12,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 = false From 1030d9da0a341d5398facc17a6f45851efd23178 Mon Sep 17 00:00:00 2001 From: sevi-kun Date: Fri, 4 Aug 2023 07:36:32 +0000 Subject: [PATCH 2/6] Added branch for office/windows environment --- lua/sevi-kun/packer.lua | 6 +++--- lua/sevi-kun/set.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/sevi-kun/packer.lua b/lua/sevi-kun/packer.lua index 18a09fb..789f690 100644 --- a/lua/sevi-kun/packer.lua +++ b/lua/sevi-kun/packer.lua @@ -57,10 +57,10 @@ return require('packer').startup(function(use) -- pretty use { - 'catppuccin/nvim', - as = 'mocha', + "loctvl842/monokai-pro.nvim", config = function() - vim.cmd('colorscheme catppuccin-mocha') + require("monokai-pro").setup() + vim.cmd([[colorscheme monokai-pro]]) end } diff --git a/lua/sevi-kun/set.lua b/lua/sevi-kun/set.lua index 2e85c95..f678d99 100644 --- a/lua/sevi-kun/set.lua +++ b/lua/sevi-kun/set.lua @@ -13,7 +13,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 = false From 8576c7788620d7721e2f930ec77e88eac480c771 Mon Sep 17 00:00:00 2001 From: Lord Of Nougate Date: Thu, 24 Aug 2023 12:56:43 +0200 Subject: [PATCH 3/6] Update 'lua/sevi-kun/set.lua' Change wrap indicator to 95 (company standards) --- lua/sevi-kun/set.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/sevi-kun/set.lua b/lua/sevi-kun/set.lua index f678d99..63a8560 100644 --- a/lua/sevi-kun/set.lua +++ b/lua/sevi-kun/set.lua @@ -27,6 +27,6 @@ vim.opt.isfname:append("@-@") vim.opt.updatetime = 50 -vim.opt.colorcolumn = "80" +vim.opt.colorcolumn = "95" vim.g.mapleader = " " From 6d60071768edbed30587af26e46d61be8d354a23 Mon Sep 17 00:00:00 2001 From: sevi-kun Date: Fri, 4 Aug 2023 07:36:32 +0000 Subject: [PATCH 4/6] Added branch for office/windows environment --- lua/sevi-kun/packer.lua | 5 +++-- lua/sevi-kun/set.lua | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lua/sevi-kun/packer.lua b/lua/sevi-kun/packer.lua index e992681..47f2348 100644 --- a/lua/sevi-kun/packer.lua +++ b/lua/sevi-kun/packer.lua @@ -94,9 +94,10 @@ return require('packer').startup(function(use) -- pretty use { - 'navarasu/onedark.nvim', + "loctvl842/monokai-pro.nvim", config = function() - vim.cmd('colorscheme onedark') + require("monokai-pro").setup() + vim.cmd([[colorscheme monokai-pro]]) end } diff --git a/lua/sevi-kun/set.lua b/lua/sevi-kun/set.lua index b3f2c47..a0d45fc 100644 --- a/lua/sevi-kun/set.lua +++ b/lua/sevi-kun/set.lua @@ -15,7 +15,7 @@ vim.opt.wrap = true 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 From 741fe78cad3601ce82313cc36a97b7e960039edd Mon Sep 17 00:00:00 2001 From: Lord Of Nougate Date: Thu, 24 Aug 2023 12:56:43 +0200 Subject: [PATCH 5/6] Update 'lua/sevi-kun/set.lua' Change wrap indicator to 95 (company standards) --- lua/sevi-kun/set.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/sevi-kun/set.lua b/lua/sevi-kun/set.lua index a0d45fc..e65b62c 100644 --- a/lua/sevi-kun/set.lua +++ b/lua/sevi-kun/set.lua @@ -29,7 +29,7 @@ vim.opt.isfname:append("@-@") vim.opt.updatetime = 50 -vim.opt.colorcolumn = "80" +vim.opt.colorcolumn = "95" vim.g.netrw_preview = 1 vim.g.netrw_liststyle = 3 From d3e9655b5071638aafdf30c183f849456e0cbc1e Mon Sep 17 00:00:00 2001 From: sevi-kun Date: Tue, 5 Sep 2023 21:57:59 +0200 Subject: [PATCH 6/6] Add neorg fix for windows --- lua/sevi-kun/packer.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/sevi-kun/packer.lua b/lua/sevi-kun/packer.lua index 47f2348..ee57112 100644 --- a/lua/sevi-kun/packer.lua +++ b/lua/sevi-kun/packer.lua @@ -57,7 +57,7 @@ return require('packer').startup(function(use) ["core.dirman"] = { config = { workspaces = { - notes = "~/Documents/Notes", + notes = os.getenv("LOCALAPPDATA") .. "\\nvim-data\\Notes", }, default_workspace = "notes", },