Merge remote-tracking branch 'origin' into wsl2

.config/nvim/init.lua

@@ -11,14 +11,25 @@ if not vim.loop.fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 
+local has = vim.fn.has
+local is_mac = has "macunix"
+local is_win = has "win32"
+local is_unix = has "unix"
+
 -- custom modules:
 require("keymaps")
-require("clipboard")
 require("options")
 
-require("lazy").setup({
+if is_win then
-    import = "plugins",
+	require("clipboard-windows")
-    install = {
+end
-        colorscheme = { "rose-pine" },
+
-    }
+if is_mac then
-})
+	require("clipboard-macos")
+end
+
+if is_unix then
+	require("clipboard-unix")
+end
+
+require("lazy").setup("plugins")

.config/nvim/lua/clipboard-macos.lua

@@ -0,0 +1 @@
+vim.opt.clipboard:append { "unnamedplus" }

.config/nvim/lua/clipboard-unix.lua

@@ -0,0 +1 @@
+vim.opt.clipboard:append { "unnamedplus" }

.config/nvim/lua/clipboard-windows.lua

@@ -0,0 +1,12 @@
+vim.g.clipboard = {
+    name = "win32yank",
+    copy = {
+        ['+'] = "win32yank.exe -i --crlf",
+        ['*'] = "win32yank.exe -i --crlf",
+    },
+    paste = {
+        ['+'] = "win32yank.exe -o --lf",
+        ['*'] = "win32yank.exe -o --lf",
+    },
+    cache_enabled = 0,
+}

.config/nvim/lua/keymaps.lua

@@ -6,6 +6,11 @@ vim.keymap.set("i", "<C-[>", "<Esc>", { noremap = true, silent = true })
 vim.keymap.set("v", "<C-[>", "<Esc>", { noremap = true, silent = true })
 vim.keymap.set("n", "<C-[>", "<Esc>", { noremap = true, silent = true })
 
+-- easy escape
+vim.keymap.set("i", "<C-[>", "<Esc>", { noremap = true, silent = true })
+vim.keymap.set("v", "<C-[>", "<Esc>", { noremap = true, silent = true })
+vim.keymap.set("n", "<C-[>", "<Esc>", { noremap = true, silent = true })
+
 -- open the explorer
 vim.keymap.set("n", "<leader>e", "<cmd>Ex<CR>")
 
@@ -87,3 +92,6 @@ vim.keymap.set("t", "<C-x>", "<cmd>bd!<CR>", { noremap = true })   -- terminate
 vim.keymap.set("n", "<C-t>", "<cmd>term<CR>i", { noremap = true }) -- create new terminal session
 
 vim.keymap.set({ 'n', 'v' }, "<Space>", "<Nop>", { silent = true })
+
+-- lazygit on floaterm
+vim.keymap.set("n", "<leader>g", "<cmd>FloatermNew lazygit<CR>", { noremap = true })

.config/nvim/lua/plugins/rose-pine.lua

@@ -0,0 +1,7 @@
+return {
+	"rose-pine/nvim",
+	name = "rose-pine",
+	config = function ()
+		vim.cmd.colorscheme("rose-pine")
+	end
+}