Update themes and some key bindings
This commit is contained in:
14
lua/plugins/config/catppuccin.lua
Normal file
14
lua/plugins/config/catppuccin.lua
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
vim.g.catppuccin_flavour = "mocha"
|
||||||
|
|
||||||
|
require("catppuccin").setup {
|
||||||
|
styles = {
|
||||||
|
loops = { "italic" },
|
||||||
|
functions = { "italic", "bold" }
|
||||||
|
},
|
||||||
|
|
||||||
|
integrations = {
|
||||||
|
lsp_trouble = true,
|
||||||
|
which_key = true,
|
||||||
|
barbar = true
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -12,7 +12,9 @@ cmp.setup {
|
|||||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||||
["<C-Space>"] = cmp.mapping.complete(),
|
["<C-Space>"] = cmp.mapping.complete(),
|
||||||
["<C-e>"] = cmp.mapping.abort(),
|
["<C-e>"] = cmp.mapping.abort(),
|
||||||
["<CR>"] = cmp.mapping.confirm({ select = true })
|
["<CR>"] = cmp.mapping.confirm({ select = true }),
|
||||||
|
["<Tab>"] = cmp.mapping.select_next_item(),
|
||||||
|
["<S-Tab>"] = cmp.mapping.select_prev_item()
|
||||||
}),
|
}),
|
||||||
|
|
||||||
sources = cmp.config.sources({
|
sources = cmp.config.sources({
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ require("lsp-setup").setup {
|
|||||||
gopls = {},
|
gopls = {},
|
||||||
cssls = {},
|
cssls = {},
|
||||||
jsonls = {},
|
jsonls = {},
|
||||||
html = {}
|
html = {},
|
||||||
|
pylsp = {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
require("lualine").setup {
|
require("lualine").setup {
|
||||||
options = {
|
options = {
|
||||||
theme = "tokyonight"
|
theme = "catppuccin"
|
||||||
},
|
},
|
||||||
|
|
||||||
extensions = {
|
extensions = {
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
local g = vim.g
|
local g = vim.g
|
||||||
|
|
||||||
vim.g.tokyonight_italic_functions = true
|
vim.g.tokyonight_italic_functions = true
|
||||||
|
|
||||||
vim.cmd[[colorscheme tokyonight]]
|
|
||||||
|
|||||||
@@ -1,50 +1,68 @@
|
|||||||
local wk = require("which-key")
|
local wk = require("which-key")
|
||||||
|
|
||||||
wk.setup {
|
wk.setup {
|
||||||
ignore_missing = false
|
-- TODO: Change to true
|
||||||
|
ignore_missing = false,
|
||||||
|
key_labels = {
|
||||||
|
["<space>"] = "SPC"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
wk.register({
|
wk.register({
|
||||||
["<leader>"] = {
|
["<leader>"] = {
|
||||||
-- Barbar
|
-- Files
|
||||||
|
["<space>"] = { "<cmd>Telescope fd<CR>", "find files" },
|
||||||
|
|
||||||
|
-- Buffers
|
||||||
b = {
|
b = {
|
||||||
name = "Barbar",
|
name = "buffers",
|
||||||
x = { "<cmd>BufferClose<CR>", "Close Buffer" },
|
x = { "<cmd>BufferClose<CR>", "close buffer" },
|
||||||
n = { "<cmd>BufferMoveNext<CR>", "Move Next" },
|
n = { "<cmd>BufferMoveNext<CR>", "move next" },
|
||||||
m = { "<cmd>BufferMovePrevious<CR>", "Move Previous" },
|
m = { "<cmd>BufferMovePrevious<CR>", "move previous" },
|
||||||
|
f = { "<cmd>Telescope current_buffer_fuzzy_find<CR>", "find in current buffer" },
|
||||||
|
|
||||||
p = {
|
p = {
|
||||||
name = "Pinned Buffers",
|
name = "pinned buffers",
|
||||||
p = { "<cmd>BufferPin<CR>", "Pin Buffer" },
|
p = { "<cmd>BufferPin<CR>", "pin buffer" },
|
||||||
x = { "<cmd>BufferCloseAllButPinned<CR>", "Close All But Pinned" }
|
x = { "<cmd>BufferCloseAllButPinned<CR>", "close all but pinned" }
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
-- Telescope
|
-- Telescope
|
||||||
t = {
|
t = {
|
||||||
name = "Telescope",
|
name = "Telescope",
|
||||||
w = { "<cmd>Telescope live_grep<CR>", "Live Grep" },
|
w = { "<cmd>Telescope live_grep<CR>", "live grep" },
|
||||||
f = { "<cmd>Telescope fd<CR>", "Find Files" },
|
|
||||||
c = { "<cmd>Telescope current_buffer_fuzzy_find<CR>", "Find In Current Buffer" },
|
|
||||||
b = { "<cmd>Telescope buffers<CR>", "Buffers" },
|
b = { "<cmd>Telescope buffers<CR>", "Buffers" },
|
||||||
k = { "<cmd>Telescope keymaps<CR>", "Keymaps" },
|
k = { "<cmd>Telescope keymaps<CR>", "Keymaps" },
|
||||||
t = { "<cmd>TodoTelescope<CR>", "Todos" }
|
t = { "<cmd>TodoTelescope<CR>", "Todos" },
|
||||||
|
c = { "<cmd>TodoTelescope<CR>", "" },
|
||||||
|
["."] = { "<cmd>Telescope keymaps<CR>", "Global Keymaps" }
|
||||||
},
|
},
|
||||||
|
|
||||||
|
-- Git
|
||||||
g = {
|
g = {
|
||||||
name = "Git",
|
name = "Git",
|
||||||
b = { "<cmd>Gitsigns blame_line<CR>", "Blame Line" },
|
b = { "<cmd>Gitsigns blame_line<CR>", "Blame Line" },
|
||||||
d = { "<cmd>Gitsigns diffthis<CR>", "Diff" }
|
d = { "<cmd>Gitsigns diffthis<CR>", "Diff" }
|
||||||
|
},
|
||||||
|
|
||||||
|
-- LSP
|
||||||
|
l = {
|
||||||
|
name = "LSP",
|
||||||
|
a = { "<cmd>vim.lsp.buf.code_action()<CR>", "Code Action" },
|
||||||
|
f = { "<cmd>vim.lsp.buf.formatting()<CR>", "Format" },
|
||||||
|
n = { "<cmd>vim.lsp.buf.rename()<CR>", "Rename" }
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
-- NvimTree
|
-- NvimTree
|
||||||
["<C-n>"] = { "<cmd>NvimTreeToggle<CR>", "NvimTree Toggle" },
|
["<C-n>"] = { "<cmd>NvimTreeToggle<CR>", "NvimTree Toggle" },
|
||||||
|
|
||||||
-- Barbar (switching buffers)
|
-- Switching Buffers
|
||||||
["<TAB>"] = { "<cmd>BufferNext<CR>", "Next Buffer" },
|
["<TAB>"] = { "<cmd>BufferNext<CR>", "Next Buffer" },
|
||||||
["<S-TAB>"] = { "<cmd>BufferPrevious<CR>", "Previous Buffer" },
|
["<S-TAB>"] = { "<cmd>BufferPrevious<CR>", "Previous Buffer" },
|
||||||
|
|
||||||
|
-- Trouble
|
||||||
["t"] = {
|
["t"] = {
|
||||||
name = "Trouble",
|
name = "Trouble",
|
||||||
t = { "<cmd>TroubleToggle<CR>", "Trouble Toggle" },
|
t = { "<cmd>TroubleToggle<CR>", "Trouble Toggle" },
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
local fn = vim.fn
|
local fn = vim.fn
|
||||||
local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
|
local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
|
||||||
if fn.empty(fn.glob(install_path)) > 0 then
|
if fn.empty(fn.glob(install_path)) > 0 then
|
||||||
packer_bootstrap = fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path })
|
packer_bootstrap = fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim",
|
||||||
|
install_path })
|
||||||
print("Installing packer: close and reopen Neovim...")
|
print("Installing packer: close and reopen Neovim...")
|
||||||
end
|
end
|
||||||
|
|
||||||
require("plugins.setup")
|
require("plugins.setup")
|
||||||
require("plugins.barbar_nvimtree")
|
require("plugins.barbar_nvimtree")
|
||||||
|
|
||||||
|
vim.cmd [[colorscheme catppuccin]]
|
||||||
|
|||||||
@@ -10,6 +10,14 @@ require("packer").startup(function(use)
|
|||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
use {
|
||||||
|
"catppuccin/nvim",
|
||||||
|
as = "catppuccin",
|
||||||
|
config = function()
|
||||||
|
require("plugins.config.catppuccin")
|
||||||
|
end
|
||||||
|
}
|
||||||
|
|
||||||
use {
|
use {
|
||||||
"kyazdani42/nvim-web-devicons",
|
"kyazdani42/nvim-web-devicons",
|
||||||
config = function()
|
config = function()
|
||||||
|
|||||||
Reference in New Issue
Block a user