From dba3e617f7241de9da39e4a63364c1e054b594ce Mon Sep 17 00:00:00 2001 From: juancwu <46619361+juancwu@users.noreply.github.com> Date: Mon, 11 Sep 2023 16:43:49 -0400 Subject: [PATCH] nvim config updates --- .config/nvim/init.lua | 24 +++++++++---------- .config/nvim/lazy-lock.json | 1 + .config/nvim/lua/options.lua | 6 ++--- .config/nvim/lua/plugins/indent-blankline.lua | 6 +++++ 4 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 .config/nvim/lua/plugins/indent-blankline.lua diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 260b8a8..36dcc15 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,13 +1,13 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) end vim.opt.rtp:prepend(lazypath) @@ -21,15 +21,15 @@ require("keymaps") require("options") if is_wsl == 1 then - require("clipboard-wsl") + require("clipboard-wsl") end if is_mac == 1 then - require("clipboard-macos") + require("clipboard-macos") end -if is_unix == 1 then - require("clipboard-unix") +if is_unix == 1 and is_mac ~= 1 then + require("clipboard-unix") end require("lazy").setup("plugins") diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index e5692e9..b3ba870 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -7,6 +7,7 @@ "git.nvim": { "branch": "main", "commit": "eb09b8d01d7bb38ca1d65ed0d82d71bddcd8a8bd" }, "gitsigns.nvim": { "branch": "main", "commit": "79127db3b127f5d125f35e0d44ba60715edf2842" }, "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" }, + "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" }, "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" }, "lsp-zero.nvim": { "branch": "v2.x", "commit": "f084f4a6a716f55bf9c4026e73027bb24a0325a3" }, "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua index 419e56f..553543e 100644 --- a/.config/nvim/lua/options.lua +++ b/.config/nvim/lua/options.lua @@ -7,9 +7,9 @@ vim.opt.relativenumber = true -- juicy relativity vim.opt.autoindent = true vim.opt.smartindent = true -vim.opt.tabstop = 2 -vim.opt.softtabstop = 2 -vim.opt.shiftwidth = 2 +vim.opt.tabstop = 4 +vim.opt.softtabstop = 4 +vim.opt.shiftwidth = 4 vim.opt.expandtab = true vim.opt.smarttab = true vim.opt.breakindent = true diff --git a/.config/nvim/lua/plugins/indent-blankline.lua b/.config/nvim/lua/plugins/indent-blankline.lua new file mode 100644 index 0000000..4585a57 --- /dev/null +++ b/.config/nvim/lua/plugins/indent-blankline.lua @@ -0,0 +1,6 @@ +return { + "lukas-reineke/indent-blankline.nvim", + config = { + show_end_of_line = true, + }, +}