1
0
Fork 0

fix: colorscheme change and workspaces nvim

Signed-off-by: Lucas Sta Maria <lucas@priime.dev>
This commit is contained in:
Lucas Sta Maria 2023-02-23 01:06:42 -05:00
parent a0d687ef5c
commit 4db2fad540
No known key found for this signature in database
GPG key ID: F07FB16A826E3B47
4 changed files with 65 additions and 9 deletions

View file

@ -150,6 +150,7 @@ lspconfig.java_language_server.setup {
lspconfig.racket_langserver.setup {
on_attach = on_attach,
capabilities = capabilities,
root_dir = lspconfig.util.root_pattern('main.rkt')
}
lspconfig.ocamllsp.setup {
@ -162,7 +163,7 @@ lspconfig.jedi_language_server.setup {
capabilities = capabilities,
}
lspconfig.sumneko_lua.setup {
lspconfig.lua_ls.setup {
on_attach = on_attach,
capabilities = capabilities,
}
@ -171,3 +172,8 @@ lspconfig.clojure_lsp.setup {
on_attach = on_attach,
capabilities = capabilities,
}
lspconfig.texlab.setup {
on_attach=on_attach,
capabilities=capabilities
}

View file

@ -32,6 +32,7 @@ map('i', '<C-a>', 'copilot#Accept("<CR>")', {expr=true, silent=true})
-- neogit / git related
map('n', '<leader>gg', ':Neogit<CR>')
map('n', '<leader>gb', ':Gitsigns blame_line<CR>')
map('n', '<leader>gs', ':Gitsigns stage_hunk<CR>')
-- symbols outline
map("n", "<leader>os", ":SymbolsOutline<CR>")
@ -43,9 +44,11 @@ map("n", "<C-z>", ":lua require('leap').leap { backward = true }<CR>")
-- pollen
map("i", "<A-d>", "")
-- ayu toggle
map("n", "<A-j>", ":let ayucolor=\"dark\"<CR>:colorscheme ayu<CR>")
map("n", "<A-k>", ":let ayucolor=\"light\"<CR>:colorscheme ayu<CR>")
-- colorscheme toggle
-- map("n", "<A-j>", ":let ayucolor=\"dark\"<CR>:colorscheme ayu<CR>")
-- map("n", "<A-k>", ":let ayucolor=\"light\"<CR>:colorscheme ayu<CR>")
map("n", "<A-j>", ":colorscheme catppuccin-mocha<CR>")
map("n", "<A-k>", ":colorscheme catppuccin-latte<CR>")
-- horizontal scrolling
map("n", "<C-l>", "zl")
@ -56,6 +59,11 @@ map("n", "<C-k>", ":BufferLineCycleNext<CR>")
map("n", "<C-j>", ":BufferLineCyclePrev<CR>")
map("n", "<C-S-k>", ":BufferLineMoveNext<CR>")
map("n", "<C-S-j>", ":BufferLineMovePrev<CR>")
map("n", "<leader>bd", ":bd<CR>")
-- trouble
map("n", "<leader>od", ":TroubleToggle<CR>")
-- workspaces
map("n", "<leader>pp", ":Telescope workspaces theme=dropdown<CR>")
map("n", "<leader>pa", ":WorkspacesAdd ")

View file

@ -22,6 +22,7 @@ packer.startup(function()
-- ui
use("ayu-theme/ayu-vim")
use{"catppuccin/nvim", as="catppuccin"}
use("nvim-lua/popup.nvim")
use("nvim-telescope/telescope.nvim")
use("lewis6991/gitsigns.nvim")
@ -56,6 +57,7 @@ packer.startup(function()
use("mhartington/formatter.nvim")
use{"kylechui/nvim-surround",branch="main"}
use("numToStr/Comment.nvim")
use("natecraddock/workspaces.nvim")
if packer_bootstrap then
require('packer').sync()
@ -75,8 +77,14 @@ require("nvim-treesitter.configs").setup {
require("fidget").setup {}
-- ayu
vim.cmd([[let ayucolor="light"]])
vim.cmd([[colorscheme ayu]])
-- vim.cmd([[let ayucolor="light"]])
-- vim.cmd([[colorscheme ayu]])
-- catppuccin
require("catppuccin").setup {
flavour = "latte"
}
vim.cmd([[colorscheme catppuccin]])
-- telescope
require("telescope").setup {
@ -90,8 +98,14 @@ require("telescope").setup {
hidden = true,
file_ignore_patterns = { ".git/" }
}
},
extensions = {
workspaces = {
keep_insert = false,
}
}
}
require("telescope").load_extension("workspaces")
-- git signs
require('gitsigns').setup {
@ -128,7 +142,8 @@ require('nvim-tree').setup {
enable = true,
ignore = true,
timeout = 1500,
}
},
sync_root_with_cwd = true
}
-- lualine
@ -197,6 +212,21 @@ require('formatter').setup {
tex = {
require('formatter.filetypes.latex').latexindent
},
java = {
function ()
return {
exe = "google-java-format",
args = {
"--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
"--add-exports", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
"--add-exports", "jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
"--add-exports", "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
"--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
},
stdin = false
}
end
},
-- apply to all filetypes
["*"] = {
require('formatter.filetypes.any').remove_trailing_whitespace
@ -215,8 +245,13 @@ require('Comment').setup {}
-- autopairs
require("nvim-autopairs").setup {
disable_filetype = { "TelescopePrompt", "racket" }
disable_filetype = { "TelescopePrompt" }
}
-- trouple
-- trouble
require("trouble").setup {}
vim.diagnostic.config({
virtual_text = false,
})
require("workspaces").setup {}