From e2613dd01a636f43303cfdcc83d78250e6c33884 Mon Sep 17 00:00:00 2001 From: afonso Date: Tue, 7 Jan 2025 16:33:16 +0000 Subject: [PATCH 1/7] [nvim] added everforest and cleaned up unused plugins --- .config/nvim/lua/plugins/colorscheme.lua | 4 +++- .config/nvim/lua/plugins/lsp.lua | 3 +++ .config/nvim/lua/plugins/ui.lua | 15 +-------------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua index f77806e..147eea0 100644 --- a/.config/nvim/lua/plugins/colorscheme.lua +++ b/.config/nvim/lua/plugins/colorscheme.lua @@ -8,5 +8,7 @@ return { "EdenEast/nightfox.nvim", event = "VeryLazy", priority = 1000 - } + }, + { "blazkowolf/gruber-darker.nvim" }, + { "sainnhe/everforest" } } diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index 066291b..3a813c7 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -129,6 +129,9 @@ return { capabilities = capabilities, filetypes = { 'haskell', 'lhaskell', 'cabal' }, }) + lspconfig["clangd"].setup({ + capabilities = capabilities, + }) end, }, { diff --git a/.config/nvim/lua/plugins/ui.lua b/.config/nvim/lua/plugins/ui.lua index 01c7cf3..2538d63 100644 --- a/.config/nvim/lua/plugins/ui.lua +++ b/.config/nvim/lua/plugins/ui.lua @@ -9,12 +9,6 @@ return { vim.g.tpipeline_statusline = '%=%l:%c' end }, - { - 'kevinhwang91/nvim-bqf', - event = "VeryLazy", - ft = 'qf' - }, - { "folke/noice.nvim", event = "VeryLazy", @@ -40,13 +34,6 @@ return { "MunifTanjim/nui.nvim", } }, - { - "folke/zen-mode.nvim", - event = "VeryLazy", - opts = { - vim.keymap.set("n", "z", " ZenMode ", { noremap = true, silent = true }), - }, - }, { 'kevinhwang91/nvim-ufo', dependencies = 'kevinhwang91/promise-async', @@ -102,5 +89,5 @@ return { config = function() require 'colorizer'.setup() end - } + }, } From 6febba69a8c3bd5f6cc8db6de6dcdbfa835c2e08 Mon Sep 17 00:00:00 2001 From: afonso Date: Tue, 7 Jan 2025 16:33:32 +0000 Subject: [PATCH 2/7] [nvim] fix winbar on transparent bg --- .config/nvim/lua/winbar.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim/lua/winbar.lua b/.config/nvim/lua/winbar.lua index 8533b7d..436ea0d 100644 --- a/.config/nvim/lua/winbar.lua +++ b/.config/nvim/lua/winbar.lua @@ -47,7 +47,7 @@ function M.render() local normal_fg_color = vim.api.nvim_get_hl_by_name('Normal', true).foreground -- Convert the RGB color to a hex string - local bg_hex_color = string.format('#%06x', normal_bg_color) + local bg_hex_color = normal_bg_color and string.format('#%06x', normal_bg_color) or 'transparent' -- Convert the RGB color to a hex string local fg_hex_color = string.format('#%06x', normal_fg_color) From a159dcbceab76f0c392543491f63e29da5d2334f Mon Sep 17 00:00:00 2001 From: afonso Date: Tue, 7 Jan 2025 16:33:46 +0000 Subject: [PATCH 3/7] [tmux] added prefix+t as theme changer --- .config/tmux/tmux_binds.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.config/tmux/tmux_binds.conf b/.config/tmux/tmux_binds.conf index 2577479..ef3c724 100644 --- a/.config/tmux/tmux_binds.conf +++ b/.config/tmux/tmux_binds.conf @@ -27,5 +27,8 @@ bind-key 'o' if-shell "$is_vim" 'send-keys F8' 'select-pane -R' unbind s bind-key 's' display-popup -E -w 60% -h 40% "~/.local/bin/tms" +unbind t +bind-key 't' display-popup -E -w 60% -h 40% "~/.local/bin/change-theme.sh" + unbind g bind-key 'g' display-popup -d '#{pane_current_path}' -E -w 100% -h 100% "lazygit" From 23d4f1bb83b3d2477004f11b1cb4c0b25cf0b305 Mon Sep 17 00:00:00 2001 From: afonso Date: Tue, 7 Jan 2025 16:34:09 +0000 Subject: [PATCH 4/7] [zsh] removed themes and conda --- .config/zsh/.zshrc | 22 ---- .config/zsh/themes/catppuccin_frappe.zsh | 104 ----------------- .config/zsh/themes/catppuccin_latte.zsh | 104 ----------------- .config/zsh/themes/gruvbox_dark.zsh | 136 ---------------------- .config/zsh/themes/gruvbox_light.zsh | 141 ----------------------- 5 files changed, 507 deletions(-) delete mode 100644 .config/zsh/themes/catppuccin_frappe.zsh delete mode 100644 .config/zsh/themes/catppuccin_latte.zsh delete mode 100644 .config/zsh/themes/gruvbox_dark.zsh delete mode 100644 .config/zsh/themes/gruvbox_light.zsh diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 34e0533..31c399d 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -18,34 +18,12 @@ export EDITOR=nvim export VISUAL=nvim export READER=mupdf -#THEME -source $ZDOTDIR/themes/gruvbox_dark.zsh - #Prompt source $ZDOTDIR/prompts/simple-two-line.zsh source $ZDOTDIR/functions.zsh source $ZDOTDIR/plugins.zsh -# >>> conda initialize >>> -# !! Contents within this block are managed by 'conda init' !! -__conda_setup="$('$HOME/.miniforge3/bin/conda' 'shell.bash' 'hook' 2> /dev/null)" -if [ $? -eq 0 ]; then - eval "$__conda_setup" -else - if [ -f "$HOME/.miniforge3/etc/profile.d/conda.sh" ]; then - . "$HOME/.miniforge3/etc/profile.d/conda.sh" - else - export PATH="$HOME/.miniforge3/bin:$PATH" - fi -fi -unset __conda_setup - -if [ -f "$HOME/.miniforge3/etc/profile.d/mamba.sh" ]; then - . "$HOME/.miniforge3/etc/profile.d/mamba.sh" -fi -# <<< conda initialize <<< - if [[ $(uname) == "Darwin" ]]; then eval "$(/opt/homebrew/bin/brew shellenv)" fi diff --git a/.config/zsh/themes/catppuccin_frappe.zsh b/.config/zsh/themes/catppuccin_frappe.zsh deleted file mode 100644 index 023ad23..0000000 --- a/.config/zsh/themes/catppuccin_frappe.zsh +++ /dev/null @@ -1,104 +0,0 @@ -# Catppuccin Frappe Theme (for zsh-syntax-highlighting) -# -# Paste this files contents inside your ~/.zshrc before you activate zsh-syntax-highlighting -ZSH_HIGHLIGHT_HIGHLIGHTERS=(main cursor) -typeset -gA ZSH_HIGHLIGHT_STYLES - -# Main highlighter styling: https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md -# -## General -### Diffs -### Markup -## Classes -## Comments -ZSH_HIGHLIGHT_STYLES[comment]='fg=#626880' -## Constants -## Entitites -## Functions/methods -ZSH_HIGHLIGHT_STYLES[alias]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[global-alias]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[function]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[command]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[precommand]='fg=#a6d189,italic' -ZSH_HIGHLIGHT_STYLES[autodirectory]='fg=#ef9f76,italic' -ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=#ef9f76' -ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=#ef9f76' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=#ca9ee6' -## Keywords -## Built ins -ZSH_HIGHLIGHT_STYLES[builtin]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=#a6d189' -## Punctuation -ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#e78284' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-unquoted]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]='fg=#e78284' -ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=#e78284' -ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=#e78284' -## Serializable / Configuration Languages -## Storage -## Strings -ZSH_HIGHLIGHT_STYLES[command-substitution-quoted]='fg=#e5c890' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-quoted]='fg=#e5c890' -ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#e5c890' -ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=#ea999c' -ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#e5c890' -ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=#ea999c' -ZSH_HIGHLIGHT_STYLES[rc-quote]='fg=#e5c890' -## Variables -ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=#ea999c' -ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[assign]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[named-fd]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[numeric-fd]='fg=#c6d0f5' -## No category relevant in spec -ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#ea999c' -ZSH_HIGHLIGHT_STYLES[path]='fg=#c6d0f5,underline' -ZSH_HIGHLIGHT_STYLES[path_pathseparator]='fg=#e78284,underline' -ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=#c6d0f5,underline' -ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]='fg=#e78284,underline' -ZSH_HIGHLIGHT_STYLES[globbing]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=#ca9ee6' -#ZSH_HIGHLIGHT_STYLES[command-substitution]='fg=?' -#ZSH_HIGHLIGHT_STYLES[command-substitution-unquoted]='fg=?' -#ZSH_HIGHLIGHT_STYLES[process-substitution]='fg=?' -#ZSH_HIGHLIGHT_STYLES[arithmetic-expansion]='fg=?' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument-unclosed]='fg=#ea999c' -ZSH_HIGHLIGHT_STYLES[redirection]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[arg0]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[default]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[cursor]='fg=#c6d0f5' - -#Pure prompt -# Define cappuccin frappe colors -pure_prompt_colors() { - local colors - colors=( - execution_time='%F{#bdae93}' # The execution time of the last command when exceeding PURE_CMD_MAX_EXEC_TIME. - git:arrow='%F{#bdae93}' # For PURE_GIT_UP_ARROW and PURE_GIT_DOWN_ARROW. - git:stash='%F{#bdae93}' # For PURE_GIT_STASH_SYMBOL. - git:branch='%F{#98971a}' # The name of the current branch when in a Git repository. - git:branch:cached='%F{#cc241d}' # The name of the current branch when the data isn't fresh. - git:action='%F{#b16286}' # The current action in progress (cherry-pick, rebase, etc.) when in a Git repository. - git:dirty='%F{#d65d0e}' # The asterisk showing the branch is dirty. - host='%F{#7c6f64}' # The hostname when on a remote machine. - path='%F{#458588}' # The current path, for example, PWD. - prompt:error='%F{#fb4934}' # The PURE_PROMPT_SYMBOL when the previous command has failed. - prompt:success='%F{#98971a}' # The PURE_PROMPT_SYMBOL when the previous command has succeeded. - prompt:continuation='%F{#b16286}' # The color for showing the state of the parser in the continuation prompt (PS2). - suspended_jobs='%F{#fb4934}' # The ✦ symbol indicates that jobs are running in the background. - user='%F{#7c6f64}' # The username when on remote machine. - user:root='%F{default}' # The username when the user is root. - virtualenv='%F{#b16286}' # The name of the Python virtualenv when in use. - ) - (( $#colors )) || echo $colors -} - -# Apply cappuccin frappe colors to Zsh Pure prompt -for color in $(pure_prompt_colors); do - zstyle ":prompt:pure:$color" color "$color" -done diff --git a/.config/zsh/themes/catppuccin_latte.zsh b/.config/zsh/themes/catppuccin_latte.zsh deleted file mode 100644 index 7b9c6c5..0000000 --- a/.config/zsh/themes/catppuccin_latte.zsh +++ /dev/null @@ -1,104 +0,0 @@ -# Catppuccin Latte Theme (for zsh-syntax-highlighting) -# -# Paste this files contents inside your ~/.zshrc before you activate zsh-syntax-highlighting -ZSH_HIGHLIGHT_HIGHLIGHTERS=(main cursor) -typeset -gA ZSH_HIGHLIGHT_STYLES - -# Main highlighter styling: https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md -# -## General -### Diffs -### Markup -## Classes -## Comments -ZSH_HIGHLIGHT_STYLES[comment]='fg=#acb0be' -## Constants -## Entitites -## Functions/methods -ZSH_HIGHLIGHT_STYLES[alias]='fg=#40a02b' -ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=#40a02b' -ZSH_HIGHLIGHT_STYLES[global-alias]='fg=#40a02b' -ZSH_HIGHLIGHT_STYLES[function]='fg=#40a02b' -ZSH_HIGHLIGHT_STYLES[command]='fg=#40a02b' -ZSH_HIGHLIGHT_STYLES[precommand]='fg=#40a02b,italic' -ZSH_HIGHLIGHT_STYLES[autodirectory]='fg=#fe640b,italic' -ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=#fe640b' -ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=#fe640b' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=#8839ef' -## Keywords -## Built ins -ZSH_HIGHLIGHT_STYLES[builtin]='fg=#40a02b' -ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=#40a02b' -ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=#40a02b' -## Punctuation -ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#d20f39' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-unquoted]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]='fg=#d20f39' -ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=#d20f39' -ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=#d20f39' -## Serializable / Configuration Languages -## Storage -## Strings -ZSH_HIGHLIGHT_STYLES[command-substitution-quoted]='fg=#df8e1d' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-quoted]='fg=#df8e1d' -ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#df8e1d' -ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=#e64553' -ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#df8e1d' -ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=#e64553' -ZSH_HIGHLIGHT_STYLES[rc-quote]='fg=#df8e1d' -## Variables -ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=#e64553' -ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[assign]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[named-fd]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[numeric-fd]='fg=#4c4f69' -## No category relevant in spec -ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#e64553' -ZSH_HIGHLIGHT_STYLES[path]='fg=#4c4f69,underline' -ZSH_HIGHLIGHT_STYLES[path_pathseparator]='fg=#d20f39,underline' -ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=#4c4f69,underline' -ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]='fg=#d20f39,underline' -ZSH_HIGHLIGHT_STYLES[globbing]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=#8839ef' -#ZSH_HIGHLIGHT_STYLES[command-substitution]='fg=?' -#ZSH_HIGHLIGHT_STYLES[command-substitution-unquoted]='fg=?' -#ZSH_HIGHLIGHT_STYLES[process-substitution]='fg=?' -#ZSH_HIGHLIGHT_STYLES[arithmetic-expansion]='fg=?' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument-unclosed]='fg=#e64553' -ZSH_HIGHLIGHT_STYLES[redirection]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[arg0]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[default]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[cursor]='fg=#4c4f69' - -#Pure prompt -# Define cappuccin latte colors -pure_prompt_colors() { - local colors - colors=( - execution_time='%F{#bdae93}' # The execution time of the last command when exceeding PURE_CMD_MAX_EXEC_TIME. - git:arrow='%F{#458588}' # For PURE_GIT_UP_ARROW and PURE_GIT_DOWN_ARROW. - git:stash='%F{#bdae93}' # For PURE_GIT_STASH_SYMBOL. - git:branch='%F{#98971a}' # The name of the current branch when in a Git repository. - git:branch:cached='%F{#cc241d}' # The name of the current branch when the data isn't fresh. - git:action='%F{#b16286}' # The current action in progress (cherry-pick, rebase, etc.) when in a Git repository. - git:dirty='%F{#d65d0e}' # The asterisk showing the branch is dirty. - host='%F{#7c6f64}' # The hostname when on a remote machine. - path='%F{#458588}' # The current path, for example, PWD. - prompt:error='%F{#cc241d}' # The PURE_PROMPT_SYMBOL when the previous command has failed. - prompt:success='%F{#98971a}' # The PURE_PROMPT_SYMBOL when the previous command has succeeded. - prompt:continuation='%F{#b16286}' # The color for showing the state of the parser in the continuation prompt (PS2). - suspended_jobs='%F{#cc241d}' # The ✦ symbol indicates that jobs are running in the background. - user='%F{#7c6f64}' # The username when on remote machine. - user:root='%F{default}' # The username when the user is root. - virtualenv='%F{#b16286}' # The name of the Python virtualenv when in use. - ) - (( $#colors )) || echo $colors -} - -# Apply cappuccin latte colors to Zsh Pure prompt -for color in $(pure_prompt_colors); do - zstyle ":prompt:pure:$color" color "$color" -done diff --git a/.config/zsh/themes/gruvbox_dark.zsh b/.config/zsh/themes/gruvbox_dark.zsh deleted file mode 100644 index 6d6c86b..0000000 --- a/.config/zsh/themes/gruvbox_dark.zsh +++ /dev/null @@ -1,136 +0,0 @@ -# Gruvbox Material Dark Medium Theme (for zsh-syntax-highlighting) -# -# Paste this file's contents inside your ~/.zshrc before you activate zsh-syntax-highlighting -ZSH_HIGHLIGHT_HIGHLIGHTERS=(main cursor) -typeset -gA ZSH_HIGHLIGHT_STYLES - -# Main highlighter styling: https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md -# -## General -### Diffs -### Markup -## Classes -## Comments -ZSH_HIGHLIGHT_STYLES[comment]='fg=#928374' -## Constants -## Entitites -## Functions/methods -ZSH_HIGHLIGHT_STYLES[alias]='fg=#b8bb26' -ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=#b8bb26' -ZSH_HIGHLIGHT_STYLES[global-alias]='fg=#b8bb26' -ZSH_HIGHLIGHT_STYLES[function]='fg=#b8bb26' -ZSH_HIGHLIGHT_STYLES[command]='fg=#b8bb26' -ZSH_HIGHLIGHT_STYLES[precommand]='fg=#b8bb26,italic' -ZSH_HIGHLIGHT_STYLES[autodirectory]='fg=#fe8019,italic' -ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=#fe8019' -ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=#fe8019' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=#d3869b' -## Keywords -## Built ins -ZSH_HIGHLIGHT_STYLES[builtin]='fg=#b8bb26' -ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=#b8bb26' -ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=#b8bb26' -## Punctuation -ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#d4be98' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-unquoted]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]='fg=#ebdbb2' -ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=#ebdbb2' -ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=#ebdbb2' -## Serializable / Configuration Languages -## Storage -## Strings -ZSH_HIGHLIGHT_STYLES[command-substitution-quoted]='fg=#fabd2f' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-quoted]='fg=#fabd2f' -ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=#fb4934' -ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=#fb4934' -ZSH_HIGHLIGHT_STYLES[rc-quote]='fg=#83a598' -## Variables -ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=#fb4934' -ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[assign]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[named-fd]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[numeric-fd]='fg=#83a598' -## No category relevant in spec -ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#fb4934' -ZSH_HIGHLIGHT_STYLES[path]='fg=#83a598,underline' -ZSH_HIGHLIGHT_STYLES[path_pathseparator]='fg=#d4be98,underline' -ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=#83a598,underline' -ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]='fg=#d4be98,underline' -ZSH_HIGHLIGHT_STYLES[globbing]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=#d3869b' -#ZSH_HIGHLIGHT_STYLES[command-substitution]='fg=?' -#ZSH_HIGHLIGHT_STYLES[command-substitution-unquoted]='fg=?' -#ZSH_HIGHLIGHT_STYLES[process-substitution]='fg=?' -#ZSH_HIGHLIGHT_STYLES[arithmetic-expansion]='fg=?' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument-unclosed]='fg=#fb4934' -ZSH_HIGHLIGHT_STYLES[redirection]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[arg0]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[default]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[cursor]='fg=#83a598' -#ZSH Syntax Highlighting -ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#928374,italic,underline" - -#Pure prompt -# Define gruvbox dark colors -pure_prompt_colors() { - local colors - colors=( - execution_time='%F{#fabd2f}' # The execution time of the last command when exceeding PURE_CMD_MAX_EXEC_TIME. - git:arrow='%F{#83a598}' # For PURE_GIT_UP_ARROW and PURE_GIT_DOWN_ARROW. - git:stash='%F{#83a598}' # For PURE_GIT_STASH_SYMBOL. - git:branch='%F{#b8bb26}' # The name of the current branch when in a Git repository. - git:branch:cached='%F{#fb4934}' # The name of the current branch when the data isn't fresh. - git:action='%F{#d3869b}' # The current action in progress (cherry-pick, rebase, etc.) when in a Git repository. - git:dirty='%F{#fe8019}' # The asterisk showing the branch is dirty. - host='%F{#ebdbb2}' # The hostname when on a remote machine. - path='%F{#83a598}' # The current path, for example, PWD. - prompt:error='%F{#fb4934}' # The PURE_PROMPT_SYMBOL when the previous command has failed. - prompt:success='%F{#b16286}' # The PURE_PROMPT_SYMBOL when the previous command has succeeded. - prompt:continuation='%F{#d3869b}' # The color for showing the state of the parser in the continuation prompt (PS2). - suspended_jobs='%F{#fb4934}' # The ✦ symbol indicates that jobs are running in the background. - user='%F{#ebdbb2}' # The username when on remote machine. - user:root='%F{default}' # The username when the user is root. - virtualenv='%F{#d3869b}' # The name of the Python virtualenv when in use. - ) - (( $#colors )) || echo $colors -} - -# FZF -# # Scheme name: Gruvbox dark, hard -# Scheme system: base16 -# Scheme author: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) -# Template author: Tinted Theming (https://github.com/tinted-theming) - -_gen_fzf_default_opts() { - -local color00='#1d2021' -local color01='#3c3836' -local color02='#504945' -local color03='#665c54' -local color04='#bdae93' -local color05='#d5c4a1' -local color06='#ebdbb2' -local color07='#fbf1c7' -local color08='#fb4934' -local color09='#fe8019' -local color0A='#fabd2f' -local color0B='#b8bb26' -local color0C='#8ec07c' -local color0D='#83a598' -local color0E='#d3869b' -local color0F='#d65d0e' - -export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS"\ -" --color=bg+:$color01,bg:$color00,spinner:$color0C,hl:$color0D"\ -" --color=fg:$color04,header:$color0D,info:$color0A,pointer:$color0C"\ -" --color=marker:$color0C,fg+:$color06,prompt:$color0A,hl+:$color0D" - -} - -_gen_fzf_default_opts - diff --git a/.config/zsh/themes/gruvbox_light.zsh b/.config/zsh/themes/gruvbox_light.zsh deleted file mode 100644 index 5a0c624..0000000 --- a/.config/zsh/themes/gruvbox_light.zsh +++ /dev/null @@ -1,141 +0,0 @@ -# Gruvbox Light Theme (for zsh-syntax-highlighting) -# -# Paste this file's contents inside your ~/.zshrc before you activate zsh-syntax-highlighting -ZSH_HIGHLIGHT_HIGHLIGHTERS=(main cursor) -typeset -gA ZSH_HIGHLIGHT_STYLES - -# Main highlighter styling: https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md -# -## General -### Diffs -### Markup -## Classes -## Comments -ZSH_HIGHLIGHT_STYLES[comment]='fg=#928374' -## Constants -## Entitites -## Functions/methods -ZSH_HIGHLIGHT_STYLES[alias]='fg=#8ec07c' -ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=#8ec07c' -ZSH_HIGHLIGHT_STYLES[global-alias]='fg=#8ec07c' -ZSH_HIGHLIGHT_STYLES[function]='fg=#8ec07c' -ZSH_HIGHLIGHT_STYLES[command]='fg=#8ec07c' -ZSH_HIGHLIGHT_STYLES[precommand]='fg=#8ec07c,italic' -ZSH_HIGHLIGHT_STYLES[autodirectory]='fg=#fe8019,italic' -ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=#fe8019' -ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=#fe8019' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=#d3869b' -## Keywords -## Built ins -ZSH_HIGHLIGHT_STYLES[builtin]='fg=#8ec07c' -ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=#8ec07c' -ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=#8ec07c' -## Punctuation -ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#fabd2f' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-unquoted]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]='fg=#ebdbb2' -ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=#ebdbb2' -ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=#ebdbb2' -## Serializable / Configuration Languages -## Storage -## Strings -ZSH_HIGHLIGHT_STYLES[command-substitution-quoted]='fg=#fabd2f' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-quoted]='fg=#fabd2f' -ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=#fb4934' -ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=#fb4934' -ZSH_HIGHLIGHT_STYLES[rc-quote]='fg=#83a598' -## Variables -ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=#fb4934' -ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[assign]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[named-fd]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[numeric-fd]='fg=#83a598' -## No category relevant in spec -ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#fb4934' -ZSH_HIGHLIGHT_STYLES[path]='fg=#83a598,underline' -ZSH_HIGHLIGHT_STYLES[path_pathseparator]='fg=#fabd2f,underline' -ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=#83a598,underline' -ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]='fg=#fabd2f,underline' -ZSH_HIGHLIGHT_STYLES[globbing]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=#d3869b' -#ZSH_HIGHLIGHT_STYLES[command-substitution]='fg=?' -#ZSH_HIGHLIGHT_STYLES[command-substitution-unquoted]='fg=?' -#ZSH_HIGHLIGHT_STYLES[process-substitution]='fg=?' -#ZSH_HIGHLIGHT_STYLES[arithmetic-expansion]='fg=?' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument-unclosed]='fg=#fb4934' -ZSH_HIGHLIGHT_STYLES[redirection]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[arg0]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[default]='fg=#83a598' -ZSH_HIGHLIGHT_STYLES[cursor]='fg=#83a598' - -#Pure prompt -# Define gruvbox light colors -pure_prompt_colors() { - local colors - colors=( - execution_time='%F{#d65d0e}' # The execution time of the last command when exceeding PURE_CMD_MAX_EXEC_TIME. - git:arrow='%F{#458588}' # For PURE_GIT_UP_ARROW and PURE_GIT_DOWN_ARROW. - git:stash='%F{#458588}' # For PURE_GIT_STASH_SYMBOL. - git:branch='%F{#98971a}' # The name of the current branch when in a Git repository. - git:branch:cached='%F{#cc241d}' # The name of the current branch when the data isn't fresh. - git:action='%F{#b16286}' # The current action in progress (cherry-pick, rebase, etc.) when in a Git repository. - git:dirty='%F{#d65d0e}' # The asterisk showing the branch is dirty. - host='%F{#3c3836}' # The hostname when on a remote machine. - path='%F{#458588}' # The current path, for example, PWD. - prompt:error='%F{#cc241d}' # The PURE_PROMPT_SYMBOL when the previous command has failed. - prompt:success='%F{#b16286}' # The PURE_PROMPT_SYMBOL when the previous command has succeeded. - prompt:continuation='%F{#b16286}' # The color for showing the state of the parser in the continuation prompt (PS2). - suspended_jobs='%F{#cc241d}' # The ✦ symbol indicates that jobs are running in the background. - user='%F{#3c3836}' # The username when on remote machine. - user:root='%F{default}' # The username when the user is root. - virtualenv='%F{#b16286}' # The name of the Python virtualenv when in use. - ) - (( $#colors )) || echo $colors -} - -# Apply gruvbox light colors to Zsh Pure prompt -for color in $(pure_prompt_colors); do - zstyle ":prompt:pure:$color" color "$color" -done - - -#FZF -# Scheme name: Gruvbox light, soft -# Scheme system: base16 -# Scheme author: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) -# Template author: Tinted Theming (https://github.com/tinted-theming) - -_gen_fzf_default_opts() { - -local color00='#f2e5bc' -local color01='#ebdbb2' -local color02='#d5c4a1' -local color03='#bdae93' -local color04='#665c54' -local color05='#504945' -local color06='#3c3836' -local color07='#282828' -local color08='#9d0006' -local color09='#af3a03' -local color0A='#b57614' -local color0B='#79740e' -local color0C='#427b58' -local color0D='#076678' -local color0E='#8f3f71' -local color0F='#d65d0e' - -export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS"\ -" --color=bg+:$color01,bg:$color00,spinner:$color0C,hl:$color0D"\ -" --color=fg:$color04,header:$color0D,info:$color0A,pointer:$color0C"\ -" --color=marker:$color0C,fg+:$color06,prompt:$color0A,hl+:$color0D" - -zstyle ":fzf-tab:*" fzf-flags - -} - -_gen_fzf_default_opts From 62fc9944267bb3e852c37bd8d107e4a7fb1a5704 Mon Sep 17 00:00:00 2001 From: afonso Date: Tue, 7 Jan 2025 16:34:32 +0000 Subject: [PATCH 5/7] [scripts] added everforest variants to change-theme --- .local/bin/change-theme.sh | 89 ++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/.local/bin/change-theme.sh b/.local/bin/change-theme.sh index 0f1647d..ef91b80 100755 --- a/.local/bin/change-theme.sh +++ b/.local/bin/change-theme.sh @@ -8,7 +8,6 @@ typeset -A themes themes[catppuccin-latte]=\ 'alacritty_theme_name=catppuccin_latte ghostty_theme_name=catppuccin-latte - zsh_theme_name=catppuccin_latte nvim_color_scheme=catppuccin-latte background_color=#eff1f5 tmux_bar_unfocused_fg=#4c4f69 @@ -19,7 +18,6 @@ themes[catppuccin-latte]=\ themes[catppuccin-frappe]=\ 'alacritty_theme_name=catppuccin_frappe ghostty_theme_name=catppuccin-frappe - zsh_theme_name=catppuccin_frappe nvim_color_scheme=catppuccin-frappe background_color=#303446 tmux_bar_unfocused_fg=#c6d0f5 @@ -30,7 +28,6 @@ themes[catppuccin-frappe]=\ themes[gruvbox-original-hard-dark]=\ 'alacritty_theme_name=gruvbox_dark ghostty_theme_name=GruvboxDarkHard - zsh_theme_name=gruvbox_dark nvim_color_scheme=gruvbox-material background_color=#1d2021 tmux_bar_unfocused_fg=#ebdbb2 @@ -43,10 +40,24 @@ vim.g.gruvbox_material_foreground=\"original\" vim.opt.background=\"dark\"" kitty_theme="Gruvbox Dark Hard"' +themes[gruvbox-original-medium-light]=\ +'alacritty_theme_name=gruvbox_light + ghostty_theme_name=GruvboxLight + nvim_color_scheme=gruvbox-material + background_color=#fbf1c7 + tmux_bar_unfocused_fg=#3c3836 + tmux_bar_focused_bg=#3c3836 + tmux_bar_focused_fg=#fbf1c7 + additional_nvim_commands="\ +vim.g.gruvbox_material_better_performance=1 +vim.g.gruvbox_material_background=\"medium\" +vim.g.gruvbox_material_foreground=\"original\" +vim.opt.background=\"light\"" + kitty_theme="Gruvbox Light Medium"' + themes[gruvbox-material-hard-dark]=\ 'alacritty_theme_name=gruvbox_dark ghostty_theme_name=gruvbox-material-hard-dark - zsh_theme_name=gruvbox_dark nvim_color_scheme=gruvbox-material background_color=#1d2021 tmux_bar_unfocused_fg=#d4be98 @@ -62,7 +73,6 @@ vim.opt.background=\"dark\"" themes[gruvbox-material-medium-dark]=\ 'alacritty_theme_name=gruvbox_dark ghostty_theme_name=gruvbox-material-medium-dark - zsh_theme_name=gruvbox_dark nvim_color_scheme=gruvbox-material background_color=#282828 tmux_bar_unfocused_fg=#d4be98 @@ -78,7 +88,6 @@ vim.opt.background=\"dark\"" themes[gruvbox-material-soft-dark]=\ 'alacritty_theme_name=gruvbox_dark ghostty_theme_name=gruvbox-material-soft-dark - zsh_theme_name=gruvbox_dark nvim_color_scheme=gruvbox-material background_color=#32302f tmux_bar_unfocused_fg=#d4be98 @@ -94,7 +103,6 @@ vim.opt.background=\"dark\"" themes[gruvbox-material-hard-light]=\ 'alacritty_theme_name=gruvbox_light ghostty_theme_name=gruvbox-material-hard-light - zsh_theme_name=gruvbox_light nvim_color_scheme=gruvbox-material background_color=#f9f5d7 tmux_bar_unfocused_fg=#654735 @@ -110,7 +118,6 @@ vim.opt.background=\"light\"" themes[gruvbox-material-medium-light]=\ 'alacritty_theme_name=gruvbox_light ghostty_theme_name=gruvbox-material-medium-light - zsh_theme_name=gruvbox_light background_color=#fbf1c7 tmux_bar_unfocused_fg=#654735 tmux_bar_focused_bg=#654735 @@ -126,7 +133,6 @@ vim.opt.background=\"light\"" themes[gruvbox-material-soft-light]=\ 'alacritty_theme_name=gruvbox_light ghostty_theme_name=gruvbox-material-soft-light - zsh_theme_name=gruvbox_light background_color=#f2e5bc tmux_bar_unfocused_fg=#654735 tmux_bar_focused_bg=#654735 @@ -139,30 +145,41 @@ vim.g.gruvbox_material_foreground=\"material\" vim.opt.background=\"light\"" kitty_theme="Gruvbox Material Light Soft"' -themes[gruvbox-original-medium-light]=\ -'alacritty_theme_name=gruvbox_light - ghostty_theme_name=GruvboxLight - zsh_theme_name=gruvbox_light - nvim_color_scheme=gruvbox-material - background_color=#fbf1c7 - tmux_bar_unfocused_fg=#3c3836 - tmux_bar_focused_bg=#3c3836 - tmux_bar_focused_fg=#fbf1c7 +themes[everforest-hard-dark]=\ +'ghostty_theme_name=everforest-hard-dark + background_color=#272e33 + tmux_bar_unfocused_fg=#3c4841 + tmux_bar_focused_bg=#3c4841 + tmux_bar_focused_fg=#d3c6aa + nvim_color_scheme=everforest additional_nvim_commands="\ -vim.g.gruvbox_material_better_performance=1 -vim.g.gruvbox_material_background=\"medium\" -vim.g.gruvbox_material_foreground=\"original\" -vim.opt.background=\"light\"" - kitty_theme="Gruvbox Light Medium"' +vim.g.everforest_better_performance=1 +vim.g.everforest_background=\"hard\" +vim.opt.background=\"dark\""' + +themes[everforest-medium-dark]=\ +'ghostty_theme_name=everforest-medium-dark + background_color=#2d353b + tmux_bar_unfocused_fg=#425047 + tmux_bar_focused_bg=#425047 + tmux_bar_focused_fg=#d3c6aa + nvim_color_scheme=everforest + additional_nvim_commands="\ +vim.g.everforest_better_performance=1 +vim.g.everforest_background=\"medium\" +vim.opt.background=\"dark\""' -# Function to reload Zsh sessions -reload_zsh_sessions() { - local pids - pids=$(pgrep zsh) - for pid in $pids; do - kill -USR1 "$pid" 2>/dev/null || true - done -} +themes[everforest-soft-dark]=\ +'ghostty_theme_name=everforest-soft-dark + background_color=#333c43 + tmux_bar_unfocused_fg=#48584e + tmux_bar_focused_bg=#48584e + tmux_bar_focused_fg=#d3c6aa + nvim_color_scheme=everforest + additional_nvim_commands="\ +vim.g.everforest_better_performance=1 +vim.g.everforest_background=\"soft\" +vim.opt.background=\"dark\""' # Function to reload Neovim reload_neovim() { @@ -177,21 +194,19 @@ reload_neovim() { # Change common settings change_theme() { - sed -i '' -e "s|import = \[\"~/.config/alacritty/themes/.*\"\]|import = [\"~/.config/alacritty/themes/${alacritty_theme_name}.toml\"]|g" ~/.config/alacritty/alacritty.toml - sed -i '' -e "s|source \$ZDOTDIR/themes/.*zsh|source \$ZDOTDIR/themes/${zsh_theme_name}.zsh|g" "$ZDOTDIR"/.zshrc - reload_zsh_sessions + [[ -n "$alacritty_theme_name" ]] && sed -i '' -e "s|import = \[\"~/.config/alacritty/themes/.*\"\]|import = [\"~/.config/alacritty/themes/${alacritty_theme_name}.toml\"]|g" ~/.config/alacritty/alacritty.toml + [[ -n "$ghostty_theme_name" ]] && sed -i '' -E "s/theme =.*$/theme = $ghostty_theme_name/" ~/.config/ghostty/config + [[ -n "$kitty_theme" ]] && kitten themes --reload-in=all "$kitty_theme" sed -i '' -E "s/set -g status-bg .*$/set -g status-bg \"$background_color\"/" ~/.config/tmux/tmux_status_bar.conf sed -i '' -E "s/set -g @unfocused-fg .*$/set -g @unfocused-fg \"$tmux_bar_unfocused_fg\"/" ~/.config/tmux/tmux_status_bar.conf sed -i '' -E "s/set -g @focused-bg .*$/set -g @focused-bg \"$tmux_bar_focused_bg\"/" ~/.config/tmux/tmux_status_bar.conf sed -i '' -E "s/set -g @focused-fg .*$/set -g @focused-fg \"$tmux_bar_focused_fg\"/" ~/.config/tmux/tmux_status_bar.conf tmux source-file ~/.config/tmux/tmux.conf - [[ -n "$kitty_theme" ]] && kitten themes --reload-in=all "$kitty_theme" reload_neovim "$nvim_color_scheme" "$additional_nvim_commands" - sed -i '' -E "s/theme =.*$/theme = $ghostty_theme_name/" ~/.config/ghostty/config } # Menu selection -theme_selection=$(printf '%s\n' "${(@k)themes}" | fzf --prompt="Select a theme: " --height=40%) +theme_selection=$(printf '%s\n' "${(@k)themes}" | fzf --prompt="Select a theme: ") if [[ -n "$theme_selection" ]]; then eval "${themes[$theme_selection]}" change_theme From 280caa6c9837426e6795f6f79c51b4a42c37d86f Mon Sep 17 00:00:00 2001 From: afonso Date: Tue, 7 Jan 2025 16:34:52 +0000 Subject: [PATCH 6/7] [ghostty] added everforest themes --- .config/ghostty/themes/everforest-hard-dark | 21 +++++++++++++++++++ .config/ghostty/themes/everforest-medium-dark | 21 +++++++++++++++++++ .config/ghostty/themes/everforest-soft-dark | 21 +++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 .config/ghostty/themes/everforest-hard-dark create mode 100644 .config/ghostty/themes/everforest-medium-dark create mode 100644 .config/ghostty/themes/everforest-soft-dark diff --git a/.config/ghostty/themes/everforest-hard-dark b/.config/ghostty/themes/everforest-hard-dark new file mode 100644 index 0000000..a0fb47d --- /dev/null +++ b/.config/ghostty/themes/everforest-hard-dark @@ -0,0 +1,21 @@ +palette = 0=#7a8478 +palette = 1=#e67e80 +palette = 2=#a7c080 +palette = 3=#dbbc7f +palette = 4=#7fbbb3 +palette = 5=#d699b6 +palette = 6=#83c092 +palette = 7=#f2efdf +palette = 8=#a6b0a0 +palette = 9=#f85552 +palette = 10=#8da101 +palette = 11=#dfa000 +palette = 12=#3a94c5 +palette = 13=#df69ba +palette = 14=#35a77c +palette = 15=#fffbef +background = #272e33 +foreground = #d3c6aa +cursor-color = #e69875 +selection-background = #4c3743 +selection-foreground = #d3c6aa diff --git a/.config/ghostty/themes/everforest-medium-dark b/.config/ghostty/themes/everforest-medium-dark new file mode 100644 index 0000000..9bd4bf3 --- /dev/null +++ b/.config/ghostty/themes/everforest-medium-dark @@ -0,0 +1,21 @@ +palette = 0=#7a8478 +palette = 1=#e67e80 +palette = 2=#a7c080 +palette = 3=#dbbc7f +palette = 4=#7fbbb3 +palette = 5=#d699b6 +palette = 6=#83c092 +palette = 7=#f2efdf +palette = 8=#a6b0a0 +palette = 9=#f85552 +palette = 10=#8da101 +palette = 11=#dfa000 +palette = 12=#3a94c5 +palette = 13=#df69ba +palette = 14=#35a77c +palette = 15=#fffbef +background = #2d353b +foreground = #d3c6aa +cursor-color = #e69875 +selection-background = #543a48 +selection-foreground = #d3c6aa diff --git a/.config/ghostty/themes/everforest-soft-dark b/.config/ghostty/themes/everforest-soft-dark new file mode 100644 index 0000000..963937d --- /dev/null +++ b/.config/ghostty/themes/everforest-soft-dark @@ -0,0 +1,21 @@ +palette = 0=#7a8478 +palette = 1=#e67e80 +palette = 2=#a7c080 +palette = 3=#dbbc7f +palette = 4=#7fbbb3 +palette = 5=#d699b6 +palette = 6=#83c092 +palette = 7=#f2efdf +palette = 8=#a6b0a0 +palette = 9=#f85552 +palette = 10=#8da101 +palette = 11=#dfa000 +palette = 12=#3a94c5 +palette = 13=#df69ba +palette = 14=#35a77c +palette = 15=#fffbef +background = #333c43 +foreground = #d3c6aa +cursor-color = #e69875 +selection-background = #5c3f4f +selection-foreground = #d3c6aa From 47189dfc3286676505c4769ec97c819ff0939cf1 Mon Sep 17 00:00:00 2001 From: afonso Date: Tue, 7 Jan 2025 16:35:44 +0000 Subject: [PATCH 7/7] [nvim] added lazy-lock to gitignore --- .config/nvim/lazy-lock.json | 52 ------------------------------------- .gitignore | 1 + 2 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 .config/nvim/lazy-lock.json diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json deleted file mode 100644 index 0cf9014..0000000 --- a/.config/nvim/lazy-lock.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "blame.nvim": { "branch": "main", "commit": "39bb4cda9e658d053a43919b10ca52c0a4d738e1" }, - "blink.cmp": { "branch": "main", "commit": "5f442681df24fe705d1ee7ce5b4d435aa4b4dee4" }, - "conform.nvim": { "branch": "master", "commit": "9180320205d250429f0f80e073326c674e2a7149" }, - "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "fzf-lua": { "branch": "main", "commit": "dbc5bd14e72ba680df44906e957b0a821121726b" }, - "gruvbox-material": { "branch": "master", "commit": "3eb4a739a80f68b8386d13359a005ef45bf9a9eb" }, - "harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" }, - "inc-rename.nvim": { "branch": "main", "commit": "f4e13df6e2d0b3177a7305dbc1cc7f7ea44b94f1" }, - "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, - "lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" }, - "ltex-extra.nvim": { "branch": "master", "commit": "24acd044ce7a26b3cdb537cbd094de37c3e1ac45" }, - "lua-async-await": { "branch": "main", "commit": "652d94df34e97abe2d4a689edbc4270e7ead1a98" }, - "markview.nvim": { "branch": "main", "commit": "72cd34279e94ee96ee33bdf30a87b00e6d45319d" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" }, - "nightfox.nvim": { "branch": "main", "commit": "595ffb8f291fc4a9bef3201a28b7c0379a41cdee" }, - "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" }, - "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-bqf": { "branch": "main", "commit": "68d3c20f6bee49105dcfde3df1f7ec972529f2a3" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "665d3569a86395fe0dab85efbdb26d7d2ee57e49" }, - "nvim-dap-ui": { "branch": "master", "commit": "e94d98649dccb6a3884b66aabc2e07beb279e535" }, - "nvim-java": { "branch": "main", "commit": "e8e84413ca03e7d0541921e795b2e6bf8801f186" }, - "nvim-java-core": { "branch": "main", "commit": "22eca6b90b7e209299d99cbf60421f0ffdae5629" }, - "nvim-java-dap": { "branch": "main", "commit": "55f239532f7a3789d21ea68d1e795abc77484974" }, - "nvim-java-refactor": { "branch": "main", "commit": "ea1420fed5463c9cc976c2b4175f434b3646f0f7" }, - "nvim-java-test": { "branch": "main", "commit": "7f0f40e9c5b7eab5096d8bec6ac04251c6e81468" }, - "nvim-lspconfig": { "branch": "master", "commit": "57154fd9a24e76907e3b0bdba4677ef42c88d91c" }, - "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-treesitter": { "branch": "master", "commit": "5d18ef22dc63624e90aa7b6dbc17f2c3856ae716" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, - "nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" }, - "nvim-web-devicons": { "branch": "master", "commit": "63f552a7f59badc6e6b6d22e603150f0d5abebb7" }, - "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, - "oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" }, - "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, - "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "rustaceanvim": { "branch": "master", "commit": "6db1fe9e3f005b2e0921c7302d2c195eeb90a451" }, - "smart-splits.nvim": { "branch": "master", "commit": "49c397120944ebb89fbb11126b7edce36be8bdad" }, - "snacks.nvim": { "branch": "main", "commit": "98df370703b3c47a297988f3e55ce99628639590" }, - "spring-boot.nvim": { "branch": "main", "commit": "218c0c26c14d99feca778e4d13f5ec3e8b1b60f0" }, - "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" }, - "vim-fugitive": { "branch": "master", "commit": "fcb4db52e7f65b95705aa58f0f2df1312c1f2df2" }, - "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "vim-tpipeline": { "branch": "master", "commit": "72a624f97730059bab359cb0b58a23433bfec308" }, - "vimtex": { "branch": "master", "commit": "b8bb79b5fb27e9030ade92e75cd9375416f2c666" }, - "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" } -} diff --git a/.gitignore b/.gitignore index 19d2274..2874856 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ **/.session.vim .ssh/known_hosts .ssh/known_hosts.old +.config/nvim/lazy-lock.json