changing to rose-pine
This commit is contained in:
@@ -1,9 +1,14 @@
|
||||
theme = "everforest-dark"
|
||||
# theme = "everforest-dark"
|
||||
theme = "rose-pine-moon"
|
||||
|
||||
font-size = 9
|
||||
font-size = 10
|
||||
font-family = "Maple Mono SemiBold"
|
||||
font-thicken = true
|
||||
|
||||
background-opacity = 0.85
|
||||
background = 000000
|
||||
# background-opacity = 1
|
||||
# background-blur = false
|
||||
confirm-close-surface = false
|
||||
window-padding-x = 6
|
||||
window-padding-y = 6
|
||||
@@ -12,4 +17,3 @@ mouse-hide-while-typing = true
|
||||
adjust-cell-height = 15%
|
||||
alpha-blending = linear-corrected
|
||||
bold-is-bright = true
|
||||
background-opacity = 1
|
||||
|
||||
+121
-31
@@ -5,17 +5,29 @@ end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
require("lazy").setup({
|
||||
spec = {
|
||||
{ "sainnhe/everforest",
|
||||
{ "rose-pine/neovim", name = "rose-pine",
|
||||
config = function()
|
||||
vim.g.everforest_enable_italic = true
|
||||
vim.g.everforest_transparent_background = 2
|
||||
vim.cmd.colorscheme('everforest')
|
||||
-- require("rose-pine").setup({
|
||||
-- highlight_groups = {
|
||||
-- CurSearch = { fg = "base", bg = "leaf", inherit = false },
|
||||
-- Search = { fg = "text", bg = "leaf", blend = 20, inherit = false },
|
||||
-- TelescopeNormal = { bg = "none" },
|
||||
-- TelescopeBorder = { fg = "highlight_high", bg = "none" },
|
||||
-- TelescopePromptNormal = { bg = "base" },
|
||||
-- TelescopeResultsNormal = { fg = "subtle", bg = "none" },
|
||||
-- TelescopeSelection = { fg = "text", bg = "base" },
|
||||
-- TelescopeSelectionCaret = { fg = "rose", bg = "rose" },
|
||||
-- },
|
||||
-- })
|
||||
vim.cmd.colorscheme("rose-pine-moon")
|
||||
end
|
||||
},
|
||||
{ "mbbill/undotree" },
|
||||
{ "echasnovski/mini.pairs", version = '*' },
|
||||
{ "ibhagwan/fzf-lua", dependencies = { "nvim-tree/nvim-web-devicons" } },
|
||||
{ 'nvim-telescope/telescope.nvim', dependencies = { 'nvim-lua/plenary.nvim' } },
|
||||
{ "saghen/blink.cmp", version = "v1.*", opts = {} },
|
||||
{ dir = "/home/andrew/personal/Projects/Lua/Polydev/", opts = {
|
||||
{ "DarthMooMancer/Polydev", opts = {
|
||||
terminal = {
|
||||
mode = "floating",
|
||||
}
|
||||
@@ -31,31 +43,6 @@ require("lazy").setup({
|
||||
}
|
||||
})
|
||||
|
||||
vim.g.mapleader = " "
|
||||
vim.opt.termguicolors = true
|
||||
vim.opt.number = true
|
||||
vim.opt.relativenumber = true
|
||||
vim.opt.wrap = false
|
||||
vim.opt.swapfile = false
|
||||
vim.opt.signcolumn = "yes"
|
||||
vim.opt.scrolloff = 8
|
||||
vim.opt.sidescrolloff = 8
|
||||
vim.opt.hlsearch = false
|
||||
vim.opt.completeopt = { "menuone", "noselect", "popup" }
|
||||
|
||||
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
|
||||
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
|
||||
vim.keymap.set("n", "<leader>ff", "ggVG=")
|
||||
vim.keymap.set("n", "<C-u>", "<C-u>zz")
|
||||
vim.keymap.set("n", "<C-d>", "<C-d>zz")
|
||||
vim.keymap.set('n', '<leader><leader>', ":FzfLua files<CR>")
|
||||
vim.keymap.set('n', '<leader>gh', ":FzfLua helptags<CR>")
|
||||
vim.keymap.set('n', '<leader>gg', ":FzfLua live_grep<CR>")
|
||||
vim.keymap.set('n', '<leader>xx', ":FzfLua diagnostics_workspace<CR>")
|
||||
vim.keymap.set('n', '<leader>po', ":PolydevOpen<CR>")
|
||||
vim.keymap.set('n', '<leader>gd', vim.lsp.buf.definition)
|
||||
vim.lsp.enable({ "lua_ls", "clangd" })
|
||||
|
||||
require('mini.pairs').setup()
|
||||
require("fzf-lua").setup({
|
||||
"border-fused",
|
||||
@@ -66,10 +53,73 @@ require("fzf-lua").setup({
|
||||
},
|
||||
},
|
||||
winopts = {
|
||||
height = 0.50, -- window height
|
||||
width = 0.45, -- window width
|
||||
row = 0.35, -- window row position (0=top, 1=bottom)
|
||||
col = 0.50, -- window col position (0=left, 1=right)
|
||||
border = "rounded",
|
||||
-- Backdrop opacity, 0 is fully opaque, 100 is fully transparent (i.e. disabled)
|
||||
backdrop = 0,
|
||||
-- title = "Title",
|
||||
-- title_pos = "center", -- 'left', 'center' or 'right'
|
||||
-- title_flags = false, -- uncomment to disable title flags
|
||||
fullscreen = false, -- start fullscreen?
|
||||
-- enable treesitter highlighting for the main fzf window will only have
|
||||
-- effect where grep like results are present, i.e. "file:line:col:text"
|
||||
-- due to highlight color collisions will also override `fzf_colors`
|
||||
-- set `fzf_colors=false` or `fzf_colors.hl=...` to override
|
||||
treesitter = {
|
||||
enabled = true,
|
||||
fzf_colors = { ["hl"] = "-1:reverse", ["hl+"] = "-1:reverse" }
|
||||
},
|
||||
preview = {
|
||||
wrap = true,
|
||||
-- default = 'bat', -- override the default previewer?
|
||||
-- default uses the 'builtin' previewer
|
||||
border = "rounded", -- preview border: accepts both `nvim_open_win`
|
||||
-- and fzf values (e.g. "border-top", "none")
|
||||
-- native fzf previewers (bat/cat/git/etc)
|
||||
-- can also be set to `fun(winopts, metadata)`
|
||||
wrap = false, -- preview line wrap (fzf's 'wrap|nowrap')
|
||||
hidden = true, -- start preview hidden
|
||||
vertical = "down:45%", -- up|down:size
|
||||
horizontal = "right:60%", -- right|left:size
|
||||
layout = "flex", -- horizontal|vertical|flex
|
||||
flip_columns = 100, -- #cols to switch to horizontal on flex
|
||||
-- Only used with the builtin previewer:
|
||||
title = true, -- preview border title (file/buf)?
|
||||
title_pos = "center", -- left|center|right, title alignment
|
||||
scrollbar = false, -- `false` or string:'float|border'
|
||||
-- float: in-window floating border
|
||||
-- border: in-border "block" marker
|
||||
scrolloff = -1, -- float scrollbar offset from right
|
||||
-- applies only when scrollbar = 'float'
|
||||
delay = 20, -- delay(ms) displaying the preview
|
||||
-- prevents lag on fast scrolling
|
||||
winopts = { -- builtin previewer window options
|
||||
number = true,
|
||||
relativenumber = false,
|
||||
cursorline = true,
|
||||
cursorlineopt = "both",
|
||||
cursorcolumn = false,
|
||||
signcolumn = "no",
|
||||
list = false,
|
||||
foldenable = false,
|
||||
foldmethod = "manual",
|
||||
},
|
||||
},
|
||||
on_create = function()
|
||||
-- called once upon creation of the fzf main window
|
||||
-- can be used to add custom fzf-lua mappings, e.g:
|
||||
-- vim.keymap.set("t", "<C-j>", "<Down>", { silent = true, buffer = true })
|
||||
end,
|
||||
-- called once _after_ the fzf interface is closed
|
||||
-- on_close = function() ... end
|
||||
},
|
||||
-- winopts = {
|
||||
-- preview = {
|
||||
-- wrap = true,
|
||||
-- },
|
||||
-- },
|
||||
grep = {
|
||||
rg_glob = true,
|
||||
rg_glob_fn = function(query)
|
||||
@@ -81,3 +131,43 @@ require("fzf-lua").setup({
|
||||
formatter = "path.filename_first",
|
||||
},
|
||||
})
|
||||
|
||||
vim.g.mapleader = " "
|
||||
vim.opt.termguicolors = true
|
||||
vim.opt.number = true
|
||||
vim.opt.relativenumber = true
|
||||
vim.opt.wrap = false
|
||||
vim.opt.swapfile = false
|
||||
vim.opt.signcolumn = "yes"
|
||||
vim.opt.scrolloff = 8
|
||||
vim.opt.sidescrolloff = 8
|
||||
vim.opt.hlsearch = false
|
||||
vim.opt.completeopt = { "menuone", "noselect", "popup" }
|
||||
vim.g.netrw_browse_split = 0
|
||||
vim.g.netrw_banner = 0
|
||||
vim.g.netrw_winsize = 25
|
||||
vim.lsp.enable({ "lua_ls", "clangd" })
|
||||
vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
|
||||
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
|
||||
vim.api.nvim_set_hl(0, "StatusLine", { bg = "none" })
|
||||
vim.api.nvim_set_hl(0, "StatusLineTerm", { bg = "none" })
|
||||
vim.api.nvim_set_hl(0, "StatusLineNC", { bg = "none" })
|
||||
-- vim.api.nvim_set_hl(0, "TabLine", { bg = "none" })
|
||||
-- vim.api.nvim_set_hl(0, "TabLineFill", { bg = "none" })
|
||||
-- vim.api.nvim_set_hl(0, "TabLineSel", { bg = "none" })
|
||||
|
||||
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
|
||||
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
|
||||
vim.keymap.set("n", "<leader>ff", "ggVG=")
|
||||
vim.keymap.set("n", "<C-u>", "<C-u>zz")
|
||||
vim.keymap.set("n", "<C-d>", "<C-d>zz")
|
||||
vim.keymap.set("x", "<leader>p", [["_dP]])
|
||||
vim.keymap.set('n', '<leader><leader>', ":FzfLua files<CR>")
|
||||
vim.keymap.set('n', '<leader>gh', ":FzfLua helptags<CR>")
|
||||
vim.keymap.set('n', '<leader>gg', ":FzfLua live_grep<CR>")
|
||||
vim.keymap.set('n', '<leader>xx', ":FzfLua diagnostics_workspace<CR>")
|
||||
vim.keymap.set('n', '<leader>po', ":PolydevOpen<CR>")
|
||||
vim.keymap.set('n', '<leader>gd', vim.lsp.buf.definition)
|
||||
vim.keymap.set("n", "<leader>gr", vim.lsp.buf.references)
|
||||
vim.keymap.set("n", "<leader>gR", vim.lsp.buf.rename)
|
||||
vim.keymap.set("n", "<leader>uu", ":UndotreeToggle<CR>")
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 11 MiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user