From b73e32f99dbd48e16cf9597de975cd99d6cc0c79 Mon Sep 17 00:00:00 2001
From: shaoyu <fanshaoyu9@outlook.com>
Date: Thu, 21 Nov 2024 16:25:38 -0500
Subject: [PATCH] Add surround plugin

---
 init.lua                            | 33 ++++++++++++++++-------------
 lazy-lock.json                      | 10 ++++-----
 lua/custom/plugins/ftplugin/cpp.lua |  4 ++++
 lua/custom/plugins/ftplugin/js.lua  |  4 ++++
 lua/custom/plugins/surround.lua     | 10 +++++++++
 5 files changed, 41 insertions(+), 20 deletions(-)
 create mode 100644 lua/custom/plugins/ftplugin/cpp.lua
 create mode 100644 lua/custom/plugins/ftplugin/js.lua
 create mode 100644 lua/custom/plugins/surround.lua

diff --git a/init.lua b/init.lua
index b2b02986..aa17cc9e 100644
--- a/init.lua
+++ b/init.lua
@@ -714,8 +714,11 @@ require('lazy').setup({
         -- Conform can also run multiple formatters sequentially
         -- python = { "isort", "black" },
         --
+        html = { 'htmlbeautifier' },
+        css = { { 'prettierd', 'prettier' } },
+        sass = { { 'prettierd', 'prettier' } },
         -- You can use 'stop_after_first' to run the first available formatter from the list
-        -- javascript = { "prettierd", "prettier", stop_after_first = true },
+        javascript = { 'prettierd', 'prettier', stop_after_first = true },
       },
     },
   },
@@ -847,7 +850,7 @@ require('lazy').setup({
       -- Load the colorscheme here.
       -- Like many other themes, this one has different styles, and you could load
       -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
-      vim.cmd.colorscheme 'tokyonight-night'
+      vim.cmd.colorscheme 'tokyonight-moon'
 
       -- You can configure highlights by doing something like:
       vim.cmd.hi 'Comment gui=none'
@@ -967,19 +970,19 @@ require('lazy').setup({
     -- If you are using a Nerd Font: set icons to an empty table which will use the
     -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table
     icons = vim.g.have_nerd_font and {} or {
-      cmd = '⌘',
-      config = '🛠',
-      event = '📅',
-      ft = '📂',
-      init = '⚙',
-      keys = '🗝',
-      plugin = '🔌',
-      runtime = '💻',
-      require = '🌙',
-      source = '📄',
-      start = '🚀',
-      task = '📌',
-      lazy = '💤 ',
+      -- cmd = '⌘',
+      -- config = '🛠',
+      -- event = '📅',
+      -- ft = '📂',
+      -- init = '⚙',
+      -- keys = '🗝',
+      -- plugin = '🔌',
+      -- runtime = '💻',
+      -- require = '🌙',
+      -- source = '📄',
+      -- start = '🚀',
+      -- task = '📌',
+      -- lazy = '💤 ',
     },
   },
 })
diff --git a/lazy-lock.json b/lazy-lock.json
index 75319319..7ecf7574 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,9 +1,9 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "659c4479529a05cc9b05ef762639a09d366cc690" },
+  "LuaSnip": { "branch": "master", "commit": "2737edc9e674e537dc0a97e3405658d57d2d31ed" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "conform.nvim": { "branch": "master", "commit": "1a7ff54dcfbe1af139b11829c6d58f5ffab87707" },
+  "conform.nvim": { "branch": "master", "commit": "8c354323201d04530727d8bdcc4669791ee082ef" },
   "fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" },
   "gitsigns.nvim": { "branch": "main", "commit": "4daf7022f1481edf1e8fb9947df13bb07c18e89a" },
   "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" },
@@ -24,16 +24,16 @@
   "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" },
   "nvim-lint": { "branch": "master", "commit": "36da8dd0ddc4f88e0beae234c20e75397326f143" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d2d153a179ed59aa7134d7ebdf4d7dcb156efa22" },
+  "nvim-lspconfig": { "branch": "master", "commit": "4cb925e96288a71409a86c84fd97f4434a95453e" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
-  "nvim-treesitter": { "branch": "master", "commit": "7646c1c12a3121562aa87fd79aace48c728ac096" },
+  "nvim-treesitter": { "branch": "master", "commit": "bb06afa3f1111780932b3c5493ad65473ce85f9d" },
   "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
-  "onedark.nvim": { "branch": "master", "commit": "67a74c275d1116d575ab25485d1bfa6b2a9c38a6" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
   "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
+  "tokyonight.nvim": { "branch": "main", "commit": "ce91ba480070c95f40753e4663e32b4632ac6db3" },
   "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
   "which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" }
 }
diff --git a/lua/custom/plugins/ftplugin/cpp.lua b/lua/custom/plugins/ftplugin/cpp.lua
new file mode 100644
index 00000000..33276fa3
--- /dev/null
+++ b/lua/custom/plugins/ftplugin/cpp.lua
@@ -0,0 +1,4 @@
+vim.bo.tabstop = 3 -- size of a hard tabstop (ts).
+vim.bo.shiftwidth = 3 -- size of an indentation (sw).
+vim.bo.expandtab = true -- always uses spaces instead of tab characters (et).
+vim.bo.softtabstop = 3 -- number of spaces a <Tab> counts for. When 0, feature is off (sts).
diff --git a/lua/custom/plugins/ftplugin/js.lua b/lua/custom/plugins/ftplugin/js.lua
new file mode 100644
index 00000000..33276fa3
--- /dev/null
+++ b/lua/custom/plugins/ftplugin/js.lua
@@ -0,0 +1,4 @@
+vim.bo.tabstop = 3 -- size of a hard tabstop (ts).
+vim.bo.shiftwidth = 3 -- size of an indentation (sw).
+vim.bo.expandtab = true -- always uses spaces instead of tab characters (et).
+vim.bo.softtabstop = 3 -- number of spaces a <Tab> counts for. When 0, feature is off (sts).
diff --git a/lua/custom/plugins/surround.lua b/lua/custom/plugins/surround.lua
new file mode 100644
index 00000000..e32286cc
--- /dev/null
+++ b/lua/custom/plugins/surround.lua
@@ -0,0 +1,10 @@
+return {
+  'kylechui/nvim-surround',
+  version = '*', -- Use for stability; omit to use `main` branch for the latest features
+  event = 'VeryLazy',
+  config = function()
+    require('nvim-surround').setup {
+      -- Configuration here, or leave empty to use defaults
+    }
+  end,
+}