diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..2b17ff22
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,164 @@
+# see https://github.com/CppCXY/EmmyLuaCodeStyle
+[*.lua]
+# [basic]
+
+# optional space/tab
+indent_style = space
+# if indent_style is space, this is valid
+indent_size = 2
+# if indent_style is tab, this is valid
+tab_width = 2
+# none/single/double
+quote_style = single
+
+continuation_indent = 2
+## extend option
+# continuation_indent.before_block = 4
+# continuation_indent.in_expr = 4
+# continuation_indent.in_table = 4
+
+# this mean utf8 length , if this is 'unset' then the line width is no longer checked
+# this option decides when to chopdown the code
+max_line_length = 160
+
+# optional crlf/lf/cr/auto, if it is 'auto', in windows it is crlf other platforms are lf
+# in neovim the value 'auto' is not a valid option, please use 'unset' 
+end_of_line = auto
+
+#  none/ comma / semicolon / only_kv_colon
+table_separator_style = comma
+
+#optional keep/never/always/smart
+trailing_table_separator = smart
+
+# keep/remove/remove_table_only/remove_string_only
+call_arg_parentheses = keep
+
+detect_end_of_line = false
+
+# this will check text end with new line
+insert_final_newline = true
+
+# [space]
+space_around_table_field_list = true
+
+space_before_attribute = true
+
+space_before_function_open_parenthesis = false
+
+space_before_function_call_open_parenthesis = false
+
+space_before_closure_open_parenthesis = false
+
+# optional always/only_string/only_table/none
+# or true/false
+space_before_function_call_single_arg = always
+## extend option
+## always/keep/none
+# space_before_function_call_single_arg.table = always
+## always/keep/none
+# space_before_function_call_single_arg.string = always
+
+space_before_open_square_bracket = false
+
+space_inside_function_call_parentheses = false
+
+space_inside_function_param_list_parentheses = false
+
+space_inside_square_brackets = false
+
+# like t[#t+1] = 1
+space_around_table_append_operator = false
+
+ignore_spaces_inside_function_call = false
+
+# detail number or 'keep'
+space_before_inline_comment = 1
+
+# [operator space]
+space_around_math_operator = true
+
+space_after_comma = true
+
+space_after_comma_in_for_statement = true
+
+# true/false or none/always/no_space_asym
+space_around_concat_operator = true
+
+space_around_logical_operator = true
+
+# true/false or none/always/no_space_asym
+space_around_assign_operator = true
+
+# [align]
+
+align_call_args = false
+
+align_function_params = true
+
+align_continuous_assign_statement = true
+
+align_continuous_rect_table_field = true
+
+align_continuous_line_space = 2
+
+align_if_branch = false
+
+# option none / always / contain_curly/
+align_array_table = true
+
+align_continuous_similar_call_args = false
+
+align_continuous_inline_comment = true
+# option none / always / only_call_stmt
+align_chain_expr = none
+
+# [indent]
+
+never_indent_before_if_condition = false
+
+never_indent_comment_on_if_branch = false
+
+keep_indents_on_empty_lines = false
+# [line space]
+
+# The following configuration supports four expressions
+# keep  
+# fixed(n)   
+# min(n)
+# max(n)
+# for eg. min(2)
+
+line_space_after_if_statement = keep
+
+line_space_after_do_statement = keep
+
+line_space_after_while_statement = keep
+
+line_space_after_repeat_statement = keep
+
+line_space_after_for_statement = keep
+
+line_space_after_local_or_assign_statement = keep
+
+line_space_after_function_statement = fixed(2)
+
+line_space_after_expression_statement = keep
+
+line_space_after_comment = keep
+
+line_space_around_block = fixed(1)
+# [line break]
+break_all_list_when_line_exceed = false
+
+auto_collapse_lines = false
+
+break_before_braces = false
+
+# [preference]
+ignore_space_after_colon = false
+
+remove_call_expression_list_finish_comma = false
+# keep / always / same_line / replace_with_newline / never
+end_statement_with_semicolon = keep
+
diff --git a/init.lua b/init.lua
index b4813e7f..ea877a0a 100644
--- a/init.lua
+++ b/init.lua
@@ -88,7 +88,7 @@ require('lazy').setup({
 
       -- Useful status updates for LSP
       -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
-      { 'j-hui/fidget.nvim',       opts = {} },
+      { 'j-hui/fidget.nvim', opts = {} },
 
       -- Additional lua configuration, makes nvim stuff amazing!
       'folke/neodev.nvim',
@@ -113,7 +113,7 @@ require('lazy').setup({
   },
 
   -- Useful plugin to show you pending keybinds.
-  { 'folke/which-key.nvim',  opts = {} },
+  { 'folke/which-key.nvim', opts = {} },
   {
     -- Adds git related signs to the gutter, as well as utilities for managing changes
     'lewis6991/gitsigns.nvim',
@@ -211,10 +211,11 @@ require('lazy').setup({
       sections = {
         lualine_c = {
           {
-            'filename', path = 4
-          }
-        }
-      }
+            'filename',
+            path = 4,
+          },
+        },
+      },
     },
   },
 
@@ -240,9 +241,10 @@ require('lazy').setup({
       sections = {
         lualine_c = {
           {
-            'filename', path = 4
-          }
-        }
+            'filename',
+            path = 4,
+          },
+        },
       },
       -- Only load if `make` is available. Make sure you have the system
       -- requirements installed.
@@ -365,15 +367,15 @@ require('telescope').setup {
       i = {
         ['<C-u>'] = false,
         ['<C-d>'] = false,
-        ["<C-j>"] = require('telescope.actions').move_selection_next,
-        ["<C-k>"] = require('telescope.actions').move_selection_previous,
-        ["<C-n>"] = require('telescope.actions').cycle_history_next,
-        ["<C-p>"] = require('telescope.actions').cycle_history_prev,
+        ['<C-j>'] = require('telescope.actions').move_selection_next,
+        ['<C-k>'] = require('telescope.actions').move_selection_previous,
+        ['<C-n>'] = require('telescope.actions').cycle_history_next,
+        ['<C-p>'] = require('telescope.actions').cycle_history_prev,
       },
       -- for normal mode
       n = {
-        ["<C-j>"] = require('telescope.actions').move_selection_next,
-        ["<C-k>"] = require('telescope.actions').move_selection_previous,
+        ['<C-j>'] = require('telescope.actions').move_selection_next,
+        ['<C-k>'] = require('telescope.actions').move_selection_previous,
       },
     },
   },
@@ -454,16 +456,16 @@ vim.defer_fn(function()
     -- Add languages to be installed here that you want installed for treesitter
     -- ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' },
     ensure_installed = {
-      "bash",
-      "javascript",
-      "json",
-      "lua",
-      "typescript",
-      "tsx",
-      "css",
-      "rust",
-      "yaml",
-      "svelte",
+      'bash',
+      'javascript',
+      'json',
+      'lua',
+      'typescript',
+      'tsx',
+      'css',
+      'rust',
+      'yaml',
+      'svelte',
     },
 
     -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
diff --git a/lua/custom/plugins/autopairs.lua b/lua/custom/plugins/autopairs.lua
index d271227f..529c3308 100644
--- a/lua/custom/plugins/autopairs.lua
+++ b/lua/custom/plugins/autopairs.lua
@@ -1,15 +1,12 @@
 return {
-  "windwp/nvim-autopairs",
+  'windwp/nvim-autopairs',
   -- Optional dependency
   dependencies = { 'hrsh7th/nvim-cmp' },
   config = function()
-    require("nvim-autopairs").setup {}
+    require('nvim-autopairs').setup {}
     -- If you want to automatically add `(` after selecting a function or method
-    local cmp_autopairs = require('nvim-autopairs.completion.cmp')
-    local cmp = require('cmp')
-    cmp.event:on(
-      'confirm_done',
-      cmp_autopairs.on_confirm_done()
-    )
+    local cmp_autopairs = require 'nvim-autopairs.completion.cmp'
+    local cmp = require 'cmp'
+    cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
   end,
 }
diff --git a/lua/custom/plugins/conform.lua b/lua/custom/plugins/conform.lua
index 1969402d..d94f312c 100644
--- a/lua/custom/plugins/conform.lua
+++ b/lua/custom/plugins/conform.lua
@@ -1,41 +1,93 @@
 return {
-  "stevearc/conform.nvim",
+  'stevearc/conform.nvim',
   lazy = true,
   -- event = { "BufReadPre", "BufNewFile" }, -- to disable comment this out
   config = function()
-    local conform = require("conform")
+    local conform = require 'conform'
 
-    conform.setup({
+    conform.setup {
 
       formatters_by_ft = {
-        css = { { --[[ "prettierd", ]] "prettier" } },
-        graphql = { { --[[ "prettierd", ]] "prettier" } },
-        html = { { --[[ "prettierd", ]] "prettier" } },
-        javascript = { { --[[ "prettierd", ]] "prettier" } },
-        javascriptreact = { { --[[ "prettierd", ]] "prettier" } },
-        json = { { --[[ "prettierd", ]] "prettier" } },
-        less = { { --[[ "prettierd", ]] "prettier" } },
-        markdown = { { --[[ "prettierd", ]] "prettier" } },
-        scss = { { --[[ "prettierd", ]] "prettier" } },
-        svelte = { { --[[ "prettierd", ]] "prettier" } },
-        typescript = { { --[[ "prettierd", ]] "prettier" } },
-        typescriptreact = { { --[[ "prettierd", ]] "prettier" } },
-        yaml = { { --[[ "prettierd", ]] "prettier" } },
+        css = {
+          { --[[ "prettierd", ]]
+            'prettier',
+          },
+        },
+        graphql = {
+          { --[[ "prettierd", ]]
+            'prettier',
+          },
+        },
+        html = {
+          { --[[ "prettierd", ]]
+            'prettier',
+          },
+        },
+        javascript = {
+          { --[[ "prettierd", ]]
+            'prettier',
+          },
+        },
+        javascriptreact = {
+          { --[[ "prettierd", ]]
+            'prettier',
+          },
+        },
+        json = {
+          { --[[ "prettierd", ]]
+            'prettier',
+          },
+        },
+        less = {
+          { --[[ "prettierd", ]]
+            'prettier',
+          },
+        },
+        markdown = {
+          { --[[ "prettierd", ]]
+            'prettier',
+          },
+        },
+        scss = {
+          { --[[ "prettierd", ]]
+            'prettier',
+          },
+        },
+        svelte = {
+          { --[[ "prettierd", ]]
+            'prettier',
+          },
+        },
+        typescript = {
+          { --[[ "prettierd", ]]
+            'prettier',
+          },
+        },
+        typescriptreact = {
+          { --[[ "prettierd", ]]
+            'prettier',
+          },
+        },
+        yaml = {
+          { --[[ "prettierd", ]]
+            'prettier',
+          },
+        },
       },
 
       format_on_save = {
         lsp_fallback = true,
         async = false,
-        timeout_ms = 500
-      }
-    })
+        timeout_ms = 500,
+      },
+    }
 
-    vim.keymap.set({ "n", "v" }, "<leader>f", function()
-      conform.format({
+    vim.keymap.set({ 'n', 'v' }, '<leader>f', function()
+      conform.format {
         lsp_fallback = true,
         async = false,
         timeout_ms = 1000,
-      })
-    end, { desc = "Format file or range (in visual mode)" })
-  end
+      }
+    end, { desc = 'Format file or range (in visual mode)' })
+  end,
 }
diff --git a/lua/custom/plugins/filetree.lua b/lua/custom/plugins/filetree.lua
index be53624f..693ffc77 100644
--- a/lua/custom/plugins/filetree.lua
+++ b/lua/custom/plugins/filetree.lua
@@ -1,10 +1,10 @@
 return {
-  "nvim-neo-tree/neo-tree.nvim",
-  version = "*",
+  'nvim-neo-tree/neo-tree.nvim',
+  version = '*',
   dependencies = {
-    "nvim-lua/plenary.nvim",
-    "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
-    "MunifTanjim/nui.nvim",
+    'nvim-lua/plenary.nvim',
+    'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
+    'MunifTanjim/nui.nvim',
   },
   config = function()
     require('neo-tree').setup {
@@ -17,9 +17,9 @@ return {
             -- '.git',
             -- '.DS_Store',
             -- 'thumbs.db',
-          }
-        }
-      }
+          },
+        },
+      },
     }
     vim.keymap.set('n', '<leader>e', '<Cmd>Neotree toggle<CR>', { desc = 'Open filetree explorer' })
   end,
diff --git a/lua/custom/zwergius/set.lua b/lua/custom/zwergius/set.lua
index ae3f7e13..7cbb091e 100644
--- a/lua/custom/zwergius/set.lua
+++ b/lua/custom/zwergius/set.lua
@@ -14,11 +14,11 @@ vim.o.hlsearch = false
 vim.opt.incsearch = true
 
 -- Filetype overrides
-vim.filetype.add({
+vim.filetype.add {
   extension = {
     postcss = 'css',
-  }
-})
+  },
+}
 
 -- Autocommand create folder(s) for new file
 vim.cmd 'source ~/.config/nvim/vim/auto-mkdir.vim'