From e443755f7b08c16812dcb00589502b92be8d49ca Mon Sep 17 00:00:00 2001 From: DarthMooMancer Date: Tue, 4 Nov 2025 21:57:24 -0500 Subject: [PATCH] nvim changes --- .config/nvim/init.lua | 77 +++++++------------------------------------ .config/sway/config | 2 +- 2 files changed, 12 insertions(+), 67 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 3a07fd9..a71ed87 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -5,29 +5,12 @@ end vim.opt.rtp:prepend(lazypath) require("lazy").setup({ spec = { - { "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 - }, + { "rose-pine/neovim", name = "rose-pine" }, { "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 = {} }, - { "DarthMooMancer/Polydev", opts = { + { dir = "~/personal/Projects/Lua/Polydev/", opts = { terminal = { 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({ "border-fused", - fzf_opts = { ["--wrap"] = true }, + -- fzf_opts = { ["--wrap"] = true }, previewers = { builtin = { - syntax_limit_b = -102400, -- 100KB limit on highlighting files + syntax_limit_b = -51200, -- 50KB limit on highlighting files }, }, winopts = { @@ -58,68 +46,27 @@ require("fzf-lua").setup({ 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 = { - -- 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", "", "", { 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) @@ -146,15 +93,13 @@ vim.opt.completeopt = { "menuone", "noselect", "popup" } vim.g.netrw_browse_split = 0 vim.g.netrw_banner = 0 vim.g.netrw_winsize = 25 +vim.cmd.colorscheme("rose-pine-moon") 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 '>+1gv=gv") vim.keymap.set("v", "K", ":m '<-2gv=gv") diff --git a/.config/sway/config b/.config/sway/config index 1489b38..0e93203 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -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 [app_id="org.prismlauncher.PrismLauncher"] move container to workspace 3 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 default_border pixel 0