Revamp the colors

Changed files
+273 -208
config
zsh
+1 -1
config/nvim/lazy-lock.json
···
{
"LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
-
"catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" },
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
···
"nvim-treesitter": { "branch": "master", "commit": "ff553df2f4c5641be2b282e1a0a072c46cf03591" },
"nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+
"rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
"telescope-media-files.nvim": { "branch": "master", "commit": "0826c7a730bc4d36068f7c85cf4c5b3fd9fb570a" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
+5 -10
config/nvim/lua/lazy-plugins.lua
···
end,
},
-
{ -- You can easily change to a different colorscheme.
-
-- Change the name of the colorscheme plugin below, and then
-
-- change the command in the config to whatever the name of that colorscheme is.
-
--
-
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
-
'catppuccin/nvim',
-
name = 'catppuccin',
-
priority = 1000, -- Make sure to load this before all the other start plugins.
+
-- rosepine theme
+
{
+
'rose-pine/neovim',
+
name = 'rose-pine',
config = function()
-
-- Load the colorscheme here.
-
vim.cmd.colorscheme 'catppuccin'
+
vim.cmd 'colorscheme rose-pine'
end,
},
+140 -65
config/starship.toml
···
"$schema" = 'https://starship.rs/config-schema.json'
-
## PROMPT FORMAT
-
format = """$time$container$directory$all$cmd_duration$jobs$status$line_break$username$hostname$character"""
+
format = """
+
$username\
+
$directory\
+
$git_branch\
+
$git_status\
+
$fill\
+
$c\
+
$elixir\
+
$elm\
+
$golang\
+
$haskell\
+
$java\
+
$julia\
+
$nodejs\
+
$nim\
+
$rust\
+
$scala\
+
$conda\
+
$python\
+
$time\n \
+
[󱞪](fg:iris) \
+
"""
+
+
palette = "rose-pine"
-
# # PALETTE
-
palette = 'cypherpunk'
+
[palettes.rose-pine]
+
overlay = '#26233a'
+
love = '#eb6f92'
+
gold = '#f6c177'
+
rose = '#ebbcba'
+
pine = '#31748f'
+
foam = '#9ccfd8'
+
iris = '#c4a7e7'
+
+
[directory]
+
format = "[](fg:overlay)[ $path ]($style)[](fg:overlay) "
+
style = "bg:overlay fg:pine"
+
truncation_length = 3
+
truncation_symbol = "…/"
+
+
[directory.substitutions]
+
Documents = "󰈙"
+
Downloads = " "
+
Music = " "
+
Pictures = " "
+
+
[fill]
+
style = "fg:overlay"
+
symbol = " "
+
+
[git_branch]
+
format = "[](fg:overlay)[ $symbol $branch ]($style)[](fg:overlay) "
+
style = "bg:overlay fg:foam"
+
symbol = ""
-
[palettes.cypherpunk]
-
red = '#db61a2'
+
[git_status]
+
disabled = false
+
style = "bg:overlay fg:love"
+
format = '[](fg:overlay)([$all_status$ahead_behind]($style))[](fg:overlay) '
+
up_to_date = '[ ✓ ](bg:overlay fg:iris)'
+
untracked = '[?\($count\)](bg:overlay fg:gold)'
+
stashed = '[\$](bg:overlay fg:iris)'
+
modified = '[!\($count\)](bg:overlay fg:gold)'
+
renamed = '[»\($count\)](bg:overlay fg:iris)'
+
deleted = '[✘\($count\)](style)'
+
staged = '[++\($count\)](bg:overlay fg:gold)'
+
ahead = '[⇡\(${count}\)](bg:overlay fg:foam)'
+
diverged = '⇕[\[](bg:overlay fg:iris)[⇡\(${ahead_count}\)](bg:overlay fg:foam)[⇣\(${behind_count}\)](bg:overlay fg:rose)[\]](bg:overlay fg:iris)'
+
behind = '[⇣\(${count}\)](bg:overlay fg:rose)'
-
## LEFT SIDE - FIRST LINE
[time]
disabled = false
-
format = '[$time]($style) '
-
time_format = '%T'
-
style = '#e3b341'
+
format = " [](fg:overlay)[ $time 󰴈 ]($style)[](fg:overlay)"
+
style = "bg:overlay fg:rose"
+
time_format = "%I:%M%P"
+
use_12hr = true
+
+
[username]
+
disabled = false
+
format = "[](fg:overlay)[ 󰧱 $user ]($style)[](fg:overlay) "
+
show_always = true
+
style_root = "bg:overlay fg:iris"
+
style_user = "bg:overlay fg:iris"
-
[directory]
-
style = '#c9d1d9'
-
truncation_length = 8
-
truncate_to_repo = true
-
truncation_symbol = 'repo: '
+
# Languages
-
[docker_context]
-
symbol = 'docker: '
-
format = '[$symbol$context]($style)'
+
[c]
+
style = "bg:overlay fg:pine"
+
format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)"
+
disabled = false
+
symbol = " "
-
[git_branch]
-
symbol = ' '
+
[elixir]
+
style = "bg:overlay fg:pine"
+
format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)"
+
disabled = false
+
symbol = " "
-
[git_status]
-
style = '#FFFFFF'
-
ahead = '⇡${count}'
-
diverged = '⇕⇡${ahead_count}⇣${behind_count}'
-
behind = '⇣${count}'
-
deleted = 'x'
+
[elm]
+
style = "bg:overlay fg:pine"
+
format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)"
+
disabled = false
+
symbol = " "
[golang]
-
symbol = 'go: '
-
format = '[$symbol($version )]($style)'
+
style = "bg:overlay fg:pine"
+
format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)"
+
disabled = false
+
symbol = " "
-
[nix_shell]
-
symbol = 'nix: '
-
format = '[$symbol$state(\($name\))]($style)'
+
[haskell]
+
style = "bg:overlay fg:pine"
+
format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)"
+
disabled = false
+
symbol = " "
-
[nodejs]
-
symbol = 'node: '
-
format = '[$symbol($version)]($style)'
+
[java]
+
style = "bg:overlay fg:pine"
+
format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)"
+
disabled = false
+
symbol = " "
-
[python]
-
symbol = 'py: '
-
format = '[${symbol}${pyenv_prefix}(${version} )(\($virtualenv\) )]($style)'
+
[julia]
+
style = "bg:overlay fg:pine"
+
format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)"
+
disabled = false
+
symbol = " "
-
[rust]
-
symbol = 'rust: '
-
format = '[$symbol($version)]($style)'
+
[nodejs]
+
style = "bg:overlay fg:pine"
+
format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)"
+
disabled = false
+
symbol = "󰎙 "
-
[cmd_duration]
-
min_time = 1
-
style = '#56d364'
-
format = 'duration: [$duration]($style) '
+
[nim]
+
style = "bg:overlay fg:pine"
+
format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)"
disabled = false
+
symbol = "󰆥 "
-
[status]
-
format = 'exit status: [$status = $common_meaning]($style) '
+
[rust]
+
style = "bg:overlay fg:pine"
+
format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)"
disabled = false
-
style = '#F78166'
-
recognize_signal_code = true
-
map_symbol = true
+
symbol = " "
-
## LEFT SIDE - SECOND LINE
-
[username]
-
format = '[$user]($style)@'
-
style_user = '#db61a2'
-
style_root = '#F78166'
-
show_always = true
+
[scala]
+
style = "bg:overlay fg:pine"
+
format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)"
+
disabled = false
+
symbol = " "
-
[hostname]
-
format = '[$hostname]($style)'
-
style = '#6ca4f8'
-
trim_at = '.local'
-
ssh_only = false
+
[python]
+
style = "bg:overlay fg:pine"
+
format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)"
disabled = false
+
symbol = ' '
-
[character]
-
format = ' [$symbol]($style) '
-
success_symbol = '[➜](#56d364)'
-
error_symbol = '[➜](#F78166)'
-
vimcmd_symbol = '[V](#56d364)'
+
[conda]
+
style = "bg:overlay fg:pine"
+
format = " [](fg:overlay)[ $symbol$environment ]($style)[](fg:overlay)"
+
disabled = false
+
symbol = '🅒 '
+1 -29
config/zellij/config.kdl
···
copy_on_select true
on_force_close "quit"
default_layout "sysadmin"
-
theme "cypherpunk"
-
themes {
-
cypherpunk {
-
bg "#101216"
-
black "#000000"
-
blue "#6ca4f8"
-
cyan "#2b7489"
-
fg "#8b949e"
-
green "#56d364"
-
magenta "#db61a2"
-
orange "#e3b341"
-
red "#f78166"
-
white "#ffffff"
-
yellow "#e3b341"
-
}
-
catppuccin-mocha {
-
bg "#585b70"
-
black "#181825"
-
blue "#89b4fa"
-
cyan "#89dceb"
-
fg "#cdd6f4"
-
green "#a6e3a1"
-
magenta "#f5c2e7"
-
orange "#fab387"
-
red "#f38ba8"
-
white "#cdd6f4"
-
yellow "#f9e2af"
-
}
-
}
+
theme "rose-pine"
+120
config/zellij/themes/rose-pine.kdl
···
+
themes {
+
rose-pine {
+
text_unselected {
+
base 224 222 244
+
background 33 32 46
+
emphasis_0 235 188 186
+
emphasis_1 156 207 216
+
emphasis_2 49 116 143
+
emphasis_3 196 167 231
+
}
+
text_selected {
+
base 224 222 244
+
background 64 61 82
+
emphasis_0 235 188 186
+
emphasis_1 156 207 216
+
emphasis_2 49 116 143
+
emphasis_3 196 167 231
+
}
+
ribbon_selected {
+
base 33 32 46
+
background 49 116 143
+
emphasis_0 246 193 119
+
emphasis_1 235 188 186
+
emphasis_2 196 167 231
+
emphasis_3 156 207 216
+
}
+
ribbon_unselected {
+
base 25 23 36
+
background 224 222 244
+
emphasis_0 246 193 119
+
emphasis_1 235 188 186
+
emphasis_2 196 167 231
+
emphasis_3 156 207 216
+
}
+
table_title {
+
base 49 116 143
+
background 0 0 0
+
emphasis_0 235 188 186
+
emphasis_1 156 207 216
+
emphasis_2 49 116 143
+
emphasis_3 196 167 231
+
}
+
table_cell_selected {
+
base 224 222 244
+
background 64 61 82
+
emphasis_0 235 188 186
+
emphasis_1 156 207 216
+
emphasis_2 49 116 143
+
emphasis_3 196 167 231
+
}
+
table_cell_unselected {
+
base 224 222 244
+
background 33 32 46
+
emphasis_0 235 188 186
+
emphasis_1 156 207 216
+
emphasis_2 49 116 143
+
emphasis_3 196 167 231
+
}
+
list_selected {
+
base 224 222 244
+
background 64 61 82
+
emphasis_0 235 188 186
+
emphasis_1 156 207 216
+
emphasis_2 49 116 143
+
emphasis_3 196 167 231
+
}
+
list_unselected {
+
base 224 222 244
+
background 33 32 46
+
emphasis_0 235 188 186
+
emphasis_1 156 207 216
+
emphasis_2 49 116 143
+
emphasis_3 196 167 231
+
}
+
frame_selected {
+
base 49 116 143
+
background 0 0 0
+
emphasis_0 235 188 186
+
emphasis_1 156 207 216
+
emphasis_2 196 167 231
+
emphasis_3 0 0 0
+
}
+
frame_highlight {
+
base 235 188 186
+
background 0 0 0
+
emphasis_0 235 188 186
+
emphasis_1 235 188 186
+
emphasis_2 235 188 186
+
emphasis_3 235 188 186
+
}
+
exit_code_success {
+
base 49 116 143
+
background 0 0 0
+
emphasis_0 156 207 216
+
emphasis_1 33 32 46
+
emphasis_2 196 167 231
+
emphasis_3 49 116 143
+
}
+
exit_code_error {
+
base 235 111 146
+
background 0 0 0
+
emphasis_0 246 193 119
+
emphasis_1 0 0 0
+
emphasis_2 0 0 0
+
emphasis_3 0 0 0
+
}
+
multiplayer_user_colors {
+
player_1 196 167 231
+
player_2 49 116 143
+
player_3 235 188 186
+
player_4 246 193 119
+
player_5 156 207 216
+
player_6 235 111 146
+
player_7 0 0 0
+
player_8 0 0 0
+
player_9 0 0 0
+
player_10 0 0 0
+
}
+
}
+
}
+6 -103
zsh/.zshrc
···
cd && clear && restart;
}
-
# newfeelslog
-
# Usage: newfeelslog <tag0> <tag1> ... <tagN>
-
function newfeelslog() {
-
DATE=$(date '+%Y-%m-%d')
-
TAGS="$*"
-
FEELSDIR="${HOME}/nextcloud/sites/feels.hyperreal.coffee"
-
PREV_ENTRY=$(find "$FEELSDIR/src" -name "*.md" -exec basename {} \; | sort | tail -1 | cut -c 18-21)
-
NEXT_ENTRY="00$(echo "$PREV_ENTRY" + "1" | bc)"
-
NEXT_ENTRY_FILENAME="${FEELSDIR}/src/${DATE}-entry-${NEXT_ENTRY}.md"
-
-
cat <<EOF >"$NEXT_ENTRY_FILENAME"
-
---
-
title: Entry $NEXT_ENTRY
-
date: $(date '+%Y-%m-%d %H:%M:%S %z')
-
tags: $(echo "${TAGS// /, }")
-
slug: entry-$NEXT_ENTRY
-
---
-
EOF
-
-
$EDITOR "$NEXT_ENTRY_FILENAME"
-
cd "${HOME}/nextcloud/sites" || exit
-
}
-
##############################################################################
# FZF
##############################################################################
-
export FZF_DEFAULT_OPTS='--color=bg+:#302D41,bg:#1E1E2E,spinner:#F8BD96,hl:#F28FAD --color=fg:#D9E0EE,header:#F28FAD,info:#DDB6F2,pointer:#F8BD96 --color=marker:#F8BD96,fg+:#F2CDCD,prompt:#DDB6F2,hl+:#F28FAD'
+
export FZF_DEFAULT_OPTS="
+
--color=fg:#908caa,bg:#191724,hl:#ebbcba
+
--color=fg+:#e0def4,bg+:#26233a,hl+:#ebbcba
+
--color=border:#403d52,header:#31748f,gutter:#191724
+
--color=spinner:#f6c177,info:#9ccfd8
+
--color=pointer:#c4a7e7,marker:#eb6f92,prompt:#908caa"
## completion trigger
export FZF_COMPLETION_TRIGGER="~~"
···
# Do *not* run all background jobs at a lower nice priority
unsetopt bgnice
-
-
-
##############################################################################
-
# CATPPUCCIN SYNTAX HIGHLIGHTING
-
##############################################################################
-
# Catppuccin Mocha 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=#585b70'
-
## Constants
-
## Entitites
-
## Functions/methods
-
ZSH_HIGHLIGHT_STYLES[alias]='fg=#a6e3a1'
-
ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=#a6e3a1'
-
ZSH_HIGHLIGHT_STYLES[global-alias]='fg=#a6e3a1'
-
ZSH_HIGHLIGHT_STYLES[function]='fg=#a6e3a1'
-
ZSH_HIGHLIGHT_STYLES[command]='fg=#a6e3a1'
-
ZSH_HIGHLIGHT_STYLES[precommand]='fg=#a6e3a1,italic'
-
ZSH_HIGHLIGHT_STYLES[autodirectory]='fg=#fab387,italic'
-
ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=#fab387'
-
ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=#fab387'
-
ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=#cba6f7'
-
## Keywords
-
## Built ins
-
ZSH_HIGHLIGHT_STYLES[builtin]='fg=#a6e3a1'
-
ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=#a6e3a1'
-
ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=#a6e3a1'
-
## Punctuation
-
ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#f38ba8'
-
ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]='fg=#cdd6f4'
-
ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-unquoted]='fg=#cdd6f4'
-
ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]='fg=#cdd6f4'
-
ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]='fg=#f38ba8'
-
ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=#f38ba8'
-
ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=#f38ba8'
-
## Serializable / Configuration Languages
-
## Storage
-
## Strings
-
ZSH_HIGHLIGHT_STYLES[command-substitution-quoted]='fg=#f9e2af'
-
ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-quoted]='fg=#f9e2af'
-
ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#f9e2af'
-
ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=#eba0ac'
-
ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#f9e2af'
-
ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=#eba0ac'
-
ZSH_HIGHLIGHT_STYLES[rc-quote]='fg=#f9e2af'
-
## Variables
-
ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#cdd6f4'
-
ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=#eba0ac'
-
ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=#cdd6f4'
-
ZSH_HIGHLIGHT_STYLES[assign]='fg=#cdd6f4'
-
ZSH_HIGHLIGHT_STYLES[named-fd]='fg=#cdd6f4'
-
ZSH_HIGHLIGHT_STYLES[numeric-fd]='fg=#cdd6f4'
-
## No category relevant in spec
-
ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#eba0ac'
-
ZSH_HIGHLIGHT_STYLES[path]='fg=#cdd6f4,underline'
-
ZSH_HIGHLIGHT_STYLES[path_pathseparator]='fg=#f38ba8,underline'
-
ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=#cdd6f4,underline'
-
ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]='fg=#f38ba8,underline'
-
ZSH_HIGHLIGHT_STYLES[globbing]='fg=#cdd6f4'
-
ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=#cba6f7'
-
#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=#eba0ac'
-
ZSH_HIGHLIGHT_STYLES[redirection]='fg=#cdd6f4'
-
ZSH_HIGHLIGHT_STYLES[arg0]='fg=#cdd6f4'
-
ZSH_HIGHLIGHT_STYLES[default]='fg=#cdd6f4'
-
ZSH_HIGHLIGHT_STYLES[cursor]='fg=#cdd6f4'