removed lualine and addet witch-dark colorscheme. Also changed the way to install colorschemes + configs under ./lua/pika/plugins/colorschemes.lua
This commit is contained in:
pika
parent
e69f225dfd
commit
ebc341b853
8 changed files with 207 additions and 175 deletions
|
|
@ -1,26 +0,0 @@
|
|||
return {
|
||||
"ribru17/bamboo.nvim",
|
||||
lazy = false,
|
||||
priority = 1000, -- Make sure to load this before all the other start plugins.
|
||||
config = function()
|
||||
require("bamboo").setup({
|
||||
-- ────────────────────────────< optional configuration here >─────────────────────────
|
||||
code_style = {
|
||||
comments = { italic = false, bold = true },
|
||||
conditionals = { italic = true },
|
||||
keywords = { bold = true },
|
||||
functions = {},
|
||||
namespaces = { italic = true },
|
||||
parameters = { italic = true },
|
||||
strings = {},
|
||||
variables = { bold = true },
|
||||
},
|
||||
-- ─< Custom Highlights -- >────────────────────────────────────────────────────────────
|
||||
colors = {}, -- Override default colors
|
||||
highlights = { -- Override highlight groups
|
||||
["@comment"] = { fg = "#555653" },
|
||||
},
|
||||
})
|
||||
require("bamboo").load()
|
||||
end,
|
||||
}
|
||||
38
lua/pika/plugins/colorschemes.lua
Normal file
38
lua/pika/plugins/colorschemes.lua
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
return {
|
||||
|
||||
{
|
||||
"sontungexpt/witch",
|
||||
priority = 1000,
|
||||
lazy = false,
|
||||
config = function(_, opts)
|
||||
require("witch").setup(opts)
|
||||
end,
|
||||
},
|
||||
|
||||
{
|
||||
"ribru17/bamboo.nvim",
|
||||
lazy = false,
|
||||
priority = 1000, -- Make sure to load this before all the other start plugins.
|
||||
config = function()
|
||||
require("bamboo").setup({
|
||||
-- ────────────────────────────< optional configuration here >─────────────────────────
|
||||
code_style = {
|
||||
comments = { italic = false, bold = true },
|
||||
conditionals = { italic = true },
|
||||
keywords = { bold = true },
|
||||
functions = {},
|
||||
namespaces = { italic = true },
|
||||
parameters = { italic = true },
|
||||
strings = {},
|
||||
variables = { bold = true },
|
||||
},
|
||||
-- ─< Custom Highlights -- >────────────────────────────────────────────────────────────
|
||||
colors = {}, -- Override default colors
|
||||
highlights = { -- Override highlight groups
|
||||
["@comment"] = { fg = "#555653" },
|
||||
},
|
||||
})
|
||||
-- require("bamboo").load()
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
|
@ -2,4 +2,12 @@ return {
|
|||
"nvim-lua/plenary.nvim", -- lua functions that many plugins use
|
||||
"christoomey/vim-tmux-navigator", -- tmux & split window navigation
|
||||
"dstein64/nvim-scrollview",
|
||||
{
|
||||
"sontungexpt/witch",
|
||||
priority = 1000,
|
||||
lazy = false,
|
||||
config = function(_, opts)
|
||||
require("witch").setup(opts)
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
return {
|
||||
"nvim-lualine/lualine.nvim",
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
config = function()
|
||||
local lualine = require("lualine")
|
||||
local lazy_status = require("lazy.status") -- to configure lazy pending updates count
|
||||
|
||||
local colors = {
|
||||
blue = "#57a5e5",
|
||||
green = "#70c2be",
|
||||
violet = "#aaaaff",
|
||||
yellow = "#dbb651",
|
||||
red = "#e75a7c",
|
||||
fg = "#f1e9dc",
|
||||
bg = "#31332e",
|
||||
inactive_bg = "#3a3d37",
|
||||
}
|
||||
|
||||
local my_lualine_theme = {
|
||||
normal = {
|
||||
a = { bg = colors.blue, fg = colors.bg, gui = "bold" },
|
||||
b = { bg = colors.bg, fg = colors.fg },
|
||||
c = { bg = colors.bg, fg = colors.fg },
|
||||
},
|
||||
insert = {
|
||||
a = { bg = colors.green, fg = colors.bg, gui = "bold" },
|
||||
b = { bg = colors.bg, fg = colors.fg },
|
||||
c = { bg = colors.bg, fg = colors.fg },
|
||||
},
|
||||
visual = {
|
||||
a = { bg = colors.violet, fg = colors.bg, gui = "bold" },
|
||||
b = { bg = colors.bg, fg = colors.fg },
|
||||
c = { bg = colors.bg, fg = colors.fg },
|
||||
},
|
||||
command = {
|
||||
a = { bg = colors.yellow, fg = colors.bg, gui = "bold" },
|
||||
b = { bg = colors.bg, fg = colors.fg },
|
||||
c = { bg = colors.bg, fg = colors.fg },
|
||||
},
|
||||
replace = {
|
||||
a = { bg = colors.red, fg = colors.bg, gui = "bold" },
|
||||
b = { bg = colors.bg, fg = colors.fg },
|
||||
c = { bg = colors.bg, fg = colors.fg },
|
||||
},
|
||||
inactive = {
|
||||
a = { bg = colors.inactive_bg, fg = colors.semilightgray, gui = "bold" },
|
||||
b = { bg = colors.inactive_bg, fg = colors.semilightgray },
|
||||
c = { bg = colors.inactive_bg, fg = colors.semilightgray },
|
||||
},
|
||||
}
|
||||
|
||||
-- configure lualine with modified theme
|
||||
lualine.setup({
|
||||
options = {
|
||||
theme = my_lualine_theme,
|
||||
},
|
||||
sections = {
|
||||
lualine_x = {
|
||||
{
|
||||
lazy_status.updates,
|
||||
cond = lazy_status.has_updates,
|
||||
color = { fg = "#ff9e64" },
|
||||
},
|
||||
{ "encoding" },
|
||||
{ "fileformat" },
|
||||
{ "filetype" },
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
}
|
||||
71
lua/pika/plugins/lualine.lua.disabled
Normal file
71
lua/pika/plugins/lualine.lua.disabled
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
-- return {
|
||||
-- "nvim-lualine/lualine.nvim",
|
||||
-- dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
-- config = function()
|
||||
-- local lualine = require("lualine")
|
||||
-- local lazy_status = require("lazy.status") -- to configure lazy pending updates count
|
||||
--
|
||||
-- local colors = {
|
||||
-- blue = "#57a5e5",
|
||||
-- green = "#70c2be",
|
||||
-- violet = "#aaaaff",
|
||||
-- yellow = "#dbb651",
|
||||
-- red = "#e75a7c",
|
||||
-- fg = "#f1e9dc",
|
||||
-- bg = "#31332e",
|
||||
-- inactive_bg = "#3a3d37",
|
||||
-- }
|
||||
--
|
||||
-- local my_lualine_theme = {
|
||||
-- normal = {
|
||||
-- a = { bg = colors.blue, fg = colors.bg, gui = "bold" },
|
||||
-- b = { bg = colors.bg, fg = colors.fg },
|
||||
-- c = { bg = colors.bg, fg = colors.fg },
|
||||
-- },
|
||||
-- insert = {
|
||||
-- a = { bg = colors.green, fg = colors.bg, gui = "bold" },
|
||||
-- b = { bg = colors.bg, fg = colors.fg },
|
||||
-- c = { bg = colors.bg, fg = colors.fg },
|
||||
-- },
|
||||
-- visual = {
|
||||
-- a = { bg = colors.violet, fg = colors.bg, gui = "bold" },
|
||||
-- b = { bg = colors.bg, fg = colors.fg },
|
||||
-- c = { bg = colors.bg, fg = colors.fg },
|
||||
-- },
|
||||
-- command = {
|
||||
-- a = { bg = colors.yellow, fg = colors.bg, gui = "bold" },
|
||||
-- b = { bg = colors.bg, fg = colors.fg },
|
||||
-- c = { bg = colors.bg, fg = colors.fg },
|
||||
-- },
|
||||
-- replace = {
|
||||
-- a = { bg = colors.red, fg = colors.bg, gui = "bold" },
|
||||
-- b = { bg = colors.bg, fg = colors.fg },
|
||||
-- c = { bg = colors.bg, fg = colors.fg },
|
||||
-- },
|
||||
-- inactive = {
|
||||
-- a = { bg = colors.inactive_bg, fg = colors.semilightgray, gui = "bold" },
|
||||
-- b = { bg = colors.inactive_bg, fg = colors.semilightgray },
|
||||
-- c = { bg = colors.inactive_bg, fg = colors.semilightgray },
|
||||
-- },
|
||||
-- }
|
||||
--
|
||||
-- -- configure lualine with modified theme
|
||||
-- lualine.setup({
|
||||
-- options = {
|
||||
-- theme = my_lualine_theme,
|
||||
-- },
|
||||
-- sections = {
|
||||
-- lualine_x = {
|
||||
-- {
|
||||
-- lazy_status.updates,
|
||||
-- cond = lazy_status.has_updates,
|
||||
-- color = { fg = "#ff9e64" },
|
||||
-- },
|
||||
-- { "encoding" },
|
||||
-- { "fileformat" },
|
||||
-- { "filetype" },
|
||||
-- },
|
||||
-- },
|
||||
-- })
|
||||
-- end,
|
||||
-- }
|
||||
|
|
@ -1,74 +1,75 @@
|
|||
return {
|
||||
'nvim-telescope/telescope.nvim',
|
||||
branch = '0.1.x',
|
||||
dependencies = {
|
||||
'nvim-lua/plenary.nvim',
|
||||
{ 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' },
|
||||
'nvim-tree/nvim-web-devicons',
|
||||
'folke/todo-comments.nvim',
|
||||
},
|
||||
config = function()
|
||||
local telescope = require 'telescope'
|
||||
local actions = require 'telescope.actions'
|
||||
local transform_mod = require('telescope.actions.mt').transform_mod
|
||||
"nvim-telescope/telescope.nvim",
|
||||
branch = "0.1.x",
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
"folke/todo-comments.nvim",
|
||||
},
|
||||
config = function()
|
||||
local telescope = require("telescope")
|
||||
local actions = require("telescope.actions")
|
||||
local transform_mod = require("telescope.actions.mt").transform_mod
|
||||
|
||||
local trouble = require 'trouble'
|
||||
local trouble_telescope = require 'trouble.providers.telescope'
|
||||
local trouble = require("trouble")
|
||||
local trouble_telescope = require("trouble.providers.telescope")
|
||||
|
||||
-- or create your custom action
|
||||
local custom_actions = transform_mod {
|
||||
open_trouble_qflist = function(prompt_bufnr)
|
||||
trouble.toggle 'quickfix'
|
||||
end,
|
||||
}
|
||||
-- or create your custom action
|
||||
local custom_actions = transform_mod({
|
||||
open_trouble_qflist = function(prompt_bufnr)
|
||||
trouble.toggle("quickfix")
|
||||
end,
|
||||
})
|
||||
|
||||
local trouble_telescope = require 'trouble.sources.telescope'
|
||||
local trouble_telescope = require("trouble.sources.telescope")
|
||||
|
||||
telescope.setup {
|
||||
defaults = {
|
||||
path_display = { 'smart' },
|
||||
mappings = {
|
||||
i = {
|
||||
['<C-k>'] = actions.move_selection_previous, -- move to prev result
|
||||
['<C-j>'] = actions.move_selection_next, -- move to next result
|
||||
['<C-q>'] = actions.send_selected_to_qflist + custom_actions.open_trouble_qflist,
|
||||
['<C-t>'] = trouble_telescope.open, -- Updated line
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
telescope.setup({
|
||||
defaults = {
|
||||
path_display = { "smart" },
|
||||
mappings = {
|
||||
i = {
|
||||
["<C-k>"] = actions.move_selection_previous, -- move to prev result
|
||||
["<C-j>"] = actions.move_selection_next, -- move to next result
|
||||
["<C-q>"] = actions.send_selected_to_qflist + custom_actions.open_trouble_qflist,
|
||||
["<C-t>"] = trouble_telescope.open, -- Updated line
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
telescope.load_extension 'fzf'
|
||||
telescope.load_extension("fzf")
|
||||
|
||||
-- set keymaps
|
||||
local map = vim.keymap.set -- for conciseness
|
||||
-- set keymaps
|
||||
local map = vim.keymap.set -- for conciseness
|
||||
|
||||
-- Telescope mappings
|
||||
map('n', '<leader>sf', '<cmd>Telescope find_files<CR>', { noremap = true, silent = true, desc = 'Find Files' })
|
||||
map('n', '<leader>sw', '<cmd>Telescope live_grep<CR>', { noremap = true, silent = true, desc = 'Search Word' })
|
||||
map('n', '<leader>sn', '<cmd>Telescope neovim<CR>', { noremap = true, silent = true, desc = 'Neovim Files' })
|
||||
map('n', '<leader><leader>', '<cmd>Telescope buffers<CR>', { noremap = true, silent = true, desc = 'Buffers' })
|
||||
local builtin = require 'telescope.builtin'
|
||||
-- Telescope mappings
|
||||
map("n", "<leader>sf", "<cmd>Telescope find_files<CR>", { noremap = true, silent = true, desc = "Find Files" })
|
||||
map("n", "<leader>sw", "<cmd>Telescope live_grep<CR>", { noremap = true, silent = true, desc = "Search Word" })
|
||||
map("n", "<leader>sn", "<cmd>Telescope neovim<CR>", { noremap = true, silent = true, desc = "Neovim Files" })
|
||||
map("n", "<leader><leader>", "<cmd>Telescope buffers<CR>", { noremap = true, silent = true, desc = "Buffers" })
|
||||
local builtin = require("telescope.builtin")
|
||||
|
||||
map('n', '<leader>sn', function()
|
||||
builtin.find_files { cwd = vim.fn.stdpath 'config' }
|
||||
end, { desc = '[S]earch [N]eovim files' })
|
||||
map('n', '<leader>ff', builtin.find_files, { desc = '[S]earch [F]iles' })
|
||||
map('n', '<leader>sh', builtin.help_tags, { desc = '[S]earch [H]elp' })
|
||||
map('n', '<leader>sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' })
|
||||
map('n', '<leader>sg', builtin.live_grep, { desc = '[S]earch by [G]rep' })
|
||||
map('n', '<leader>sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' })
|
||||
map('n', '<leader>sr', builtin.resume, { desc = '[S]earch [R]esume' })
|
||||
map('n', '<leader>s.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
|
||||
map('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' })
|
||||
map('n', '<leader>q', vim.cmd.q)
|
||||
map("n", "<leader>sn", function()
|
||||
builtin.find_files({ cwd = vim.fn.stdpath("config") })
|
||||
end, { desc = "[S]earch [N]eovim files" })
|
||||
map("n", "<leader>ff", builtin.find_files, { desc = "[S]earch [F]iles" })
|
||||
map("n", "<leader>sh", builtin.help_tags, { desc = "[S]earch [H]elp" })
|
||||
map("n", "<leader>sk", builtin.keymaps, { desc = "[S]earch [K]eymaps" })
|
||||
map("n", "<leader>sg", builtin.live_grep, { desc = "[S]earch by [G]rep" })
|
||||
map("n", "<leader>sd", builtin.diagnostics, { desc = "[S]earch [D]iagnostics" })
|
||||
map("n", "<leader>sr", builtin.resume, { desc = "[S]earch [R]esume" })
|
||||
map("n", "<leader>s.", builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
|
||||
map("n", "<leader><leader>", builtin.buffers, { desc = "[ ] Find existing buffers" })
|
||||
|
||||
-- Additional custom mappings
|
||||
map('n', '<leader>/', function()
|
||||
builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown())
|
||||
end, { desc = '[/] Fuzzily search in current buffer' })
|
||||
map('n', '<leader>s/', function()
|
||||
builtin.live_grep { grep_open_files = true, prompt_title = 'Live Grep in Open Files' }
|
||||
end, { desc = '[S]earch [/] in Open Files' })
|
||||
end,
|
||||
map("n", "<leader>T", "<CMD>:Telescope colorscheme<CR>")
|
||||
|
||||
-- Additional custom mappings
|
||||
map("n", "<leader>/", function()
|
||||
builtin.current_buffer_fuzzy_find(require("telescope.themes").get_dropdown())
|
||||
end, { desc = "[/] Fuzzily search in current buffer" })
|
||||
map("n", "<leader>s/", function()
|
||||
builtin.live_grep({ grep_open_files = true, prompt_title = "Live Grep in Open Files" })
|
||||
end, { desc = "[S]earch [/] in Open Files" })
|
||||
end,
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue