summaryrefslogtreecommitdiff
path: root/.config/nvim
diff options
context:
space:
mode:
Diffstat (limited to '.config/nvim')
-rw-r--r--.config/nvim/config.lua6
-rw-r--r--.config/nvim/lua/cfg/dashboard/init.lua2
-rw-r--r--.config/nvim/lua/cfg/treesitter/init.lua5
-rw-r--r--.config/nvim/lua/default-config.lua24
4 files changed, 5 insertions, 32 deletions
diff --git a/.config/nvim/config.lua b/.config/nvim/config.lua
index ca83853..b50537c 100644
--- a/.config/nvim/config.lua
+++ b/.config/nvim/config.lua
@@ -1,6 +1,5 @@
-- O is the global options object
--- THESE ARE EXAMPLE CONFIGS FEEL FREE TO CHANGE TO WHATEVER YOU WANT
-- general
O.auto_complete = true
O.relative_number = true
@@ -9,12 +8,13 @@ O.timeoutlen = 100
O.leader_key = ' '
-- After changing plugin config it is recommended to run :PackerCompile
+O.plugin.dashboard.active = true
O.plugin.hop.active = true
O.plugin.colorizer.active = true
O.plugin.trouble.active = true
O.plugin.lazygit.active = true
O.plugin.zen.active = true
--- O.plugin.vim_rooter.active = true
+O.plugin.vim_rooter.active = true
-- O.plugin.markdown_preview.active = true
-- if you don't want all the parsers change this to a table of the ones you want
@@ -23,7 +23,7 @@ O.treesitter.ignore_install = {"haskell"}
O.treesitter.highlight.enabled = true
-- lua
-O.lang.lua.autoformat = false
+O.lang.lua.autoformat = true
O.lang.lua.formatter = 'lua-format'
-- python
diff --git a/.config/nvim/lua/cfg/dashboard/init.lua b/.config/nvim/lua/cfg/dashboard/init.lua
index 0d6dcb1..2305243 100644
--- a/.config/nvim/lua/cfg/dashboard/init.lua
+++ b/.config/nvim/lua/cfg/dashboard/init.lua
@@ -50,7 +50,7 @@ M.config = function()
-- vim.g.dashboard_custom_footer = O.dashboard.footer
end
-require("_utils").define_augroups {
+require("cfg.utils").define_augroups {
_dashboard = {
-- seems to be nobuflisted that makes my stuff disapear will do more testing
{
diff --git a/.config/nvim/lua/cfg/treesitter/init.lua b/.config/nvim/lua/cfg/treesitter/init.lua
index 27877f0..12525da 100644
--- a/.config/nvim/lua/cfg/treesitter/init.lua
+++ b/.config/nvim/lua/cfg/treesitter/init.lua
@@ -134,9 +134,4 @@ require("nvim-treesitter.configs").setup {
show_help = "?",
},
},
- rainbow = {
- enable = O.plugin.ts_rainbow.active,
- extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean
- max_file_lines = 1000, -- Do not enable for files with more than 1000 lines, int
- },
}
diff --git a/.config/nvim/lua/default-config.lua b/.config/nvim/lua/default-config.lua
index ed28b79..0207635 100644
--- a/.config/nvim/lua/default-config.lua
+++ b/.config/nvim/lua/default-config.lua
@@ -13,7 +13,7 @@ O = {
number = true,
relative_number = true,
cursorline = true,
- shell = "bash",
+ shell = "zsh",
timeoutlen = 100,
nvim_tree_disable_netrw = 0,
ignore_case = true,
@@ -72,7 +72,6 @@ O = {
ts_autotag = { active = false },
ts_textobjects = { active = false },
ts_playground = { active = false },
- ts_rainbow = { active = false },
ts_textsubjects = { active = false },
telescope_fzy = { active = false },
telescope_project = { active = false },
@@ -166,14 +165,6 @@ O = {
cross_file_rename = true,
header_insertion = "never",
},
- ruby = {
- diagnostics = {
- virtualtext = { spacing = 0, prefix = "" },
- signs = true,
- underline = true,
- },
- filetypes = { "rb", "erb", "rakefile", "ruby" },
- },
go = {},
elixir = {},
vim = {},
@@ -190,18 +181,6 @@ O = {
underline = true,
},
},
- svelte = {},
- php = {
- environment = {
- php_version = "7.4",
- },
- diagnostics = {
- virtual_text = { spacing = 0, prefix = "" },
- signs = true,
- underline = true,
- },
- filetypes = { "php", "phtml" },
- },
latex = {},
kotlin = {},
html = {},
@@ -211,7 +190,6 @@ O = {
efm = {},
docker = {},
cmake = {},
- java = {},
css = {
virtual_text = true,
},