AutoYADM commit: 2024-12-16 17:05:04
This commit is contained in:
parent
2ac36c4c0d
commit
261d8f3536
9 changed files with 4 additions and 905 deletions
|
|
@ -11,12 +11,10 @@
|
|||
"conform.nvim": { "branch": "master", "commit": "f4e8837878fc5712d053ba3091a73d27d96a09e2" },
|
||||
"copilot.lua": { "branch": "master", "commit": "d3783b9283a7c35940ed8d71549030d5f5f9f980" },
|
||||
"crates.nvim": { "branch": "main", "commit": "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785" },
|
||||
"dashboard-nvim": { "branch": "master", "commit": "ae309606940d26d8c9df8b048a6e136b6bbec478" },
|
||||
"dial.nvim": { "branch": "master", "commit": "46b4375e84e8eb771129bff6b2b1e47746601ef9" },
|
||||
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
||||
"flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
|
||||
"fzf-lua": { "branch": "main", "commit": "86faa5a23e7158c2f49941591c0889c3746389da" },
|
||||
"fzf-lua": { "branch": "main", "commit": "304253e4c637fd5fc92cbc50707993130615808a" },
|
||||
"git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
|
||||
"grug-far.nvim": { "branch": "main", "commit": "11d0fbd6fff6f4e394af95319deeaab4ef88ce97" },
|
||||
"image.nvim": { "branch": "master", "commit": "5f8fceca2d1be96a45b81de21c2f98bf6084fb34" },
|
||||
|
|
@ -41,7 +39,6 @@
|
|||
"mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
|
||||
"mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
|
||||
"minimap.vim": { "branch": "master", "commit": "395378137e6180762d5b963ca9ad5ac2db5d3283" },
|
||||
"neogit": { "branch": "master", "commit": "6691c4efcd8dad313e344c49057f05db7d91fd25" },
|
||||
"neotest": { "branch": "master", "commit": "6d3d22cdad49999ef774ebe1bc250a4994038964" },
|
||||
"neotest-golang": { "branch": "main", "commit": "3565f317eab2dbfdd1e208e1fa6b25834121b8f7" },
|
||||
"neotest-python": { "branch": "master", "commit": "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e" },
|
||||
|
|
@ -77,7 +74,7 @@
|
|||
"presence.nvim": { "branch": "main", "commit": "df0a0b52cd0799e99d1b76805d1357ae9c0d017d" },
|
||||
"refactoring.nvim": { "branch": "master", "commit": "2db6d378e873de31d18ade549c2edba64ff1c2e3" },
|
||||
"rustaceanvim": { "branch": "master", "commit": "25aab238aad3e58f864274449456bdc339981750" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "b006f50278e0c6e47d5f02a3295ea699d7120aea" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "bb5754738a3126b5f18c53e9d23a9a1bf57391c3" },
|
||||
"speedtyper.nvim": { "branch": "v2", "commit": "f27fa7870dd35f1884efaef1c9f1d2e7dcedcacf" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
|
||||
"text-case.nvim": { "branch": "main", "commit": "e898cfd46fa6cde0e83abb624a16e67d2ffc6457" },
|
||||
|
|
@ -86,7 +83,6 @@
|
|||
"trailblazer.nvim": { "branch": "main", "commit": "674bb6254a376a234d0d243366224122fc064eab" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
|
||||
"ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" },
|
||||
"twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
|
||||
"venv-selector.nvim": { "branch": "regexp", "commit": "e82594274bf7b54387f9a2abe65f74909ac66e97" },
|
||||
"vim-dadbod": { "branch": "master", "commit": "f740950d0703099e0f172016f10e0e39f50fd0ba" },
|
||||
"vim-dadbod-completion": { "branch": "master", "commit": "04485bfb53a629423233a4178d71cd4f8abf7406" },
|
||||
|
|
|
|||
|
|
@ -1,103 +0,0 @@
|
|||
local dev = false
|
||||
-- local theme = "darkvoid"
|
||||
local theme = "kanagawa-dragon"
|
||||
|
||||
-- #0f0f0f
|
||||
-- #933737
|
||||
-- #A23D3D
|
||||
-- #994848
|
||||
-- #7B7F80
|
||||
-- #7C8080
|
||||
-- #8D8D8D
|
||||
-- #d4d4d4
|
||||
-- #949494
|
||||
-- #933737
|
||||
-- #A23D3D
|
||||
-- #994848
|
||||
-- #7B7F80
|
||||
-- #7C8080
|
||||
-- #8D8D8D
|
||||
-- #d4d4d4
|
||||
return {
|
||||
-- { "rebelot/kanagawa.nvim" },
|
||||
{
|
||||
"aliqyan-21/darkvoid.nvim",
|
||||
-- dir = dev and "~/dev/darkvoid.nvim" or false,
|
||||
opts = {
|
||||
glow = false,
|
||||
-- colors = {
|
||||
-- fg = "#c0c0c0",
|
||||
-- bg = "#1c1c1c",
|
||||
-- -- bg = "#000000",
|
||||
-- cursor = "#bdfe58",
|
||||
-- line_nr = "#404040",
|
||||
-- visual = "#303030",
|
||||
-- comment = "#585858",
|
||||
-- string = "#d1d1d1",
|
||||
-- func = "#e1e1e1",
|
||||
-- kw = "#f1f1f1",
|
||||
-- identifier = "#b1b1b1",
|
||||
-- type = "#a1a1a1",
|
||||
-- type_builtin = "#c5c5c5", -- current
|
||||
-- -- type_builtin = "#8cf8f7", -- glowy blue old (was present by default before type_builtin was introduced added here for people who may like it)
|
||||
-- search_highlight = "#1bfd9c",
|
||||
-- operator = "#1bfd9c",
|
||||
-- bracket = "#e6e6e6",
|
||||
-- preprocessor = "#4b8902",
|
||||
-- bool = "#66b2b2",
|
||||
-- constant = "#b2d8d8",
|
||||
-- -- special = "#8cf8f7",
|
||||
--
|
||||
-- -- enable or disable specific plugin highlights
|
||||
-- plugins = {
|
||||
-- gitsigns = true,
|
||||
-- nvim_cmp = true,
|
||||
-- treesitter = true,
|
||||
-- nvimtree = true,
|
||||
-- telescope = true,
|
||||
-- lualine = true,
|
||||
-- bufferline = true,
|
||||
-- oil = true,
|
||||
-- whichkey = true,
|
||||
-- nvim_notify = true,
|
||||
-- -- leap = true,
|
||||
-- },
|
||||
--
|
||||
-- -- gitsigns colors
|
||||
-- added = "#baffc9",
|
||||
-- changed = "#ffffba",
|
||||
-- removed = "#ffb3ba",
|
||||
--
|
||||
-- -- Pmenu colors
|
||||
-- pmenu_bg = "#1c1c1c",
|
||||
-- pmenu_sel_bg = "#1bfd9c",
|
||||
-- pmenu_fg = "#c0c0c0",
|
||||
--
|
||||
-- -- EndOfBuffer color
|
||||
-- eob = "#3c3c3c",
|
||||
--
|
||||
-- -- Telescope specific colors
|
||||
-- border = "#585858",
|
||||
-- title = "#bdfe58",
|
||||
--
|
||||
-- -- bufferline specific colors
|
||||
-- bufferline_selection = "#1bfd9c",
|
||||
--
|
||||
-- -- LSP diagnostics colors
|
||||
-- error = "#dea6a0",
|
||||
-- warning = "#d6efd8",
|
||||
-- hint = "#bedc74",
|
||||
-- info = "#7fa1c3",
|
||||
-- },
|
||||
},
|
||||
},
|
||||
{
|
||||
"LazyVim/LazyVim",
|
||||
opts = {
|
||||
-- colorscheme = theme,
|
||||
colorscheme = function()
|
||||
return { require("darkvoid").load() }
|
||||
end,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
@ -1,95 +0,0 @@
|
|||
return {
|
||||
"nvimdev/dashboard-nvim",
|
||||
enabled = false,
|
||||
lazy = false, -- As https://github.com/nvimdev/dashboard-nvim/pull/450, dashboard-nvim shouldn't be lazy-loaded to properly handle stdin.
|
||||
opts = function()
|
||||
local saturn = [[
|
||||
_.oo.
|
||||
_.u[[/;:,. .odMMMMMM'
|
||||
.o888UU[[[/;:-. .o@P^ MMM^
|
||||
oN88888UU[[[/;::-. dP^
|
||||
dNMMNN888UU[[[/;:--. .o@P^
|
||||
,MMMMMMN888UU[[/;::-. o@^
|
||||
NNMMMNN888UU[[[/~.o@P^
|
||||
888888888UU[[[/o@^-..
|
||||
oI8888UU[[[/o@P^:--..
|
||||
.@^ YUU[[[/o@^;::---..
|
||||
oMP ^/o@P^;:::---..
|
||||
.dMMM .o@^ ^;::---...
|
||||
dMMMMMMM@^` `^^^^
|
||||
YMMMUP^
|
||||
^^
|
||||
]]
|
||||
|
||||
-- logo = string.rep("\n", 8) .. logo .. "\n\n"
|
||||
saturn = string.rep("\n", 8) .. saturn .. "\n\n"
|
||||
|
||||
local function loadObsidian()
|
||||
-- require("lazy").setup(require("plugins.obsidian"))
|
||||
require("obsidian")
|
||||
-- vim.api.nvim_input("<cmd>ObsidianWorkspace<cr>")
|
||||
vim.api.nvim_input("<cmd>ObsidianTags<cr>")
|
||||
end
|
||||
local function openConfig()
|
||||
local dir = "~/.config/nvim/"
|
||||
vim.api.nvim_set_current_dir(dir)
|
||||
vim.cmd("edit" .. dir)
|
||||
end
|
||||
|
||||
local opts = {
|
||||
theme = "doom",
|
||||
hide = {
|
||||
-- this is taken care of by lualine
|
||||
-- enabling this messes up the actual laststatus setting after loading a file
|
||||
statusline = false,
|
||||
},
|
||||
config = {
|
||||
-- header = vim.split(logo, "\n"),
|
||||
header = vim.split(saturn, "\n"),
|
||||
-- stylua: ignore
|
||||
center = {
|
||||
-- { action = function() vim.cmd("edit " .. "~/second-brain/00-index/00-index.md") end, desc = " Open Obsidian Vault", icon = " ", key = "o" },
|
||||
-- { action = 'lua LazyVim.pick()()', desc = " Find File", icon = " ", key = "f" },
|
||||
-- { action = loadObsidian, desc = " Obsidian Tags", icon = " ", key = "o" },
|
||||
{ action = "ene | startinsert", desc = " New File", icon = " ", key = "n" },
|
||||
{ action = function () vim.api.nvim_input("<CMD>ObsidianQuickSwitch<CR>") end, desc = " Obsidian", icon = " ", key = "o"},
|
||||
{ action = 'lua LazyVim.pick("oldfiles")()', desc = " Recent Files", icon = " ", key = "r" },
|
||||
-- { action = 'lua LazyVim.pick("live_grep")()', desc = " Grep", icon = " ", key = "/" },
|
||||
-- { action = function() LazyVim.lazygit( { cwd = LazyVim.root.git() }) end, desc = " Git", icon = " ", key = "g" },
|
||||
{ action = 'lua LazyVim.pick.config_files()()', desc = " Search Config", icon = " ", key = "c" },
|
||||
-- { action = openConfig, desc = " Open Config", icon = " ", key = "c" },
|
||||
{ action = 'lua require("persistence").load()', desc = " Restore Session", icon = " ", key = "s" },
|
||||
-- { action = 'lua require("persistence").select()', desc = " Select Session", icon = " ", key = "S" },
|
||||
-- { action = "LazyExtras", desc = " Lazy Extras", icon = " ", key = "x" },
|
||||
-- { action = "Lazy", desc = " Lazy", icon = " ", key = "l" },
|
||||
{ action = function() vim.api.nvim_input("<cmd>qa<cr>") end, desc = " Quit", icon = " ", key = "q" },
|
||||
},
|
||||
footer = function()
|
||||
local stats = require("lazy").stats()
|
||||
local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100)
|
||||
return { "⚡ Neovim loaded " .. stats.loaded .. "/" .. stats.count .. " plugins in " .. ms .. "ms" }
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
||||
for _, button in ipairs(opts.config.center) do
|
||||
button.desc = button.desc .. string.rep(" ", 43 - #button.desc)
|
||||
button.key_format = " %s"
|
||||
end
|
||||
|
||||
-- open dashboard after closing lazy
|
||||
if vim.o.filetype == "lazy" then
|
||||
vim.api.nvim_create_autocmd("WinClosed", {
|
||||
pattern = tostring(vim.api.nvim_get_current_win()),
|
||||
once = true,
|
||||
callback = function()
|
||||
vim.schedule(function()
|
||||
vim.api.nvim_exec_autocmds("UIEnter", { group = "dashboard" })
|
||||
end)
|
||||
end,
|
||||
})
|
||||
end
|
||||
|
||||
return opts
|
||||
end,
|
||||
}
|
||||
|
|
@ -1,193 +0,0 @@
|
|||
-- since this is just an example spec, don't actually load anything here and return an empty spec
|
||||
-- stylua: ignore
|
||||
if true then return {} end
|
||||
|
||||
-- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim
|
||||
--
|
||||
-- In your plugin files, you can:
|
||||
-- * add extra plugins
|
||||
-- * disable/enabled LazyVim plugins
|
||||
-- * override the configuration of LazyVim plugins
|
||||
return {
|
||||
-- add gruvbox
|
||||
{ "ellisonleao/gruvbox.nvim" },
|
||||
|
||||
-- Configure LazyVim to load gruvbox
|
||||
{
|
||||
"LazyVim/LazyVim",
|
||||
opts = {
|
||||
colorscheme = "gruvbox",
|
||||
},
|
||||
},
|
||||
|
||||
-- change trouble config
|
||||
{
|
||||
"folke/trouble.nvim",
|
||||
-- opts will be merged with the parent spec
|
||||
opts = { use_diagnostic_signs = true },
|
||||
},
|
||||
|
||||
-- disable trouble
|
||||
{ "folke/trouble.nvim", enabled = false },
|
||||
|
||||
-- override nvim-cmp and add cmp-emoji
|
||||
{
|
||||
"hrsh7th/nvim-cmp",
|
||||
dependencies = { "hrsh7th/cmp-emoji" },
|
||||
---@param opts cmp.ConfigSchema
|
||||
opts = function(_, opts)
|
||||
table.insert(opts.sources, { name = "emoji" })
|
||||
end,
|
||||
},
|
||||
|
||||
-- change some telescope options and a keymap to browse plugin files
|
||||
{
|
||||
"nvim-telescope/telescope.nvim",
|
||||
keys = {
|
||||
-- add a keymap to browse plugin files
|
||||
-- stylua: ignore
|
||||
{
|
||||
"<leader>fp",
|
||||
function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end,
|
||||
desc = "Find Plugin File",
|
||||
},
|
||||
},
|
||||
-- change some options
|
||||
opts = {
|
||||
defaults = {
|
||||
layout_strategy = "horizontal",
|
||||
layout_config = { prompt_position = "top" },
|
||||
sorting_strategy = "ascending",
|
||||
winblend = 0,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
-- add pyright to lspconfig
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
---@class PluginLspOpts
|
||||
opts = {
|
||||
---@type lspconfig.options
|
||||
servers = {
|
||||
-- pyright will be automatically installed with mason and loaded with lspconfig
|
||||
pyright = {},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
-- add tsserver and setup with typescript.nvim instead of lspconfig
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
dependencies = {
|
||||
"jose-elias-alvarez/typescript.nvim",
|
||||
init = function()
|
||||
require("lazyvim.util").lsp.on_attach(function(_, buffer)
|
||||
-- stylua: ignore
|
||||
vim.keymap.set( "n", "<leader>co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" })
|
||||
vim.keymap.set("n", "<leader>cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer })
|
||||
end)
|
||||
end,
|
||||
},
|
||||
---@class PluginLspOpts
|
||||
opts = {
|
||||
---@type lspconfig.options
|
||||
servers = {
|
||||
-- tsserver will be automatically installed with mason and loaded with lspconfig
|
||||
tsserver = {},
|
||||
},
|
||||
-- you can do any additional lsp server setup here
|
||||
-- return true if you don't want this server to be setup with lspconfig
|
||||
---@type table<string, fun(server:string, opts:_.lspconfig.options):boolean?>
|
||||
setup = {
|
||||
-- example to setup with typescript.nvim
|
||||
tsserver = function(_, opts)
|
||||
require("typescript").setup({ server = opts })
|
||||
return true
|
||||
end,
|
||||
-- Specify * to use this function as a fallback for any server
|
||||
-- ["*"] = function(server, opts) end,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
-- for typescript, LazyVim also includes extra specs to properly setup lspconfig,
|
||||
-- treesitter, mason and typescript.nvim. So instead of the above, you can use:
|
||||
{ import = "lazyvim.plugins.extras.lang.typescript" },
|
||||
|
||||
-- add more treesitter parsers
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
opts = {
|
||||
ensure_installed = {
|
||||
"bash",
|
||||
"html",
|
||||
"javascript",
|
||||
"json",
|
||||
"lua",
|
||||
"markdown",
|
||||
"markdown_inline",
|
||||
"python",
|
||||
"query",
|
||||
"regex",
|
||||
"tsx",
|
||||
"typescript",
|
||||
"vim",
|
||||
"yaml",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
-- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above
|
||||
-- would overwrite `ensure_installed` with the new value.
|
||||
-- If you'd rather extend the default config, use the code below instead:
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
opts = function(_, opts)
|
||||
-- add tsx and treesitter
|
||||
vim.list_extend(opts.ensure_installed, {
|
||||
"tsx",
|
||||
"typescript",
|
||||
})
|
||||
end,
|
||||
},
|
||||
|
||||
-- the opts function can also be used to change the default opts:
|
||||
{
|
||||
"nvim-lualine/lualine.nvim",
|
||||
event = "VeryLazy",
|
||||
opts = function(_, opts)
|
||||
table.insert(opts.sections.lualine_x, "😄")
|
||||
end,
|
||||
},
|
||||
|
||||
-- or you can return new options to override all the defaults
|
||||
{
|
||||
"nvim-lualine/lualine.nvim",
|
||||
event = "VeryLazy",
|
||||
opts = function()
|
||||
return {
|
||||
--[[add your custom lualine config here]]
|
||||
}
|
||||
end,
|
||||
},
|
||||
|
||||
-- use mini.starter instead of alpha
|
||||
{ import = "lazyvim.plugins.extras.ui.mini-starter" },
|
||||
|
||||
-- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc
|
||||
{ import = "lazyvim.plugins.extras.lang.json" },
|
||||
|
||||
-- add any tools you want to have installed below
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
opts = {
|
||||
ensure_installed = {
|
||||
"stylua",
|
||||
"shellcheck",
|
||||
"shfmt",
|
||||
"flake8",
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
@ -1,359 +0,0 @@
|
|||
return {
|
||||
"NeogitOrg/neogit",
|
||||
enabled = true,
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim", -- required
|
||||
"sindrets/diffview.nvim", -- optional - Diff integration
|
||||
"nvim-telescope/telescope.nvim", -- optional
|
||||
},
|
||||
keys = {
|
||||
{
|
||||
"<leader>gn",
|
||||
function()
|
||||
require("neogit").open()
|
||||
end,
|
||||
{
|
||||
desc = "Open Neogit",
|
||||
},
|
||||
},
|
||||
},
|
||||
opts = {
|
||||
-- Hides the hints at the top of the status buffer
|
||||
disable_hint = false,
|
||||
-- Disables changing the buffer highlights based on where the cursor is.
|
||||
disable_context_highlighting = false,
|
||||
-- Disables signs for sections/items/hunks
|
||||
disable_signs = false,
|
||||
-- Changes what mode the Commit Editor starts in. `true` will leave nvim in normal mode, `false` will change nvim to
|
||||
-- insert mode, and `"auto"` will change nvim to insert mode IF the commit message is empty, otherwise leaving it in
|
||||
-- normal mode.
|
||||
disable_insert_on_commit = "auto",
|
||||
-- When enabled, will watch the `.git/` directory for changes and refresh the status buffer in response to filesystem
|
||||
-- events.
|
||||
filewatcher = {
|
||||
interval = 1000,
|
||||
enabled = true,
|
||||
},
|
||||
-- "ascii" is the graph the git CLI generates
|
||||
-- "unicode" is the graph like https://github.com/rbong/vim-flog
|
||||
-- "kitty" is the graph like https://github.com/isakbm/gitgraph.nvim - use https://github.com/rbong/flog-symbols if you don't use Kitty
|
||||
graph_style = "kitty",
|
||||
-- Show relative date by default. When set, use `strftime` to display dates
|
||||
commit_date_format = nil,
|
||||
log_date_format = nil,
|
||||
-- Used to generate URL's for branch popup action "pull request".
|
||||
git_services = {
|
||||
["github.com"] = "https://github.com/${owner}/${repository}/compare/${branch_name}?expand=1",
|
||||
["bitbucket.org"] = "https://bitbucket.org/${owner}/${repository}/pull-requests/new?source=${branch_name}&t=1",
|
||||
["gitlab.com"] = "https://gitlab.com/${owner}/${repository}/merge_requests/new?merge_request[source_branch]=${branch_name}",
|
||||
["azure.com"] = "https://dev.azure.com/${owner}/_git/${repository}/pullrequestcreate?sourceRef=${branch_name}&targetRef=${target}",
|
||||
},
|
||||
-- Allows a different telescope sorter. Defaults to 'fuzzy_with_index_bias'. The example below will use the native fzf
|
||||
-- sorter instead. By default, this function returns `nil`.
|
||||
telescope_sorter = function()
|
||||
return require("telescope").extensions.fzf.native_fzf_sorter()
|
||||
end,
|
||||
-- Persist the values of switches/options within and across sessions
|
||||
remember_settings = true,
|
||||
-- Scope persisted settings on a per-project basis
|
||||
use_per_project_settings = true,
|
||||
-- Table of settings to never persist. Uses format "Filetype--cli-value"
|
||||
ignored_settings = {
|
||||
"NeogitPushPopup--force-with-lease",
|
||||
"NeogitPushPopup--force",
|
||||
"NeogitPullPopup--rebase",
|
||||
"NeogitCommitPopup--allow-empty",
|
||||
"NeogitRevertPopup--no-edit",
|
||||
},
|
||||
-- Configure highlight group features
|
||||
highlight = {
|
||||
italic = true,
|
||||
bold = true,
|
||||
underline = true,
|
||||
},
|
||||
-- Set to false if you want to be responsible for creating _ALL_ keymappings
|
||||
use_default_keymaps = true,
|
||||
-- Neogit refreshes its internal state after specific events, which can be expensive depending on the repository size.
|
||||
-- Disabling `auto_refresh` will make it so you have to manually refresh the status after you open it.
|
||||
auto_refresh = true,
|
||||
-- Value used for `--sort` option for `git branch` command
|
||||
-- By default, branches will be sorted by commit date descending
|
||||
-- Flag description: https://git-scm.com/docs/git-branch#Documentation/git-branch.txt---sortltkeygt
|
||||
-- Sorting keys: https://git-scm.com/docs/git-for-each-ref#_options
|
||||
sort_branches = "-committerdate",
|
||||
-- Default for new branch name prompts
|
||||
initial_branch_name = "",
|
||||
-- Change the default way of opening neogit
|
||||
kind = "tab",
|
||||
-- Disable line numbers
|
||||
disable_line_numbers = true,
|
||||
-- Disable relative line numbers
|
||||
disable_relative_line_numbers = true,
|
||||
-- The time after which an output console is shown for slow running commands
|
||||
console_timeout = 2000,
|
||||
-- Automatically show console if a command takes more than console_timeout milliseconds
|
||||
auto_show_console = true,
|
||||
-- Automatically close the console if the process exits with a 0 (success) status
|
||||
auto_close_console = true,
|
||||
notification_icon = "",
|
||||
status = {
|
||||
show_head_commit_hash = true,
|
||||
recent_commit_count = 10,
|
||||
HEAD_padding = 10,
|
||||
HEAD_folded = false,
|
||||
mode_padding = 3,
|
||||
mode_text = {
|
||||
M = "modified",
|
||||
N = "new file",
|
||||
A = "added",
|
||||
D = "deleted",
|
||||
C = "copied",
|
||||
U = "updated",
|
||||
R = "renamed",
|
||||
DD = "unmerged",
|
||||
AU = "unmerged",
|
||||
UD = "unmerged",
|
||||
UA = "unmerged",
|
||||
DU = "unmerged",
|
||||
AA = "unmerged",
|
||||
UU = "unmerged",
|
||||
["?"] = "",
|
||||
},
|
||||
},
|
||||
commit_editor = {
|
||||
kind = "tab",
|
||||
show_staged_diff = true,
|
||||
-- Accepted values:
|
||||
-- "split" to show the staged diff below the commit editor
|
||||
-- "vsplit" to show it to the right
|
||||
-- "split_above" Like :top split
|
||||
-- "vsplit_left" like :vsplit, but open to the left
|
||||
-- "auto" "vsplit" if window would have 80 cols, otherwise "split"
|
||||
staged_diff_split_kind = "split",
|
||||
spell_check = true,
|
||||
},
|
||||
commit_select_view = {
|
||||
kind = "tab",
|
||||
},
|
||||
commit_view = {
|
||||
kind = "vsplit",
|
||||
verify_commit = vim.fn.executable("gpg") == 1, -- Can be set to true or false, otherwise we try to find the binary
|
||||
},
|
||||
log_view = {
|
||||
kind = "tab",
|
||||
},
|
||||
rebase_editor = {
|
||||
kind = "auto",
|
||||
},
|
||||
reflog_view = {
|
||||
kind = "tab",
|
||||
},
|
||||
merge_editor = {
|
||||
kind = "auto",
|
||||
},
|
||||
description_editor = {
|
||||
kind = "auto",
|
||||
},
|
||||
tag_editor = {
|
||||
kind = "auto",
|
||||
},
|
||||
preview_buffer = {
|
||||
kind = "floating_console",
|
||||
},
|
||||
popup = {
|
||||
kind = "split",
|
||||
},
|
||||
stash = {
|
||||
kind = "tab",
|
||||
},
|
||||
refs_view = {
|
||||
kind = "tab",
|
||||
},
|
||||
signs = {
|
||||
-- { CLOSED, OPENED }
|
||||
hunk = { "", "" },
|
||||
item = { ">", "v" },
|
||||
section = { ">", "v" },
|
||||
},
|
||||
-- Each Integration is auto-detected through plugin presence, however, it can be disabled by setting to `false`
|
||||
integrations = {
|
||||
-- If enabled, use telescope for menu selection rather than vim.ui.select.
|
||||
-- Allows multi-select and some things that vim.ui.select doesn't.
|
||||
telescope = nil,
|
||||
-- Neogit only provides inline diffs. If you want a more traditional way to look at diffs, you can use `diffview`.
|
||||
-- The diffview integration enables the diff popup.
|
||||
--
|
||||
-- Requires you to have `sindrets/diffview.nvim` installed.
|
||||
diffview = nil,
|
||||
|
||||
-- If enabled, uses fzf-lua for menu selection. If the telescope integration
|
||||
-- is also selected then telescope is used instead
|
||||
-- Requires you to have `ibhagwan/fzf-lua` installed.
|
||||
fzf_lua = nil,
|
||||
|
||||
-- If enabled, uses mini.pick for menu selection. If the telescope integration
|
||||
-- is also selected then telescope is used instead
|
||||
-- Requires you to have `echasnovski/mini.pick` installed.
|
||||
mini_pick = nil,
|
||||
},
|
||||
sections = {
|
||||
-- Reverting/Cherry Picking
|
||||
sequencer = {
|
||||
folded = false,
|
||||
hidden = false,
|
||||
},
|
||||
untracked = {
|
||||
folded = false,
|
||||
hidden = false,
|
||||
},
|
||||
unstaged = {
|
||||
folded = false,
|
||||
hidden = false,
|
||||
},
|
||||
staged = {
|
||||
folded = false,
|
||||
hidden = false,
|
||||
},
|
||||
stashes = {
|
||||
folded = true,
|
||||
hidden = false,
|
||||
},
|
||||
unpulled_upstream = {
|
||||
folded = true,
|
||||
hidden = false,
|
||||
},
|
||||
unmerged_upstream = {
|
||||
folded = false,
|
||||
hidden = false,
|
||||
},
|
||||
unpulled_pushRemote = {
|
||||
folded = true,
|
||||
hidden = false,
|
||||
},
|
||||
unmerged_pushRemote = {
|
||||
folded = false,
|
||||
hidden = false,
|
||||
},
|
||||
recent = {
|
||||
folded = true,
|
||||
hidden = false,
|
||||
},
|
||||
rebase = {
|
||||
folded = true,
|
||||
hidden = false,
|
||||
},
|
||||
},
|
||||
mappings = {
|
||||
commit_editor = {
|
||||
["q"] = "Close",
|
||||
["<c-c><c-c>"] = "Submit",
|
||||
["<c-c><c-k>"] = "Abort",
|
||||
["<m-p>"] = "PrevMessage",
|
||||
["<m-n>"] = "NextMessage",
|
||||
["<m-r>"] = "ResetMessage",
|
||||
},
|
||||
commit_editor_I = {
|
||||
["<c-c><c-c>"] = "Submit",
|
||||
["<c-c><c-k>"] = "Abort",
|
||||
},
|
||||
rebase_editor = {
|
||||
["p"] = "Pick",
|
||||
["r"] = "Reword",
|
||||
["e"] = "Edit",
|
||||
["s"] = "Squash",
|
||||
["f"] = "Fixup",
|
||||
["x"] = "Execute",
|
||||
["d"] = "Drop",
|
||||
["b"] = "Break",
|
||||
["q"] = "Close",
|
||||
["<cr>"] = "OpenCommit",
|
||||
["gk"] = "MoveUp",
|
||||
["gj"] = "MoveDown",
|
||||
["<c-c><c-c>"] = "Submit",
|
||||
["<c-c><c-k>"] = "Abort",
|
||||
["[c"] = "OpenOrScrollUp",
|
||||
["]c"] = "OpenOrScrollDown",
|
||||
},
|
||||
rebase_editor_I = {
|
||||
["<c-c><c-c>"] = "Submit",
|
||||
["<c-c><c-k>"] = "Abort",
|
||||
},
|
||||
finder = {
|
||||
["<cr>"] = "Select",
|
||||
["<c-c>"] = "Close",
|
||||
["<esc>"] = "Close",
|
||||
["<c-n>"] = "Next",
|
||||
["<c-p>"] = "Previous",
|
||||
["<down>"] = "Next",
|
||||
["<up>"] = "Previous",
|
||||
["<tab>"] = "InsertCompletion",
|
||||
["<space>"] = "MultiselectToggleNext",
|
||||
["<s-space>"] = "MultiselectTogglePrevious",
|
||||
["<c-j>"] = "NOP",
|
||||
["<ScrollWheelDown>"] = "ScrollWheelDown",
|
||||
["<ScrollWheelUp>"] = "ScrollWheelUp",
|
||||
["<ScrollWheelLeft>"] = "NOP",
|
||||
["<ScrollWheelRight>"] = "NOP",
|
||||
["<LeftMouse>"] = "MouseClick",
|
||||
["<2-LeftMouse>"] = "NOP",
|
||||
},
|
||||
-- Setting any of these to `false` will disable the mapping.
|
||||
popup = {
|
||||
["?"] = "HelpPopup",
|
||||
["A"] = "CherryPickPopup",
|
||||
["d"] = "DiffPopup",
|
||||
["M"] = "RemotePopup",
|
||||
["P"] = "PushPopup",
|
||||
["X"] = "ResetPopup",
|
||||
["Z"] = "StashPopup",
|
||||
["i"] = "IgnorePopup",
|
||||
["t"] = "TagPopup",
|
||||
["b"] = "BranchPopup",
|
||||
["B"] = "BisectPopup",
|
||||
["w"] = "WorktreePopup",
|
||||
["c"] = "CommitPopup",
|
||||
["f"] = "FetchPopup",
|
||||
["l"] = "LogPopup",
|
||||
["m"] = "MergePopup",
|
||||
["p"] = "PullPopup",
|
||||
["r"] = "RebasePopup",
|
||||
["v"] = "RevertPopup",
|
||||
},
|
||||
status = {
|
||||
["j"] = "MoveDown",
|
||||
["k"] = "MoveUp",
|
||||
["o"] = "OpenTree",
|
||||
["q"] = "Close",
|
||||
["I"] = "InitRepo",
|
||||
["1"] = "Depth1",
|
||||
["2"] = "Depth2",
|
||||
["3"] = "Depth3",
|
||||
["4"] = "Depth4",
|
||||
["Q"] = "Command",
|
||||
["<tab>"] = "Toggle",
|
||||
["x"] = "Discard",
|
||||
["s"] = "Stage",
|
||||
["S"] = "StageUnstaged",
|
||||
["<c-s>"] = "StageAll",
|
||||
["u"] = "Unstage",
|
||||
["K"] = "Untrack",
|
||||
["U"] = "UnstageStaged",
|
||||
["y"] = "ShowRefs",
|
||||
["$"] = "CommandHistory",
|
||||
["Y"] = "YankSelected",
|
||||
["<c-r>"] = "RefreshBuffer",
|
||||
["<cr>"] = "GoToFile",
|
||||
["<s-cr>"] = "PeekFile",
|
||||
["<c-v>"] = "VSplitOpen",
|
||||
["<c-x>"] = "SplitOpen",
|
||||
["<c-t>"] = "TabOpen",
|
||||
["{"] = "GoToPreviousHunkHeader",
|
||||
["}"] = "GoToNextHunkHeader",
|
||||
["[c"] = "OpenOrScrollUp",
|
||||
["]c"] = "OpenOrScrollDown",
|
||||
["<c-k>"] = "PeekUp",
|
||||
["<c-j>"] = "PeekDown",
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
@ -1,122 +0,0 @@
|
|||
-- -- #0f0f0f
|
||||
-- -- #933737
|
||||
-- -- #A23D3D
|
||||
-- -- #994848
|
||||
-- -- #7B7F80
|
||||
-- -- #7C8080
|
||||
-- -- #8D8D8D
|
||||
-- -- #d4d4d4
|
||||
-- -- #949494
|
||||
-- -- #933737
|
||||
-- -- #A23D3D
|
||||
-- -- #994848
|
||||
-- -- #7B7F80
|
||||
-- -- #7C8080
|
||||
-- -- #8D8D8D
|
||||
-- -- #d4d4d4
|
||||
-- return {}
|
||||
-- return {
|
||||
-- {
|
||||
-- "jesseleite/nvim-noirbuddy",
|
||||
-- lazy = false,
|
||||
-- priority = 1000,
|
||||
-- dependencies = {
|
||||
-- { "tjdevries/colorbuddy.nvim" },
|
||||
-- },
|
||||
-- {
|
||||
-- },
|
||||
-- "LazyVim/LazyVim",
|
||||
-- colorscheme = function()
|
||||
-- opts = {
|
||||
-- local noiropts = {
|
||||
-- -- preset = "miami-nights",
|
||||
-- styles = {
|
||||
-- italic = true,
|
||||
-- bold = true,
|
||||
-- underline = true,
|
||||
-- undercurl = false,
|
||||
-- },
|
||||
-- colors = {
|
||||
-- secondary = "#BD4C4C",
|
||||
-- primary = "#933737",
|
||||
-- diagnostic_error = "#AC2020",
|
||||
-- diagnostic_warning = "#ff7700",
|
||||
-- diagnostic_info = "#d5d5d5",
|
||||
-- diagnostic_hint = "#d5d5d5",
|
||||
-- diff_add = "#f5f5f5",
|
||||
-- diff_change = "#737373",
|
||||
-- diff_delete = "#AC2020",
|
||||
-- },
|
||||
-- }
|
||||
-- require("noirbuddy").setup(noiropts)
|
||||
-- local colorbuddy = require("colorbuddy")
|
||||
--
|
||||
-- local Color = colorbuddy.Color
|
||||
-- local colors = colorbuddy.colors
|
||||
-- local Group = colorbuddy.Group
|
||||
-- local groups = colorbuddy.groups
|
||||
-- local styles = colorbuddy.styles
|
||||
-- Color.new("error", "#AC2020")
|
||||
-- Color.new("warn", "#f79000")
|
||||
-- Color.new("warnborder", "#79491d")
|
||||
-- Color.new("infoborder", "#215858")
|
||||
-- Color.new("complement", "#379393")
|
||||
-- -- Override specific highlight groups
|
||||
-- -- Group.new("Type", colors.complement)
|
||||
-- Group.new("DiagnosticOk", colors.diagnostic_info)
|
||||
-- Group.new("Added", colors.diff_change)
|
||||
-- Group.new("Removed", colors.primary)
|
||||
-- Group.new("Changed", colors.complement)
|
||||
-- Group.new("@markup.link", colors.secondary)
|
||||
-- Group.new("@markup.list", colors.complement)
|
||||
-- Group.new("@variable", colors.complement)
|
||||
-- Group.new("@constant", colors.complement)
|
||||
-- Group.new("@constant.builtin", colors.complement)
|
||||
-- Group.new("@type.builtin", colors.primary)
|
||||
-- Group.new("@number", colors.secondary)
|
||||
-- Group.new("NonText", colors.noir_7)
|
||||
-- Group.new("Comment", colors.noir_6)
|
||||
-- Group.new("@comment", colors.noir_6)
|
||||
-- Group.new("@boolean.go", colors.complement)
|
||||
-- Group.new("@boolean", colors.complement)
|
||||
-- Group.new("@keyword.return", colors.complement)
|
||||
-- -- Group.new("gotype", colors.primary)
|
||||
-- Group.new("Boolean", colors.complement)
|
||||
-- Group.new("Constant", colors.complement)
|
||||
-- -- TODO: change these groups to match Snacks instead...
|
||||
-- -- Is that even needed actually?
|
||||
-- Group.new("DashboardHeader", colors.primary)
|
||||
-- Group.new("DashboardIcon", colors.primary)
|
||||
-- Group.new("DashboardKey", colors.complement)
|
||||
-- Group.new("NotifyINFOBorder", colors.infoborder)
|
||||
-- Group.new("NotifyINFOTitle", colors.complement)
|
||||
-- Group.new("NotifyINFOIcon", colors.complement)
|
||||
-- Group.new("NotifyWARNBorder", colors.warnborder)
|
||||
-- Group.new("NotifyWARNTitle", colors.warn)
|
||||
-- Group.new("NotifyWARNIcon", colors.warn)
|
||||
-- Group.new("NotifyERRORBorder", colors.error)
|
||||
-- Group.new("NotifyERRORTitle", colors.error)
|
||||
-- Group.new("NotifyERRORIcon", colors.error)
|
||||
-- Group.new("ErrorMsg", colors.noir_1, colors.error)
|
||||
-- Group.new("SpellBad", nil, nil, styles.undercurl)
|
||||
-- Group.new("SpellCap", nil, nil, styles.undercurl)
|
||||
-- Group.new("String", colors.primary, nil, nil)
|
||||
-- Group.new("Title", colors.primary, nil, styles.bold)
|
||||
-- local linkhl = require("link-hl")
|
||||
-- linkhl.link(linkhl.go_map, "go")
|
||||
-- -- minimap.nvim
|
||||
-- -- vim.api.nvim_set_hl(0, "minimapRange", {
|
||||
-- -- fg = "#FFFFFF",
|
||||
-- -- bg = "#000000",
|
||||
-- -- })
|
||||
-- -- Group.new("ObsidianExtLinkIcon", colors.primary, nil, styles.bold)
|
||||
-- -- Group.new("ObsidianRef", colors.primary, nil, styles.underline + styles.bold)
|
||||
-- -- Group.new("ObsidianRefText", colors.primary, nil, styles.underline + styles.bold)
|
||||
-- -- Group.new("ObsidianBullet", colors.secondary, nil, styles.bold)
|
||||
-- -- Group.new("ObsidianDone", colors.secondary, nil, styles.bold)
|
||||
-- -- Group.new("ObsidianTodo", colors.secondary, nil, styles.bold)
|
||||
-- -- Group.new("ObsidianTag", colors.secondary, nil, styles.italic)
|
||||
-- end,
|
||||
-- },
|
||||
-- },
|
||||
-- }
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
return {
|
||||
"folke/twilight.nvim",
|
||||
opts = {
|
||||
{
|
||||
dimming = {
|
||||
alpha = 0.25, -- amount of dimming
|
||||
-- we try to get the foreground from the highlight groups or fallback color
|
||||
color = { "Normal", "#ffffff" },
|
||||
term_bg = "#000000", -- if guibg=NONE, this will be used to calculate text color
|
||||
inactive = false, -- when true, other windows will be fully dimmed (unless they contain the same buffer)
|
||||
},
|
||||
context = 20, -- amount of lines we will try to show around the current line
|
||||
treesitter = true, -- use treesitter when available for the filetype
|
||||
-- treesitter is used to automatically expand the visible text,
|
||||
-- but you can further control the types of nodes that should always be fully expanded
|
||||
expand = { -- for treesitter, we we always try to expand to the top-most ancestor with these types
|
||||
"function",
|
||||
"method",
|
||||
"table",
|
||||
"if_statement",
|
||||
},
|
||||
exclude = {}, -- exclude these filetypes
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
@ -26,7 +26,7 @@ bind r source-file ~/.config/tmux/tmux.conf
|
|||
unbind C-t
|
||||
unbind C-b
|
||||
|
||||
set -g prefix C-s
|
||||
set -g prefix C-t
|
||||
set -g mouse on
|
||||
|
||||
setw -g automatic-rename on
|
||||
|
|
|
|||
2
.zshrc
2
.zshrc
|
|
@ -1,4 +1,4 @@
|
|||
bindkey -r '^S'
|
||||
# bindkey -r '^S'
|
||||
bindkey -r '\ex'
|
||||
ZSH="$HOME/.oh-my-zsh"
|
||||
plugins=(ssh-agent git github zsh-autosuggestions zsh-syntax-highlighting aliases colored-man-pages copybuffer copyfile copypath fancy-ctrl-z systemd )
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue