summaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
Diffstat (limited to 'lua')
-rw-r--r--lua/default-config.lua31
-rw-r--r--lua/plugins.lua5
2 files changed, 7 insertions, 29 deletions
diff --git a/lua/default-config.lua b/lua/default-config.lua
index ce7b1062..e05fc9e3 100644
--- a/lua/default-config.lua
+++ b/lua/default-config.lua
@@ -4,7 +4,7 @@ CACHE_PATH = vim.fn.stdpath "cache"
TERMINAL = vim.fn.expand "$TERMINAL"
O = {
-
+ format_on_save = true,
auto_close_tree = 0,
auto_complete = true,
colorscheme = "lunar",
@@ -33,7 +33,7 @@ O = {
},
lsp = {
- popup_border = "single"
+ popup_border = "single",
},
database = { save_location = "~/.config/nvcode_db", auto_execute = 1 },
@@ -97,9 +97,6 @@ O = {
lang = {
python = {
linter = "",
- -- @usage can be 'yapf', 'black'
- formatter = "",
- autoformat = false,
isort = false,
diagnostics = {
virtual_text = { spacing = 0, prefix = "ï„‘" },
@@ -116,9 +113,6 @@ O = {
sdk_path = "/usr/lib/dart/bin/snapshots/analysis_server.dart.snapshot",
},
lua = {
- -- @usage can be 'lua-format'
- formatter = "",
- autoformat = false,
diagnostics = {
virtual_text = { spacing = 0, prefix = "ï„‘" },
signs = true,
@@ -129,8 +123,6 @@ O = {
-- @usage can be 'shellcheck'
linter = "",
-- @usage can be 'shfmt'
- formatter = "",
- autoformat = false,
diagnostics = {
virtual_text = { spacing = 0, prefix = "ï„‘" },
signs = true,
@@ -140,9 +132,6 @@ O = {
tsserver = {
-- @usage can be 'eslint'
linter = "",
- -- @usage can be 'prettier'
- formatter = "",
- autoformat = false,
diagnostics = {
virtual_text = { spacing = 0, prefix = "ï„‘" },
signs = true,
@@ -150,9 +139,6 @@ O = {
},
},
json = {
- -- @usage can be 'prettier'
- formatter = "",
- autoformat = false,
diagnostics = {
virtual_text = { spacing = 0, prefix = "ï„‘" },
signs = true,
@@ -178,7 +164,6 @@ O = {
},
cross_file_rename = true,
header_insertion = "never",
- autoformat = false, -- update this to true for enabling autoformat
},
ruby = {
diagnostics = {
@@ -198,8 +183,6 @@ O = {
active = false,
},
linter = "",
- formatter = "",
- autoformat = false,
diagnostics = {
virtual_text = { spacing = 0, prefix = "ï„‘" },
signs = true,
@@ -208,13 +191,9 @@ O = {
},
svelte = {},
php = {
- format = {
- braces = "psr12",
- },
environment = {
php_version = "7.4",
},
- autoformat = false,
diagnostics = {
virtual_text = { spacing = 0, prefix = "ï„‘" },
signs = true,
@@ -233,8 +212,6 @@ O = {
cmake = {},
java = {},
css = {
- formatter = "",
- autoformat = false,
virtual_text = true,
},
},
@@ -263,6 +240,4 @@ O = {
},
footer = { "chrisatmachine.com" },
},
-}
-
-
+} \ No newline at end of file
diff --git a/lua/plugins.lua b/lua/plugins.lua
index b14cac46..8752a1ba 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -66,6 +66,9 @@ return require("packer").startup(function(use)
-- Treesitter
use { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }
+ -- Neoformat
+ use { "sbdchd/neoformat", event = "BufEnter" }
+
use {
"kyazdani42/nvim-tree.lua",
-- cmd = "NvimTreeToggle",
@@ -435,7 +438,7 @@ return require("packer").startup(function(use)
"typescript",
"typescriptreact",
"typescript.tsx",
- }
+ },
}
-- use {
-- "jose-elias-alvarez/null-ls.nvim",