changed theme, added C-6 mapping, need to figure out how to load deno or node depending on project
This commit is contained in:
1 parent
aa809c71e6
commit
8456e321a9
5 files changed
+38
-29
No files matched your search
@@ -22,6 +22,9 @@ m.nmap("[d", vim.diagnostic.goto_prev)
|
|||||||
m.nmap("]d", vim.diagnostic.goto_next)
|
m.nmap("]d", vim.diagnostic.goto_next)
|
||||||
m.nmap("<leader>q", vim.diagnostic.setloclist)
|
m.nmap("<leader>q", vim.diagnostic.setloclist)
|
||||||
|
|
||||||
|
-- easier <C-6>
|
||||||
|
m.nmap("<leader>n", "<C-6>")
|
||||||
|
|
||||||
-- colemak-dh
|
-- colemak-dh
|
||||||
local l = u.layout
|
local l = u.layout
|
||||||
l.swap("n", "h")
|
l.swap("n", "h")
|
||||||
|
|||||||
@@ -10,10 +10,10 @@ hl("ExtraWhitespace", { ctermbg = "red", bg = "#ff8888" })
|
|||||||
vim.cmd [[match ExtraWhitespace /\s\+$/]]
|
vim.cmd [[match ExtraWhitespace /\s\+$/]]
|
||||||
|
|
||||||
-- make background transparent
|
-- make background transparent
|
||||||
gbhl("Normal", "none")
|
-- gbhl("Normal", "none")
|
||||||
gbhl("EndOfBuffer", "none")
|
-- gbhl("EndOfBuffer", "none")
|
||||||
gbhl("SignColumn", "none")
|
-- gbhl("SignColumn", "none")
|
||||||
gbhl("NeoTreeNormal", "none")
|
-- gbhl("NeoTreeNormal", "none")
|
||||||
gbhl("NeoTreeNormalNC", "none")
|
-- gbhl("NeoTreeNormalNC", "none")
|
||||||
gbhl("NeoTreeEndOfBuffer", "none")
|
-- gbhl("NeoTreeEndOfBuffer", "none")
|
||||||
|
|
||||||
+13
-5
@@ -25,10 +25,10 @@ local config = function()
|
|||||||
vim.g.markdown_fenced_languages = {
|
vim.g.markdown_fenced_languages = {
|
||||||
"ts=typescript"
|
"ts=typescript"
|
||||||
}
|
}
|
||||||
require("lspconfig").denols.setup {
|
--require("lspconfig").denols.setup {
|
||||||
on_attach = on_attach,
|
-- on_attach = on_attach,
|
||||||
capabilities = capabilities,
|
-- capabilities = capabilities,
|
||||||
}
|
--}
|
||||||
require("lspconfig").clangd.setup {
|
require("lspconfig").clangd.setup {
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
@@ -45,6 +45,14 @@ local config = function()
|
|||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
capabilities = capabilities
|
capabilities = capabilities
|
||||||
}
|
}
|
||||||
|
require("lspconfig").angularls.setup {
|
||||||
|
on_attach = on_attach,
|
||||||
|
capabilities = capabilities
|
||||||
|
}
|
||||||
|
require("lspconfig").tsserver.setup {
|
||||||
|
on_attach = on_attach,
|
||||||
|
capabilities = capabilities
|
||||||
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
local rs_config = function()
|
local rs_config = function()
|
||||||
@@ -70,7 +78,7 @@ return {
|
|||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
"mfussenegger/nvim-dap",
|
"mfussenegger/nvim-dap",
|
||||||
},
|
},
|
||||||
rs_config = rs_config
|
config = rs_config
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"windwp/nvim-autopairs",
|
"windwp/nvim-autopairs",
|
||||||
|
|||||||
+11
-14
@@ -1,33 +1,30 @@
|
|||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
'nvim-neorg/neorg',
|
"nvim-neorg/neorg",
|
||||||
tag = '0.0.12',
|
tag = "0.0.12",
|
||||||
config = function()
|
config = function()
|
||||||
require('neorg').setup {
|
require("neorg").setup {
|
||||||
load = {
|
load = {
|
||||||
['core.defaults'] = {},
|
["core.defaults"] = {},
|
||||||
['core.norg.concealer'] = {},
|
["core.norg.concealer"] = {},
|
||||||
['core.norg.completion'] = {
|
["core.norg.completion"] = {
|
||||||
config = {
|
config = {
|
||||||
engine = 'nvim-cmp'
|
engine = "nvim-cmp"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
['core.export'] = {},
|
["core.export"] = {},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
end,
|
end,
|
||||||
dependencies = 'nvim-lua/plenary.nvim'
|
dependencies = { "nvim-lua/plenary.nvim" },
|
||||||
|
build = ":Neorg sync-parsers"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"folke/which-key.nvim",
|
"folke/which-key.nvim",
|
||||||
config = function()
|
config = function()
|
||||||
vim.o.timeout = true
|
vim.o.timeout = true
|
||||||
vim.o.timeoutlen = 300
|
vim.o.timeoutlen = 300
|
||||||
require("which-key").setup({
|
require("which-key").setup {}
|
||||||
-- your configuration comes here
|
|
||||||
-- or leave it empty to use the default settings
|
|
||||||
-- refer to the configuration section below
|
|
||||||
})
|
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@@ -1,9 +1,11 @@
|
|||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"navarasu/onedark.nvim",
|
"catppuccin/nvim",
|
||||||
config = function()
|
config = function()
|
||||||
require("onedark").setup { style = "darker" }
|
require("catppuccin").setup({
|
||||||
require("onedark").load()
|
transparent_background = true
|
||||||
|
})
|
||||||
|
vim.cmd.colorscheme("catppuccin-mocha")
|
||||||
package.loaded["config.theme"] = nil
|
package.loaded["config.theme"] = nil
|
||||||
require("config.theme")
|
require("config.theme")
|
||||||
end
|
end
|
||||||
@@ -36,7 +38,6 @@ return {
|
|||||||
end,
|
end,
|
||||||
config = function()
|
config = function()
|
||||||
require("nvim-treesitter.configs").setup {
|
require("nvim-treesitter.configs").setup {
|
||||||
ensure_installed = { "norg" },
|
|
||||||
highlight = { enable = true }
|
highlight = { enable = true }
|
||||||
}
|
}
|
||||||
end,
|
end,
|
||||||
|
|||||||
Reference in new issue
Block a user