nvim changes
This commit is contained in:
+11
-66
@@ -5,29 +5,12 @@ end
|
|||||||
vim.opt.rtp:prepend(lazypath)
|
vim.opt.rtp:prepend(lazypath)
|
||||||
require("lazy").setup({
|
require("lazy").setup({
|
||||||
spec = {
|
spec = {
|
||||||
{ "rose-pine/neovim", name = "rose-pine",
|
{ "rose-pine/neovim", name = "rose-pine" },
|
||||||
config = function()
|
|
||||||
-- 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" },
|
{ "mbbill/undotree" },
|
||||||
{ "echasnovski/mini.pairs", version = '*' },
|
{ "echasnovski/mini.pairs", version = '*' },
|
||||||
{ "ibhagwan/fzf-lua", dependencies = { "nvim-tree/nvim-web-devicons" } },
|
{ "ibhagwan/fzf-lua", dependencies = { "nvim-tree/nvim-web-devicons" } },
|
||||||
{ 'nvim-telescope/telescope.nvim', dependencies = { 'nvim-lua/plenary.nvim' } },
|
|
||||||
{ "saghen/blink.cmp", version = "v1.*", opts = {} },
|
{ "saghen/blink.cmp", version = "v1.*", opts = {} },
|
||||||
{ "DarthMooMancer/Polydev", opts = {
|
{ dir = "~/personal/Projects/Lua/Polydev/", opts = {
|
||||||
terminal = {
|
terminal = {
|
||||||
mode = "floating",
|
mode = "floating",
|
||||||
}
|
}
|
||||||
@@ -43,13 +26,18 @@ require("lazy").setup({
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
require('mini.pairs').setup()
|
require('mini.pairs').setup({
|
||||||
|
mappings = {
|
||||||
|
['<'] = { action = 'open', pair = '<>', neigh_pattern = '[^\\].' },
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
require("fzf-lua").setup({
|
require("fzf-lua").setup({
|
||||||
"border-fused",
|
"border-fused",
|
||||||
fzf_opts = { ["--wrap"] = true },
|
-- fzf_opts = { ["--wrap"] = true },
|
||||||
previewers = {
|
previewers = {
|
||||||
builtin = {
|
builtin = {
|
||||||
syntax_limit_b = -102400, -- 100KB limit on highlighting files
|
syntax_limit_b = -51200, -- 50KB limit on highlighting files
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
winopts = {
|
winopts = {
|
||||||
@@ -58,68 +46,27 @@ require("fzf-lua").setup({
|
|||||||
row = 0.35, -- window row position (0=top, 1=bottom)
|
row = 0.35, -- window row position (0=top, 1=bottom)
|
||||||
col = 0.50, -- window col position (0=left, 1=right)
|
col = 0.50, -- window col position (0=left, 1=right)
|
||||||
border = "rounded",
|
border = "rounded",
|
||||||
-- Backdrop opacity, 0 is fully opaque, 100 is fully transparent (i.e. disabled)
|
|
||||||
backdrop = 0,
|
backdrop = 0,
|
||||||
-- title = "Title",
|
|
||||||
-- title_pos = "center", -- 'left', 'center' or 'right'
|
|
||||||
-- title_flags = false, -- uncomment to disable title flags
|
|
||||||
fullscreen = false, -- start fullscreen?
|
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 = {
|
treesitter = {
|
||||||
enabled = true,
|
enabled = true,
|
||||||
fzf_colors = { ["hl"] = "-1:reverse", ["hl+"] = "-1:reverse" }
|
fzf_colors = { ["hl"] = "-1:reverse", ["hl+"] = "-1:reverse" }
|
||||||
},
|
},
|
||||||
preview = {
|
preview = {
|
||||||
-- default = 'bat', -- override the default previewer?
|
|
||||||
-- default uses the 'builtin' previewer
|
|
||||||
border = "rounded", -- preview border: accepts both `nvim_open_win`
|
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')
|
wrap = false, -- preview line wrap (fzf's 'wrap|nowrap')
|
||||||
hidden = true, -- start preview hidden
|
hidden = true, -- start preview hidden
|
||||||
vertical = "down:45%", -- up|down:size
|
vertical = "down:45%", -- up|down:size
|
||||||
horizontal = "right:60%", -- right|left:size
|
horizontal = "right:60%", -- right|left:size
|
||||||
layout = "flex", -- horizontal|vertical|flex
|
layout = "flex", -- horizontal|vertical|flex
|
||||||
flip_columns = 100, -- #cols to switch to horizontal on 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 = true, -- preview border title (file/buf)?
|
||||||
title_pos = "center", -- left|center|right, title alignment
|
title_pos = "center", -- left|center|right, title alignment
|
||||||
scrollbar = false, -- `false` or string:'float|border'
|
scrollbar = false, -- `false` or string:'float|border'
|
||||||
-- float: in-window floating border
|
|
||||||
-- border: in-border "block" marker
|
|
||||||
scrolloff = -1, -- float scrollbar offset from right
|
scrolloff = -1, -- float scrollbar offset from right
|
||||||
-- applies only when scrollbar = 'float'
|
|
||||||
delay = 20, -- delay(ms) displaying the preview
|
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 = {
|
grep = {
|
||||||
rg_glob = true,
|
rg_glob = true,
|
||||||
rg_glob_fn = function(query)
|
rg_glob_fn = function(query)
|
||||||
@@ -146,15 +93,13 @@ vim.opt.completeopt = { "menuone", "noselect", "popup" }
|
|||||||
vim.g.netrw_browse_split = 0
|
vim.g.netrw_browse_split = 0
|
||||||
vim.g.netrw_banner = 0
|
vim.g.netrw_banner = 0
|
||||||
vim.g.netrw_winsize = 25
|
vim.g.netrw_winsize = 25
|
||||||
|
vim.cmd.colorscheme("rose-pine-moon")
|
||||||
vim.lsp.enable({ "lua_ls", "clangd" })
|
vim.lsp.enable({ "lua_ls", "clangd" })
|
||||||
vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
|
vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
|
||||||
vim.api.nvim_set_hl(0, "NormalFloat", { 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, "StatusLine", { bg = "none" })
|
||||||
vim.api.nvim_set_hl(0, "StatusLineTerm", { 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, "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", "J", ":m '>+1<CR>gv=gv")
|
||||||
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
|
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ for_window [app_id="librewolf"] move container to workspace 2
|
|||||||
for_window [class="steam"] move container to workspace 3
|
for_window [class="steam"] move container to workspace 3
|
||||||
for_window [app_id="org.prismlauncher.PrismLauncher"] move container to workspace 3
|
for_window [app_id="org.prismlauncher.PrismLauncher"] move container to workspace 3
|
||||||
for_window [class="Gimp"] move container to workspace 4
|
for_window [class="Gimp"] move container to workspace 4
|
||||||
for_window [instance="SFML_game_engine"] floating enable
|
for_window [instance="engine"] floating enable
|
||||||
|
|
||||||
font pango: Maple Mono SemiBold 10
|
font pango: Maple Mono SemiBold 10
|
||||||
default_border pixel 0
|
default_border pixel 0
|
||||||
|
|||||||
Reference in New Issue
Block a user