Compare commits

...

4 Commits

6 changed files with 117 additions and 72 deletions

View File

@@ -3,9 +3,11 @@
# Defaults
export DOTFILES="$HOME/.dotfiles"
# shellcheck source=shared.sh
# shellcheck source=scripts/shared.sh
source "$DOTFILES/scripts/shared.sh"
export COMPLETION_WAITING_DOTS=true
# Run x-load-configs in your terminal to reload the files.
function x-load-configs()
{
@@ -60,6 +62,7 @@ have antigen && {
&& source "${DOTFILES}/config/fzf/fzf.zsh"
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
# shellcheck source=config/zsh/p10k.zsh
export P10K_LOCATION="$XDG_CONFIG_HOME/zsh/p10k.zsh"
[[ ! -f $P10K_LOCATION ]] || source "$P10K_LOCATION"

View File

@@ -61,14 +61,17 @@ scheduler()
# Defines default antigen bundles
x-default-antigen-bundles()
{
# the theme to use
antigen theme romkatv/powerlevel10k
export ZSH_TMUX_AUTOSTART=true
export ZSH_TMUX_CONFIG="$DOTFILES/config/tmux/tmux.conf"
export ZSH_TMUX_UNICODE=true
# these should be always available
antigen bundle autoenv
antigen bundle tmux
antigen bundle colored-man-pages
antigen bundle command-not-found
antigen bundle ssh-agent
antigen bundle MichaelAquilina/zsh-you-should-use
# antigen bundle MichaelAquilina/zsh-you-should-use
antigen bundle jreese/zsh-titles
antigen bundle unixorn/autoupdate-antigen.zshplugin
antigen bundle zsh-users/zsh-completions
@@ -81,4 +84,7 @@ x-default-antigen-bundles()
have php && antigen bundle php
have python && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
have rvm && antigen bundle unixorn/rvm-plugin
# the theme to use
antigen theme romkatv/powerlevel10k
}

View File

@@ -12,6 +12,79 @@ return {
-- Appearance
--
-- The theme of choise, catppuccin
---- https://github.com/catppuccin/nvim
{
"catppuccin/nvim",
name = "catppuccin",
priority = 10000,
enabled = true,
lazy = false,
config = function()
vim.cmd.colorscheme("catppuccin")
end,
opts = {
flavour = "mocha",
transparent_background = true,
dim_inactive = {
enabled = true,
shade = "dark",
percentage = 0.15,
},
integrations = {
aerial = true,
barbecue = {
dim_dirname = true, -- directory name is dimmed by default
bold_basename = true,
dim_context = false,
alt_background = false,
},
cmp = true,
dap = { enabled = true, enable_ui = true },
gitsigns = true,
harpoon = true,
indent_blankline = {
enabled = true,
colored_indent_levels = false,
},
mason = true,
neotree = true,
notify = true,
nvimtree = false,
native_lsp = {
enabled = true,
virtual_text = {
errors = { "italic" },
hints = { "italic" },
warnings = { "italic" },
information = { "italic" },
},
underlines = {
errors = { "underline" },
hints = { "underline" },
warnings = { "underline" },
information = { "underline" },
},
inlay_hints = {
background = true,
},
},
semantic_tokens = true,
symbols_outline = true,
telescope = {
enabled = true,
style = "catppuccin"
},
ts_rainbow = true,
treesitter = true,
lsp_trouble = true,
which_key = true,
},
},
},
"rcarriga/nvim-notify",
-- Status information for LSP.
"j-hui/fidget.nvim",

View File

@@ -1,68 +0,0 @@
--- https://github.com/catppuccin/nvim
return {
"catppuccin/nvim",
name = "catppuccin",
priority = 1000,
enabled = true,
lazy = false,
config = function() vim.cmd.colorscheme("catppuccin") end,
opts = {
flavour = "mocha",
transparent_background = true,
dim_inactive = {
enabled = true,
shade = "dark",
percentage = 0.15,
},
integrations = {
alpha = true,
aerial = true,
barbecue = {
dim_dirname = true, -- directory name is dimmed by default
bold_basename = true,
dim_context = false,
alt_background = false,
},
cmp = true,
dap = { enabled = true, enable_ui = true },
gitsigns = true,
harpoon = true,
indent_blankline = {
enabled = true,
colored_indent_levels = false,
},
mason = true,
neotree = true,
notify = true,
nvimtree = false,
native_lsp = {
enabled = true,
virtual_text = {
errors = { "italic" },
hints = { "italic" },
warnings = { "italic" },
information = { "italic" },
},
underlines = {
errors = { "underline" },
hints = { "underline" },
warnings = { "underline" },
information = { "underline" },
},
inlay_hints = {
background = true,
},
},
semantic_tokens = true,
symbols_outline = true,
telescope = {
enabled = true,
-- style = "nvchad"
},
ts_rainbow = true,
treesitter = true,
lsp_trouble = true,
which_key = true,
},
},
}

View File

@@ -0,0 +1,31 @@
-- A more adventurous wildmenu
-- https://github.com/gelguy/wilder.nvim
return {
'gelguy/wilder.nvim',
config = function()
local wilder = require('wilder')
wilder.setup({ modes = { ':', '/', '?' } })
local gradient = {
'#f4468f', '#fd4a85', '#ff507a', '#ff566f', '#ff5e63',
'#ff6658', '#ff704e', '#ff7a45', '#ff843d', '#ff9036',
'#f89b31', '#efa72f', '#e6b32e', '#dcbe30', '#d2c934',
'#c8d43a', '#bfde43', '#b6e84e', '#aff05b'
}
for i, fg in ipairs(gradient) do
gradient[i] = wilder.make_hl('WilderGradient' .. i, 'Pmenu', { { a = 1 }, { a = 1 }, { foreground = fg } })
end
wilder.set_option('renderer', wilder.popupmenu_renderer({
highlights = {
gradient = gradient, -- must be set
-- selected_gradient key can be set to apply gradient highlighting for the selected candidate.
},
highlighter = wilder.highlighter_with_gradient({
wilder.basic_highlighter(), -- or wilder.lua_fzy_highlighter(),
}),
}))
end,
}

0
config/zsh/p10k.zsh Normal file → Executable file
View File