Changes
This commit is contained in:
+6
-3
@@ -1,10 +1,9 @@
|
|||||||
cask "ghostty"
|
cask "ghostty"
|
||||||
cask "logi-options+"
|
|
||||||
cask "font-jetbrains-mono-nerd-font"
|
cask "font-jetbrains-mono-nerd-font"
|
||||||
cask "modrinth"
|
|
||||||
cask "google-chrome"
|
cask "google-chrome"
|
||||||
cask "linearmouse"
|
cask "tailscale-app"
|
||||||
|
|
||||||
|
brew "mole"
|
||||||
brew "ripgrep"
|
brew "ripgrep"
|
||||||
brew "neovim"
|
brew "neovim"
|
||||||
brew "tree-sitter" # dep to neovim
|
brew "tree-sitter" # dep to neovim
|
||||||
@@ -13,6 +12,7 @@ brew "eza"
|
|||||||
brew "starship"
|
brew "starship"
|
||||||
brew "tmux"
|
brew "tmux"
|
||||||
brew "bat"
|
brew "bat"
|
||||||
|
brew "python"
|
||||||
brew "cmake"
|
brew "cmake"
|
||||||
brew "fd"
|
brew "fd"
|
||||||
brew "fzf"
|
brew "fzf"
|
||||||
@@ -20,6 +20,9 @@ brew "git"
|
|||||||
brew "zoxide"
|
brew "zoxide"
|
||||||
brew "stow"
|
brew "stow"
|
||||||
brew "jpeg-turbo"
|
brew "jpeg-turbo"
|
||||||
|
brew "pkgconfig"
|
||||||
brew "npm"
|
brew "npm"
|
||||||
|
brew "go"
|
||||||
brew "wget"
|
brew "wget"
|
||||||
brew "jq"
|
brew "jq"
|
||||||
|
brew "ruby"
|
||||||
|
|||||||
@@ -1,21 +1,18 @@
|
|||||||
font-size = 14
|
theme = "/Users/andrew/.config/ghostty/themes/kanso-zen"
|
||||||
# theme = Kanagawa Wave
|
|
||||||
theme = Kanagawa Dragon
|
|
||||||
macos-titlebar-style = tabs
|
|
||||||
font-family = "JetBrainsMono Nerd Font Medium"
|
font-family = "JetBrainsMono Nerd Font Medium"
|
||||||
font-thicken = true
|
font-thicken = true
|
||||||
font-thicken-strength = 10
|
font-size = 14
|
||||||
|
|
||||||
background = 000000
|
macos-titlebar-style = transparent
|
||||||
# .92 on most wallpapers
|
macos-titlebar-proxy-icon = hidden
|
||||||
background-opacity = 0.65
|
title = " "
|
||||||
background-blur = true
|
background-opacity = 0.92
|
||||||
|
background-blur = 64
|
||||||
confirm-close-surface = false
|
confirm-close-surface = false
|
||||||
window-padding-x = 6
|
window-padding-x = 15
|
||||||
window-padding-y = 6
|
window-padding-y = 15
|
||||||
mouse-hide-while-typing = true
|
mouse-hide-while-typing = true
|
||||||
adjust-cell-height = 5%
|
adjust-cell-height = 5%
|
||||||
adjust-cell-width = -5%
|
adjust-cell-width = -5%
|
||||||
alpha-blending = linear-corrected
|
alpha-blending = linear-corrected
|
||||||
bold-is-bright = true
|
|
||||||
mouse-hide-while-typing = true
|
mouse-hide-while-typing = true
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
palette = 0=#090E13
|
||||||
|
palette = 1=#c4746e
|
||||||
|
palette = 2=#8a9a7b
|
||||||
|
palette = 3=#c4b28a
|
||||||
|
palette = 4=#8ba4b0
|
||||||
|
palette = 5=#a292a3
|
||||||
|
palette = 6=#8ea4a2
|
||||||
|
palette = 7=#a4a7a4
|
||||||
|
palette = 8=#5C6066
|
||||||
|
palette = 9=#e46876
|
||||||
|
palette = 10=#87a987
|
||||||
|
palette = 11=#e6c384
|
||||||
|
palette = 12=#7fb4ca
|
||||||
|
palette = 13=#938aa9
|
||||||
|
palette = 14=#7aa89f
|
||||||
|
palette = 15=#c5c9c7
|
||||||
|
|
||||||
|
background = #090E13
|
||||||
|
foreground = #c5c9c7
|
||||||
|
cursor-color = #c5c9c7
|
||||||
|
selection-background = #22262D
|
||||||
|
selection-foreground = #c5c9c7
|
||||||
Vendored
BIN
Binary file not shown.
@@ -1,25 +1,30 @@
|
|||||||
-- require('bamboo').load()
|
require('kanso').setup({
|
||||||
-- vim.cmd.colorscheme('bamboo')
|
foreground = {
|
||||||
-- vim.cmd.colorscheme('melange')
|
dark = "saturated", -- Use default colors in dark mode
|
||||||
-- vim.cmd.colorscheme('rose-pine')
|
},
|
||||||
-- vim.cmd.colorscheme('bamboo-multiplex')
|
|
||||||
require('kanagawa').setup({
|
|
||||||
overrides = function(colors)
|
overrides = function(colors)
|
||||||
local theme = colors.theme
|
local theme = colors.theme
|
||||||
return {
|
return {
|
||||||
Pmenu = { fg = theme.ui.shade0, bg = theme.ui.bg_p1 }, -- add `blend = vim.o.pumblend` to enable transparency
|
NormalFloat = { bg = "none" },
|
||||||
PmenuSel = { fg = 'NONE', bg = theme.ui.bg_p2 },
|
FloatBorder = { bg = "none" },
|
||||||
PmenuSbar = { bg = theme.ui.bg_m1 },
|
FloatTitle = { bg = "none" },
|
||||||
PmenuThumb = { bg = theme.ui.bg_p2 },
|
TelescopeBorder = { fg = theme.ui.special, bg = "none" },
|
||||||
|
TelescopePromptBorder = { fg = theme.ui.special, bg = "none" },
|
||||||
|
TelescopeResultsBorder = { fg = theme.ui.special, bg = "none" },
|
||||||
|
TelescopePreviewBorder = { fg = theme.ui.special, bg = "none" },
|
||||||
|
NotifyBackground = { bg = "none" },
|
||||||
|
NotifyBorder = { fg = theme.ui.special, bg = "none" },
|
||||||
|
NotifyBody = { fg = theme.ui.fg, bg = "none" },
|
||||||
|
NotifyTitle = { fg = theme.ui.special, bg = "none" },
|
||||||
}
|
}
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
--
|
||||||
vim.cmd.colorscheme('kanagawa-dragon')
|
vim.cmd.colorscheme('kanso-zen')
|
||||||
-- vim.cmd.colorscheme('rose-pine')
|
|
||||||
|
|
||||||
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', { link = 'Normal' })
|
-- vim.api.nvim_set_hl(0, 'NormalFloat', { link = 'Normal' })
|
||||||
|
-- vim.api.nvim_set_hl(0, "FloatBorder", { bg = "none" })
|
||||||
vim.api.nvim_set_hl(0, 'StatusLine', { link = 'Normal' })
|
vim.api.nvim_set_hl(0, 'StatusLine', { link = 'Normal' })
|
||||||
vim.api.nvim_set_hl(0, 'StatusLineTerm', { link = 'Normal' })
|
vim.api.nvim_set_hl(0, 'StatusLineTerm', { link = 'Normal' })
|
||||||
vim.api.nvim_set_hl(0, 'StatusLineNC', { link = 'Normal' })
|
vim.api.nvim_set_hl(0, 'StatusLineNC', { link = 'Normal' })
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
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")
|
||||||
-- vim.keymap.set("n", "<leader>ff", vim.lsp.buf.format)
|
|
||||||
vim.keymap.set('n', '<leader>ff', function()
|
vim.keymap.set('n', '<leader>ff', function()
|
||||||
require('conform').format({ async = true, lsp_format = 'never' })
|
require('conform').format({ async = true, lsp_format = 'never' })
|
||||||
end)
|
end)
|
||||||
@@ -37,19 +36,12 @@ vim.keymap.set(
|
|||||||
builtin.man_pages,
|
builtin.man_pages,
|
||||||
{ desc = 'Telescope man_pages' }
|
{ desc = 'Telescope man_pages' }
|
||||||
)
|
)
|
||||||
-- vim.keymap.set(
|
|
||||||
-- 'n',
|
|
||||||
-- '<leader>xx',
|
|
||||||
-- builtin.diagnostics,
|
|
||||||
-- { desc = 'Telescope diagnostics' }
|
|
||||||
-- )
|
|
||||||
vim.keymap.set(
|
vim.keymap.set(
|
||||||
'n',
|
'n',
|
||||||
'<leader>xn',
|
'<leader>xn',
|
||||||
':Telescope notify<CR>',
|
':Telescope notify<CR>',
|
||||||
{ desc = 'Telescope notify' }
|
{ desc = 'Telescope notify' }
|
||||||
)
|
)
|
||||||
-- vim.keymap.set('n', '<leader>xx', ':FzfLua diagnostics_workspace<CR>')
|
|
||||||
|
|
||||||
vim.keymap.set('n', '<leader>fs', vim.lsp.buf.document_symbol)
|
vim.keymap.set('n', '<leader>fs', vim.lsp.buf.document_symbol)
|
||||||
vim.keymap.set('n', '<leader>gd', vim.lsp.buf.definition)
|
vim.keymap.set('n', '<leader>gd', vim.lsp.buf.definition)
|
||||||
@@ -63,12 +55,13 @@ vim.keymap.set('n', '[q', ':cprev<CR>zz', { desc = 'Previous Quickfix Item' })
|
|||||||
vim.keymap.set('n', ']q', ':cnext<CR>zz', { desc = 'Next Quickfix Item' })
|
vim.keymap.set('n', ']q', ':cnext<CR>zz', { desc = 'Next Quickfix Item' })
|
||||||
vim.keymap.set('n', '<leader>qo', ':copen<CR>', { desc = 'Open Quickfix' })
|
vim.keymap.set('n', '<leader>qo', ':copen<CR>', { desc = 'Open Quickfix' })
|
||||||
vim.keymap.set('n', '<leader>qc', ':cclose<CR>', { desc = 'Close Quickfix' })
|
vim.keymap.set('n', '<leader>qc', ':cclose<CR>', { desc = 'Close Quickfix' })
|
||||||
|
vim.keymap.set('n', '<leader>lp', ':LivePreview pick<cr>')
|
||||||
vim.keymap.set('n', '<C-h>', ':NvimTmuxNavigateLeft<CR>', { silent = true })
|
vim.keymap.set('n', '<C-h>', ':NvimTmuxNavigateLeft<CR>', { silent = true })
|
||||||
vim.keymap.set('n', '<C-j>', ':NvimTmuxNavigateDown<CR>', { silent = true })
|
vim.keymap.set('n', '<C-j>', ':NvimTmuxNavigateDown<CR>', { silent = true })
|
||||||
vim.keymap.set('n', '<C-k>', ':NvimTmuxNavigateUp<CR>', { silent = true })
|
vim.keymap.set('n', '<C-k>', ':NvimTmuxNavigateUp<CR>', { silent = true })
|
||||||
vim.keymap.set('n', '<C-l>', ':NvimTmuxNavigateRight<CR>', { silent = true })
|
vim.keymap.set('n', '<C-l>', ':NvimTmuxNavigateRight<CR>', { silent = true })
|
||||||
-- vim.keymap.set('n', '<leader>fr', ':FlutterRun<CR>')
|
|
||||||
-- vim.keymap.set('n', '<leader>fq', ':FlutterQuit<CR>')
|
|
||||||
-- vim.keymap.set('n', '<leader>fR', ':FlutterReload<CR>')
|
|
||||||
-- vim.keymap.set('n', '<leader>frr', ':FlutterRestart<CR>')
|
|
||||||
vim.keymap.set('n', '<leader>xx', ':Trouble diagnostics toggle<cr>')
|
vim.keymap.set('n', '<leader>xx', ':Trouble diagnostics toggle<cr>')
|
||||||
|
local dropbar_api = require("dropbar.api")
|
||||||
|
vim.keymap.set("n", "<Leader>;", dropbar_api.pick, { desc = "Pick symbols in winbar" })
|
||||||
|
vim.keymap.set("n", "[;", dropbar_api.goto_context_start, { desc = "Go to start of current context" })
|
||||||
|
vim.keymap.set("n", "];", dropbar_api.select_next_context, { desc = "Select next context" })
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ require('mason-lspconfig').setup({
|
|||||||
'pylsp',
|
'pylsp',
|
||||||
'gopls',
|
'gopls',
|
||||||
'html',
|
'html',
|
||||||
'tailwindcss',
|
'cssls',
|
||||||
'bashls',
|
'bashls',
|
||||||
},
|
},
|
||||||
automatic_enable = false,
|
automatic_enable = false,
|
||||||
@@ -37,7 +37,9 @@ require('conform').setup({
|
|||||||
go = { 'goimports' },
|
go = { 'goimports' },
|
||||||
c = { 'clang-format' },
|
c = { 'clang-format' },
|
||||||
cpp = { 'clang-format' },
|
cpp = { 'clang-format' },
|
||||||
|
css = { 'csskit' },
|
||||||
dart = { 'dart_format', lsp_format = 'fallback' },
|
dart = { 'dart_format', lsp_format = 'fallback' },
|
||||||
|
python = { 'autopep8' },
|
||||||
['_'] = { 'trim_whitespace' },
|
['_'] = { 'trim_whitespace' },
|
||||||
},
|
},
|
||||||
format_on_save = {
|
format_on_save = {
|
||||||
@@ -71,12 +73,18 @@ vim.lsp.config('vtsls', {
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
vim.lsp.config('html', {
|
||||||
|
capabilities = capabilities,
|
||||||
|
})
|
||||||
|
|
||||||
vim.lsp.enable({
|
vim.lsp.enable({
|
||||||
'lua_ls',
|
'lua_ls',
|
||||||
'clangd',
|
'clangd',
|
||||||
'rust-analyzer',
|
'rust-analyzer',
|
||||||
'vtsls',
|
'vtsls',
|
||||||
'tailwindcss-language-server',
|
'tailwindcss-language-server',
|
||||||
'vscode-html-language-server',
|
'cssls',
|
||||||
|
'html',
|
||||||
'gopls',
|
'gopls',
|
||||||
|
'pylsp'
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -16,6 +16,9 @@ vim.api.nvim_create_autocmd('FileType', {
|
|||||||
lua = { ts = 4, sw = 4, sts = 4 },
|
lua = { ts = 4, sw = 4, sts = 4 },
|
||||||
python = { ts = 4, sw = 4, sts = 4 },
|
python = { ts = 4, sw = 4, sts = 4 },
|
||||||
dart = { ts = 2, sw = 2, sts = 2 },
|
dart = { ts = 2, sw = 2, sts = 2 },
|
||||||
|
html = { ts = 2, sw = 2, sts = 2 },
|
||||||
|
javascript = { ts = 2, sw = 2, sts = 2 },
|
||||||
|
typescript = { ts = 2, sw = 2, sts = 2 },
|
||||||
}
|
}
|
||||||
local ft = map[ev.match]
|
local ft = map[ev.match]
|
||||||
if ft then
|
if ft then
|
||||||
@@ -54,6 +57,7 @@ vim.opt.laststatus = 3
|
|||||||
vim.opt.showmode = false
|
vim.opt.showmode = false
|
||||||
vim.opt.cmdheight = 0
|
vim.opt.cmdheight = 0
|
||||||
vim.opt.smoothscroll = true
|
vim.opt.smoothscroll = true
|
||||||
|
vim.opt.spell = true
|
||||||
vim.diagnostic.config({
|
vim.diagnostic.config({
|
||||||
virtual_text = true, -- This is the magic line
|
virtual_text = true, -- This is the magic line
|
||||||
signs = true, -- Shows icons in the gutter
|
signs = true, -- Shows icons in the gutter
|
||||||
@@ -61,3 +65,4 @@ vim.diagnostic.config({
|
|||||||
update_in_insert = false, -- Don't clutter the screen while typing
|
update_in_insert = false, -- Don't clutter the screen while typing
|
||||||
severity_sort = true,
|
severity_sort = true,
|
||||||
})
|
})
|
||||||
|
vim.o.winborder = "rounded"
|
||||||
|
|||||||
@@ -1,24 +1,6 @@
|
|||||||
vim.pack.add({
|
vim.pack.add({
|
||||||
-- Themes
|
-- Themes
|
||||||
{
|
{ src = 'https://github.com/webhooked/kanso.nvim' },
|
||||||
src = 'https://github.com/rose-pine/neovim',
|
|
||||||
name = 'rose-pine',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src = 'https://github.com/ribru17/bamboo.nvim',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src = 'https://github.com/savq/melange-nvim',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src = 'https://github.com/mountain-theme/Mountain',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src = 'https://github.com/sainnhe/everforest',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src = 'https://github.com/rebelot/kanagawa.nvim',
|
|
||||||
},
|
|
||||||
|
|
||||||
-- The rest
|
-- The rest
|
||||||
{ src = 'https://github.com/mbbill/undotree' },
|
{ src = 'https://github.com/mbbill/undotree' },
|
||||||
@@ -36,7 +18,7 @@ vim.pack.add({
|
|||||||
src = 'https://github.com/saghen/blink.cmp',
|
src = 'https://github.com/saghen/blink.cmp',
|
||||||
version = vim.version.range('*'),
|
version = vim.version.range('*'),
|
||||||
},
|
},
|
||||||
{ src = 'git@moo:dmm/polydev.git' },
|
{ src = 'https://git.moomancer.xyz/DarthMooMancer/polydev.git' },
|
||||||
{
|
{
|
||||||
src = 'https://github.com/nvim-treesitter/nvim-treesitter',
|
src = 'https://github.com/nvim-treesitter/nvim-treesitter',
|
||||||
build = ':TSUpdate',
|
build = ':TSUpdate',
|
||||||
@@ -49,12 +31,11 @@ vim.pack.add({
|
|||||||
{ src = 'https://github.com/b0o/incline.nvim' },
|
{ src = 'https://github.com/b0o/incline.nvim' },
|
||||||
{ src = 'https://github.com/windwp/nvim-ts-autotag' },
|
{ src = 'https://github.com/windwp/nvim-ts-autotag' },
|
||||||
{ src = 'https://github.com/MunifTanjim/nui.nvim' },
|
{ src = 'https://github.com/MunifTanjim/nui.nvim' },
|
||||||
-- { src = 'https://github.com/nvim-lualine/lualine.nvim' },
|
|
||||||
{ src = 'https://github.com/nvim-lua/plenary.nvim' },
|
{ src = 'https://github.com/nvim-lua/plenary.nvim' },
|
||||||
{ src = 'https://github.com/folke/noice.nvim' },
|
{ src = 'https://github.com/folke/noice.nvim' },
|
||||||
-- { src = 'https://github.com/akinsho/flutter-tools.nvim' },
|
-- { src = 'https://github.com/stevearc/dressing.nvim' },
|
||||||
-- { src = 'https://github.com/mfussenegger/nvim-dap' },
|
|
||||||
{ src = 'https://github.com/stevearc/dressing.nvim' },
|
|
||||||
{ src = 'https://github.com/rcarriga/nvim-notify' },
|
{ src = 'https://github.com/rcarriga/nvim-notify' },
|
||||||
{ src = 'https://github.com/folke/trouble.nvim' },
|
{ src = 'https://github.com/folke/trouble.nvim' },
|
||||||
|
{ src = 'https://github.com/brianhuster/live-preview.nvim' },
|
||||||
|
{ src = 'https://github.com/Bekaboo/dropbar.nvim' },
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -30,13 +30,24 @@ require('nvim-tmux-navigation').setup({
|
|||||||
|
|
||||||
require('blink.cmp').setup({
|
require('blink.cmp').setup({
|
||||||
completion = {
|
completion = {
|
||||||
|
documentation = {
|
||||||
|
auto_show = true,
|
||||||
|
auto_show_delay_ms = 100,
|
||||||
|
window = {
|
||||||
|
winhighlight = 'Normal:NormalFloat,FloatBorder:TelescopeBorder,CursorLine:Visual,Search:None',
|
||||||
|
},
|
||||||
|
},
|
||||||
menu = {
|
menu = {
|
||||||
draw = {
|
draw = {
|
||||||
columns = {
|
columns = {
|
||||||
{ 'label', gap = 1 },
|
{ "label", "label_description", gap = 1 },
|
||||||
{ 'kind_icon', gap = 1, 'kind' },
|
{ "kind_icon", "kind", gap = 1 },
|
||||||
|
{ "source_name", gap = 1 },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
scrollbar = false,
|
||||||
|
winhighlight =
|
||||||
|
'Pmenu:NormalFloat,FloatBorder:TelescopeBorder,PmenuSel:TelescopeSelection,CursorLine:TelescopeSelection,Search:None',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
@@ -51,3 +62,23 @@ require('nvim-ts-autotag').setup({
|
|||||||
})
|
})
|
||||||
|
|
||||||
require('trouble').setup({})
|
require('trouble').setup({})
|
||||||
|
-- require('dropbar').setup({})
|
||||||
|
require("telescope").setup({
|
||||||
|
defaults = {
|
||||||
|
prompt_prefix = " ", -- Changes the search icon/prompt prefix
|
||||||
|
selection_caret = " ", -- Changes the arrow/caret next to the selected item
|
||||||
|
layout_strategy = "horizontal",
|
||||||
|
layout_config = {
|
||||||
|
horizontal = {
|
||||||
|
prompt_position = 'top',
|
||||||
|
prompt_min_width = 40,
|
||||||
|
prompt_max_width = 80,
|
||||||
|
preview_width = 80,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
sorting_strategy = "ascending",
|
||||||
|
preview = {
|
||||||
|
hide_on_startup = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ local function derive_mode_hl(name, color_group)
|
|||||||
bold = true,
|
bold = true,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
--- (Re)build all statusline highlight groups from current scheme.
|
--- (Re)build all statusline highlight groups from current scheme.
|
||||||
local function setup_statusline_highlights()
|
local function setup_statusline_highlights()
|
||||||
derive_mode_hl('StatusModeNormal', 'Type')
|
derive_mode_hl('StatusModeNormal', 'Type')
|
||||||
@@ -50,6 +51,7 @@ vim.api.nvim_create_autocmd('ColorScheme', {
|
|||||||
callback = setup_statusline_highlights,
|
callback = setup_statusline_highlights,
|
||||||
})
|
})
|
||||||
setup_statusline_highlights()
|
setup_statusline_highlights()
|
||||||
|
|
||||||
--- Mode text mapping.
|
--- Mode text mapping.
|
||||||
local mode_map = {
|
local mode_map = {
|
||||||
['n'] = ' NORM ',
|
['n'] = ' NORM ',
|
||||||
@@ -98,7 +100,7 @@ vim.api.nvim_create_autocmd({ 'BufEnter', 'FocusGained' }, {
|
|||||||
--- LSP progress (Neovim 0.10+ built-in handler)
|
--- LSP progress (Neovim 0.10+ built-in handler)
|
||||||
local progress = {}
|
local progress = {}
|
||||||
local spinner_frames =
|
local spinner_frames =
|
||||||
{ '⣾', '⣽', '⣻', '⢿', '⡿', '⣟', '⣯', '⣷' }
|
{ '⣾', '⣽', '⣻', '⢿', '⡿', '⣟', '⣯', '⣷' }
|
||||||
|
|
||||||
local frame = 0
|
local frame = 0
|
||||||
--- Clean stale progress messages periodically
|
--- Clean stale progress messages periodically
|
||||||
@@ -294,73 +296,55 @@ end
|
|||||||
vim.o.statusline = '%!v:lua.__statusline()'
|
vim.o.statusline = '%!v:lua.__statusline()'
|
||||||
|
|
||||||
require('incline').setup({
|
require('incline').setup({
|
||||||
window = {
|
window = { margin = { vertical = 0, horizontal = 1 } },
|
||||||
padding = 0,
|
hide = { cursorline = true },
|
||||||
margin = { horizontal = 0 },
|
|
||||||
options = {
|
|
||||||
-- Reset winhl so it doesn't force total transparency
|
|
||||||
winhl = 'Normal:InclineNormal',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
render = function(props)
|
render = function(props)
|
||||||
local filename =
|
local filename = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ":t")
|
||||||
vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ':t')
|
if vim.bo[props.buf].modified then
|
||||||
if filename == '' then
|
filename = "[+] " .. filename
|
||||||
filename = '[No Name]'
|
|
||||||
end
|
end
|
||||||
local ft_icon, ft_color =
|
|
||||||
require('nvim-web-devicons').get_icon_color(filename)
|
|
||||||
local modified = vim.bo[props.buf].modified
|
|
||||||
|
|
||||||
return {
|
local icon, color = require("nvim-web-devicons").get_icon_color(filename)
|
||||||
ft_icon and {
|
return { { icon, guifg = color }, { " " }, { filename } }
|
||||||
' ',
|
|
||||||
ft_icon,
|
|
||||||
' ',
|
|
||||||
guibg = ft_color,
|
|
||||||
guifg = require('incline.helpers').contrast_color(ft_color),
|
|
||||||
} or '',
|
|
||||||
-- Wrap the text and padding inside a structural block linked to 'CursorLine'
|
|
||||||
{
|
|
||||||
' ',
|
|
||||||
{ filename, gui = modified and 'bold,italic' or 'bold' },
|
|
||||||
' ',
|
|
||||||
group = 'CursorLine',
|
|
||||||
},
|
|
||||||
}
|
|
||||||
end,
|
end,
|
||||||
|
-- window = {
|
||||||
|
-- padding = 0,
|
||||||
|
-- margin = { horizontal = 0 },
|
||||||
|
-- options = {
|
||||||
|
-- -- Reset winhl so it doesn't force total transparency
|
||||||
|
-- winhl = 'Normal:InclineNormal',
|
||||||
|
-- },
|
||||||
|
-- },
|
||||||
|
-- render = function(props)
|
||||||
|
-- local filename =
|
||||||
|
-- vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ':t')
|
||||||
|
-- if filename == '' then
|
||||||
|
-- filename = '[No Name]'
|
||||||
|
-- end
|
||||||
|
-- local ft_icon, ft_color =
|
||||||
|
-- require('nvim-web-devicons').get_icon_color(filename)
|
||||||
|
-- local modified = vim.bo[props.buf].modified
|
||||||
|
--
|
||||||
|
-- return {
|
||||||
|
-- ft_icon and {
|
||||||
|
-- ' ',
|
||||||
|
-- ft_icon,
|
||||||
|
-- ' ',
|
||||||
|
-- guibg = ft_color,
|
||||||
|
-- guifg = require('incline.helpers').contrast_color(ft_color),
|
||||||
|
-- -- guibg = ft_color,
|
||||||
|
-- -- guifg = require('incline.helpers').contrast_color(ft_color),
|
||||||
|
-- } or '',
|
||||||
|
-- -- Wrap the text and padding inside a structural block linked to 'CursorLine'
|
||||||
|
-- {
|
||||||
|
-- ' ',
|
||||||
|
-- { filename, gui = modified and 'bold,italic' or 'bold' },
|
||||||
|
-- ' ',
|
||||||
|
-- group = 'CursorLine',
|
||||||
|
-- },
|
||||||
|
-- }
|
||||||
|
-- end,
|
||||||
})
|
})
|
||||||
-- require('incline').setup({
|
|
||||||
-- window = {
|
|
||||||
-- padding = 0,
|
|
||||||
-- margin = { horizontal = 0 },
|
|
||||||
-- },
|
|
||||||
-- render = function(props)
|
|
||||||
-- local filename =
|
|
||||||
-- vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ':t')
|
|
||||||
-- if filename == '' then
|
|
||||||
-- filename = '[No Name]'
|
|
||||||
-- end
|
|
||||||
-- local ft_icon, ft_color =
|
|
||||||
-- require('nvim-web-devicons').get_icon_color(filename)
|
|
||||||
-- local modified = vim.bo[props.buf].modified
|
|
||||||
-- -- Query 'StatusLine' since your custom highlights derive from it
|
|
||||||
-- return {
|
|
||||||
-- ft_icon and {
|
|
||||||
-- ' ',
|
|
||||||
-- ft_icon,
|
|
||||||
-- ' ',
|
|
||||||
-- guibg = ft_color,
|
|
||||||
-- guifg = require('incline.helpers').contrast_color(ft_color),
|
|
||||||
-- } or '',
|
|
||||||
-- ' ',
|
|
||||||
-- { filename, gui = modified and 'bold,italic' or 'bold' },
|
|
||||||
-- ' ',
|
|
||||||
-- guibg = '#363646',
|
|
||||||
-- }
|
|
||||||
-- end,
|
|
||||||
-- })
|
|
||||||
|
|
||||||
require('noice').setup({
|
require('noice').setup({
|
||||||
lsp = {
|
lsp = {
|
||||||
-- override markdown rendering so that **cmp** and other plugins use **Treesitter**
|
-- override markdown rendering so that **cmp** and other plugins use **Treesitter**
|
||||||
|
|||||||
@@ -1,74 +1,38 @@
|
|||||||
{
|
{
|
||||||
"plugins": {
|
"plugins": {
|
||||||
"Mountain": {
|
|
||||||
"rev": "27db65fef4654095bf7e46a8930f411b6545fbe5",
|
|
||||||
"src": "https://github.com/mountain-theme/Mountain"
|
|
||||||
},
|
|
||||||
"bamboo.nvim": {
|
|
||||||
"rev": "1309bc88bffcf1bedc3e84e7fa9004de93da774a",
|
|
||||||
"src": "https://github.com/ribru17/bamboo.nvim"
|
|
||||||
},
|
|
||||||
"blink.cmp": {
|
"blink.cmp": {
|
||||||
"rev": "78336bc89ee5365633bcf754d93df01678b5c08f",
|
"rev": "78336bc89ee5365633bcf754d93df01678b5c08f",
|
||||||
"src": "https://github.com/saghen/blink.cmp",
|
"src": "https://github.com/saghen/blink.cmp",
|
||||||
"version": ">=0.0.0"
|
"version": ">=0.0.0"
|
||||||
},
|
},
|
||||||
"catppuccin": {
|
|
||||||
"rev": "05e8787020dcfdb937bf2ff23855ea2415b4e072",
|
|
||||||
"src": "https://github.com/catppuccin/nvim"
|
|
||||||
},
|
|
||||||
"conform.nvim": {
|
"conform.nvim": {
|
||||||
"rev": "619363c30309d29ffa631e67c8183f2a72caa373",
|
"rev": "016802de402556da54c36bd7359b441266b01cdd",
|
||||||
"src": "https://github.com/stevearc/conform.nvim"
|
"src": "https://github.com/stevearc/conform.nvim"
|
||||||
},
|
},
|
||||||
"dart-vim-plugin": {
|
"dropbar.nvim": {
|
||||||
"rev": "13fa42674f1685a1c5a095c1dac74d94e43a9849",
|
"rev": "808ba31cde89aec8833e9789f5e04557cd31c9e1",
|
||||||
"src": "https://github.com/dart-lang/dart-vim-plugin"
|
"src": "https://github.com/Bekaboo/dropbar.nvim"
|
||||||
},
|
|
||||||
"dressing.nvim": {
|
|
||||||
"rev": "2d7c2db2507fa3c4956142ee607431ddb2828639",
|
|
||||||
"src": "https://github.com/stevearc/dressing.nvim"
|
|
||||||
},
|
|
||||||
"everforest": {
|
|
||||||
"rev": "85a86eb62409e3ec88713bff3d1b9d7374e112e4",
|
|
||||||
"src": "https://github.com/sainnhe/everforest"
|
|
||||||
},
|
|
||||||
"flutter-tools.nvim": {
|
|
||||||
"rev": "7d1acfd139215e02d2784733af69a61aaebe06e8",
|
|
||||||
"src": "https://github.com/akinsho/flutter-tools.nvim"
|
|
||||||
},
|
|
||||||
"fzf-lua": {
|
|
||||||
"rev": "532d463f5c83595192fe740572d8fd6902b2217a",
|
|
||||||
"src": "https://github.com/ibhagwan/fzf-lua"
|
|
||||||
},
|
},
|
||||||
"incline.nvim": {
|
"incline.nvim": {
|
||||||
"rev": "debd628e9395f7a9da57bdc31ce75ca6b40a880b",
|
"rev": "debd628e9395f7a9da57bdc31ce75ca6b40a880b",
|
||||||
"src": "https://github.com/b0o/incline.nvim"
|
"src": "https://github.com/b0o/incline.nvim"
|
||||||
},
|
},
|
||||||
"kanagawa.nvim": {
|
"kanso.nvim": {
|
||||||
"rev": "bb85e4bfc8d89b0e62c8fa53ccdd13d12e2f77b3",
|
"rev": "1afbbb449aa0254823dbe1932e3cbb51886ff9fe",
|
||||||
"src": "https://github.com/rebelot/kanagawa.nvim"
|
"src": "https://github.com/webhooked/kanso.nvim"
|
||||||
},
|
},
|
||||||
"lsp-status.nvim": {
|
"live-preview.nvim": {
|
||||||
"rev": "54f48eb5017632d81d0fd40112065f1d062d0629",
|
"rev": "a6307fa340ed7c0d96f5c567afc8c991aad94ce0",
|
||||||
"src": "https://github.com/nvim-lua/lsp-status.nvim"
|
"src": "https://github.com/brianhuster/live-preview.nvim"
|
||||||
},
|
|
||||||
"lualine.nvim": {
|
|
||||||
"rev": "221ce6b2d999187044529f49da6554a92f740a96",
|
|
||||||
"src": "https://github.com/nvim-lualine/lualine.nvim"
|
|
||||||
},
|
},
|
||||||
"mason-lspconfig.nvim": {
|
"mason-lspconfig.nvim": {
|
||||||
"rev": "a4068c3ebd4cb335b25239e5ea35c22ee6007962",
|
"rev": "b5576cd62899a1a478d0e67ef3d378ee55dba82d",
|
||||||
"src": "https://github.com/mason-org/mason-lspconfig.nvim"
|
"src": "https://github.com/mason-org/mason-lspconfig.nvim"
|
||||||
},
|
},
|
||||||
"mason.nvim": {
|
"mason.nvim": {
|
||||||
"rev": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d",
|
"rev": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d",
|
||||||
"src": "https://github.com/mason-org/mason.nvim"
|
"src": "https://github.com/mason-org/mason.nvim"
|
||||||
},
|
},
|
||||||
"melange-nvim": {
|
|
||||||
"rev": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce",
|
|
||||||
"src": "https://github.com/savq/melange-nvim"
|
|
||||||
},
|
|
||||||
"mini.hipatterns": {
|
"mini.hipatterns": {
|
||||||
"rev": "607d604e650cdf21d71f863d040c496a1d0cb320",
|
"rev": "607d604e650cdf21d71f863d040c496a1d0cb320",
|
||||||
"src": "https://github.com/nvim-mini/mini.hipatterns",
|
"src": "https://github.com/nvim-mini/mini.hipatterns",
|
||||||
@@ -79,24 +43,16 @@
|
|||||||
"src": "https://github.com/nvim-mini/mini.pairs",
|
"src": "https://github.com/nvim-mini/mini.pairs",
|
||||||
"version": ">=0.0.0"
|
"version": ">=0.0.0"
|
||||||
},
|
},
|
||||||
"mini.statusline": {
|
|
||||||
"rev": "127997ebef7ef632161203b960c5ef9d158f4810",
|
|
||||||
"src": "https://github.com/nvim-mini/mini.statusline"
|
|
||||||
},
|
|
||||||
"noice.nvim": {
|
"noice.nvim": {
|
||||||
"rev": "7bfd942445fb63089b59f97ca487d605e715f155",
|
"rev": "7bfd942445fb63089b59f97ca487d605e715f155",
|
||||||
"src": "https://github.com/folke/noice.nvim"
|
"src": "https://github.com/folke/noice.nvim"
|
||||||
},
|
},
|
||||||
"nui.nvim": {
|
"nui.nvim": {
|
||||||
"rev": "de740991c12411b663994b2860f1a4fd0937c130",
|
"rev": "10fc361835c856ba4233ef5ea135b919bf3dce97",
|
||||||
"src": "https://github.com/MunifTanjim/nui.nvim"
|
"src": "https://github.com/MunifTanjim/nui.nvim"
|
||||||
},
|
},
|
||||||
"nvim-dap": {
|
|
||||||
"rev": "9e848e09a697ee95302a3ef2dd43fd6eb709e570",
|
|
||||||
"src": "https://github.com/mfussenegger/nvim-dap"
|
|
||||||
},
|
|
||||||
"nvim-lspconfig": {
|
"nvim-lspconfig": {
|
||||||
"rev": "d5b6e3db4c17b0146f63a2fc47e2027a754b2cb1",
|
"rev": "84b6b6c3f13cb34a6c8a0354b0da4c67d8ccf867",
|
||||||
"src": "https://github.com/neovim/nvim-lspconfig"
|
"src": "https://github.com/neovim/nvim-lspconfig"
|
||||||
},
|
},
|
||||||
"nvim-notify": {
|
"nvim-notify": {
|
||||||
@@ -108,7 +64,7 @@
|
|||||||
"src": "https://github.com/alexghergh/nvim-tmux-navigation"
|
"src": "https://github.com/alexghergh/nvim-tmux-navigation"
|
||||||
},
|
},
|
||||||
"nvim-treesitter": {
|
"nvim-treesitter": {
|
||||||
"rev": "4916d6592ede8c07973490d9322f187e07dfefac",
|
"rev": "5cb0114e6242625db56dd6440e945ed1ece10bc7",
|
||||||
"src": "https://github.com/nvim-treesitter/nvim-treesitter"
|
"src": "https://github.com/nvim-treesitter/nvim-treesitter"
|
||||||
},
|
},
|
||||||
"nvim-ts-autotag": {
|
"nvim-ts-autotag": {
|
||||||
@@ -116,7 +72,7 @@
|
|||||||
"src": "https://github.com/windwp/nvim-ts-autotag"
|
"src": "https://github.com/windwp/nvim-ts-autotag"
|
||||||
},
|
},
|
||||||
"nvim-web-devicons": {
|
"nvim-web-devicons": {
|
||||||
"rev": "0ca28b61a04fe7426cefbdd52c2647ef0e335b5f",
|
"rev": "5f032a85be210cd1c6ac98861eb3b187ff3bd5eb",
|
||||||
"src": "https://github.com/nvim-tree/nvim-web-devicons"
|
"src": "https://github.com/nvim-tree/nvim-web-devicons"
|
||||||
},
|
},
|
||||||
"plenary.nvim": {
|
"plenary.nvim": {
|
||||||
@@ -124,19 +80,11 @@
|
|||||||
"src": "https://github.com/nvim-lua/plenary.nvim"
|
"src": "https://github.com/nvim-lua/plenary.nvim"
|
||||||
},
|
},
|
||||||
"polydev": {
|
"polydev": {
|
||||||
"rev": "8d41141e9ab68c271bb8bb2db5528bb0a61c78eb",
|
"rev": "2b30e36fade3272081f7166bc0ec614b0b7da1c9",
|
||||||
"src": "git@moo:dmm/polydev.git"
|
"src": "https://git.moomancer.xyz/DarthMooMancer/polydev.git"
|
||||||
},
|
|
||||||
"rose-pine": {
|
|
||||||
"rev": "ff483051a47e27d84bdef47703538df1ed9f4a47",
|
|
||||||
"src": "https://github.com/rose-pine/neovim"
|
|
||||||
},
|
|
||||||
"statusline.lua": {
|
|
||||||
"rev": "4c7083cdd8b902ce06762861124ac4c031b2e581",
|
|
||||||
"src": "https://github.com/beauwilliams/statusline.lua"
|
|
||||||
},
|
},
|
||||||
"telescope.nvim": {
|
"telescope.nvim": {
|
||||||
"rev": "427b576c16792edad01a92b89721d923c19ad60f",
|
"rev": "40aedd8a68c78a656a10a8d62d80c54af59420fb",
|
||||||
"src": "https://github.com/nvim-telescope/telescope.nvim"
|
"src": "https://github.com/nvim-telescope/telescope.nvim"
|
||||||
},
|
},
|
||||||
"trouble.nvim": {
|
"trouble.nvim": {
|
||||||
|
|||||||
Vendored
BIN
Binary file not shown.
+3
-2
@@ -4,12 +4,13 @@ Host *
|
|||||||
IdentityFile ~/.ssh/id_ed25519
|
IdentityFile ~/.ssh/id_ed25519
|
||||||
|
|
||||||
Host moo
|
Host moo
|
||||||
HostName 192.168.5.16
|
# HostName 192.168.5.16
|
||||||
|
HostName 100.78.144.113
|
||||||
User git
|
User git
|
||||||
IdentityFile ~/.ssh/id_ed25519 # Path to your private key
|
IdentityFile ~/.ssh/id_ed25519 # Path to your private key
|
||||||
|
|
||||||
Host oasis
|
Host oasis
|
||||||
HostName 192.168.5.16
|
HostName 100.78.144.113
|
||||||
User andrew
|
User andrew
|
||||||
Port 2222
|
Port 2222
|
||||||
IdentityFile ~/.ssh/id_ed25519
|
IdentityFile ~/.ssh/id_ed25519
|
||||||
|
|||||||
Submodule tmux/.config/tmux/plugins/tpm updated: 99469c4a9b...e261deb1b4
@@ -14,8 +14,10 @@ set -g status-style 'bg=default' # Completely transparent container
|
|||||||
set -g status-left-length 100
|
set -g status-left-length 100
|
||||||
set -g status-left "#[fg=colour4,bg=default,bold] #S #[fg=colour8,nobold]│ "
|
set -g status-left "#[fg=colour4,bg=default,bold] #S #[fg=colour8,nobold]│ "
|
||||||
|
|
||||||
set -g status-right-length 150
|
# set -g status-right-length 150
|
||||||
set -g status-right "#[fg=colour5] %m-%d #[fg=colour8]│ #[fg=colour1] %H:%M "
|
# set -g status-right "#[fg=colour5] %m-%d #[fg=colour8]│ #[fg=colour1] %H:%M "
|
||||||
|
# set -g status-right "#[fg=colour3] #{b:pane_current_path} "
|
||||||
|
set -g status-right ""
|
||||||
|
|
||||||
set -g window-status-current-format "#[fg=colour6,bg=default,bold] #F#I:#W"
|
set -g window-status-current-format "#[fg=colour6,bg=default,bold] #F#I:#W"
|
||||||
set -g window-status-format "#[fg=colour7,bg=default] #I:#W"
|
set -g window-status-format "#[fg=colour7,bg=default] #I:#W"
|
||||||
|
|||||||
Reference in New Issue
Block a user