From bf391d14ee228e8cd90e53622f5eb1451c86334c Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Thu, 18 Apr 2024 23:20:06 -0700 Subject: [PATCH] place file explorer on right side --- lazy-lock.json | 3 ++- lua/config/keymaps.lua | 6 ++++++ lua/plugins/{presence.lua => extras.lua} | 1 + lua/plugins/files.lua | 13 +++++++++++++ lua/plugins/formatting.lua | 13 +++++++++++++ lua/plugins/{tokyonight.lua => style.lua} | 1 + 6 files changed, 36 insertions(+), 1 deletion(-) rename lua/plugins/{presence.lua => extras.lua} (69%) create mode 100644 lua/plugins/files.lua create mode 100644 lua/plugins/formatting.lua rename lua/plugins/{tokyonight.lua => style.lua} (76%) diff --git a/lazy-lock.json b/lazy-lock.json index cd0cccf..ce6b28b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -41,7 +41,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "9eb6d866840df0f3fb1d2e8f34a7e0cfdf80f980" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-spectre": { "branch": "master", "commit": "9653847cf2f225648967f6e9363643e327387579" }, - "nvim-treesitter": { "branch": "master", "commit": "208d504421e4ac53f4230a34cd4b831e8e76cb69" }, + "nvim-treesitter": { "branch": "master", "commit": "baaae36ac709f405c0ee5d39ef9ffd8d8160f1a3" }, "nvim-treesitter-context": { "branch": "master", "commit": "e6e71047bb323fb36f5664993a42adaac252bb36" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, @@ -51,6 +51,7 @@ "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "rustaceanvim": { "branch": "master", "commit": "efccc7d7c42e0849a6c85bfd6a8d746729cf08b5" }, + "tailwind-fold.nvim": { "branch": "main", "commit": "4335dd915073fe3da43a85b06742d12626603973" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope.nvim": { "branch": "master", "commit": "d00d9df48c00d8682c14c2b5da78bda7ef06b939" }, diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index 2c134f7..711a5cb 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -1,3 +1,9 @@ -- Keymaps are automatically loaded on the VeryLazy event -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua -- Add any additional keymaps here + +-- Resize window using arrow keys (rebinded for macos support) +vim.keymap.set("n", "", "resize +2", { desc = "Increase Window Height" }) +vim.keymap.set("n", "", "resize -2", { desc = "Decrease Window Height" }) +vim.keymap.set("n", "", "vertical resize -2", { desc = "Decrease Window Width" }) +vim.keymap.set("n", "", "vertical resize +2", { desc = "Increase Window Width" }) diff --git a/lua/plugins/presence.lua b/lua/plugins/extras.lua similarity index 69% rename from lua/plugins/presence.lua rename to lua/plugins/extras.lua index 8081c88..608cdcd 100644 --- a/lua/plugins/presence.lua +++ b/lua/plugins/extras.lua @@ -1,4 +1,5 @@ -- stylua: ignore +-- defines extra plugins that don't directly affect editing return { { diff --git a/lua/plugins/files.lua b/lua/plugins/files.lua new file mode 100644 index 0000000..e3ca386 --- /dev/null +++ b/lua/plugins/files.lua @@ -0,0 +1,13 @@ +--stylua-ignore +--define file navigation and manipulation configurations + +return { + { + "nvim-neo-tree/neo-tree.nvim", + opts = { + window = { + position = "right", + }, + }, + }, +} diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua new file mode 100644 index 0000000..10e9690 --- /dev/null +++ b/lua/plugins/formatting.lua @@ -0,0 +1,13 @@ +-- stylua: ignore +-- +-- defines configuration for formatters and cosmetic code enhancements (not including themes/pure cosmetic) + +return { + -- fold long tailwindcss classes + { + 'razak17/tailwind-fold.nvim', + opts= {}, + dependencies = { 'nvim-treesitter/nvim-treesitter' }, + ft = { 'html', 'svelte', 'astro', 'vue', 'typescriptreact', 'php', 'blade' }, + }, +} diff --git a/lua/plugins/tokyonight.lua b/lua/plugins/style.lua similarity index 76% rename from lua/plugins/tokyonight.lua rename to lua/plugins/style.lua index 8789a0c..9035d7e 100644 --- a/lua/plugins/tokyonight.lua +++ b/lua/plugins/style.lua @@ -1,4 +1,5 @@ -- stylua: ignore +-- defines cosmetic and theme based configurations and plugins return { {