Move catppuccin options into ui directory

This commit is contained in:
Evie Litherland-Smith 2023-02-20 11:25:00 +00:00
parent edb827889a
commit c4fdedf391
8 changed files with 49 additions and 35 deletions

View file

@ -1,5 +1,5 @@
vim.g.mapleader = " "
vim.keymap.set("i", "jk", "<esc>") vim.keymap.set("i", "jk", "<esc>")
vim.keymap.set("n", "<leader>l", "<cmd>Lazy<CR>")
vim.keymap.set({ "n", "t" }, "<A-h>", "<CMD>NavigatorLeft<CR>") vim.keymap.set({ "n", "t" }, "<A-h>", "<CMD>NavigatorLeft<CR>")
vim.keymap.set({ "n", "t" }, "<A-l>", "<CMD>NavigatorRight<CR>") vim.keymap.set({ "n", "t" }, "<A-l>", "<CMD>NavigatorRight<CR>")
vim.keymap.set({ "n", "t" }, "<A-k>", "<CMD>NavigatorUp<CR>") vim.keymap.set({ "n", "t" }, "<A-k>", "<CMD>NavigatorUp<CR>")
@ -25,7 +25,7 @@ vim.keymap.set("n", "<leader>\\", "<cmd>Neotree reveal<cr>")
-- diffview -- diffview
vim.keymap.set("n", "<leader>do", "<cmd>DiffviewOpen<cr>") vim.keymap.set("n", "<leader>do", "<cmd>DiffviewOpen<cr>")
vim.keymap.set("n", "<leader>dc", "<cmd>DiffviewOpen<cr>") vim.keymap.set("n", "<leader>dc", "<cmd>DiffviewClose<cr>")
vim.keymap.set("n", "<leader>dh", "<cmd>DiffviewFileHistory<cr>") vim.keymap.set("n", "<leader>dh", "<cmd>DiffviewFileHistory<cr>")
vim.keymap.set("n", "<leader>df", "<cmd>DiffviewFileHistory %<cr>") vim.keymap.set("n", "<leader>df", "<cmd>DiffviewFileHistory %<cr>")

View file

@ -4,37 +4,8 @@ return {
lazy = false, lazy = false,
priority = 1000, priority = 1000,
config = function() config = function()
vim.opt.fillchars:append { require "ui.fillchars"
horiz = "", require("catppuccin").setup ( require "ui.catppuccin_opts" )
horizup = "",
horizdown = "",
vert = "",
vertleft = "",
vertright = "",
verthoriz = "",
}
require("catppuccin").setup {
flavour = "macchiato",
transparent_background = true,
term_colors = true,
integrations = {
gitsigns = true,
indent_blankline = {
enabled = true,
colored_indent_levels = true,
},
cmp = true,
native_lsp = {
enabled = true,
},
notify = true,
nvimtree = true,
treesitter = true,
treesitter_context = true,
telescope = true,
lsp_trouble = true,
},
}
vim.cmd "colorscheme catppuccin" vim.cmd "colorscheme catppuccin"
end, end,
} }

View file

@ -1,6 +1,10 @@
return { return {
"sindrets/diffview.nvim", "sindrets/diffview.nvim",
dependencies = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons" }, dependencies = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons" },
cmd = {
"DiffviewOpen",
"DiffviewFileHistory",
},
config = function() config = function()
require("diffview").setup { require("diffview").setup {
enhanced_diff_hl = true, enhanced_diff_hl = true,

View file

@ -1,6 +1,6 @@
return { return {
"feline-nvim/feline.nvim", "feline-nvim/feline.nvim",
dependencies = "catppuccin/nvim", dependencies = { require "plugins.catppuccin" },
config = function() config = function()
local components = require("ui.catppuccin_feline").get() local components = require("ui.catppuccin_feline").get()
require("feline").setup { components = components } require("feline").setup { components = components }

View file

@ -1,5 +1,4 @@
return { return {
"numToStr/Navigator.nvim", "numToStr/Navigator.nvim",
name = "Navigator",
config = function() require("Navigator").setup() end, config = function() require("Navigator").setup() end,
} }

View file

@ -1,5 +1,14 @@
return { return {
"klen/nvim-test", "klen/nvim-test",
cmd = {
"TestSuite",
"TestFile",
"TestEdit",
"TestNearest",
"TestLast",
"TestVisit",
"TestInfo",
},
config = function() config = function()
require("nvim-test").setup { require("nvim-test").setup {
termOpts = { termOpts = {

View file

@ -0,0 +1,22 @@
return {
flavour = "macchiato",
transparent_background = true,
term_colors = true,
integrations = {
gitsigns = true,
indent_blankline = {
enabled = true,
colored_indent_levels = true,
},
cmp = true,
native_lsp = {
enabled = true,
},
notify = true,
nvimtree = true,
treesitter = true,
treesitter_context = true,
telescope = true,
lsp_trouble = true,
},
}

View file

@ -0,0 +1,9 @@
vim.opt.fillchars:append {
horiz = "",
horizup = "",
horizdown = "",
vert = "",
vertleft = "",
vertright = "",
verthoriz = "",
}