AYU LIGHT

This commit is contained in:
Marco Thomas
2021-09-15 10:40:54 +02:00
parent bc9b63aa74
commit e6da29e2f3
9 changed files with 90 additions and 117 deletions

View File

@@ -10,32 +10,30 @@ XTerm.vt100.translations: #override \n\
Ctrl <Key> minus: smaller-vt-font() \n\ Ctrl <Key> minus: smaller-vt-font() \n\
Ctrl <Key> plus: larger-vt-font() Ctrl <Key> plus: larger-vt-font()
! Gruvbox light ! colors
! hard contrast: *background: #f9f5d7 *background: #fafafa
*background: #f9f5d7 *foreground: #575f66
! soft contrast: *background: #f2e5bc
*foreground: #3c3836
! Black + DarkGrey ! Black + DarkGrey
*color0: #fdf4c1 *color0: #191e2a
*color8: #928374 *color8: #686868
! DarkRed + Red ! DarkRed + Red
*color1: #cc241d *color1: #ff3333
*color9: #9d0006 *color9: #f27983
! DarkGreen + Green ! DarkGreen + Green
*color2: #98971a *color2: #a6cc70
*color10: #79740e *color10: #bae67e
! DarkYellow + Yellow ! DarkYellow + Yellow
*color3: #d79921 *color3: #e7c547
*color11: #b57614 *color11: #ffcc66
! DarkBlue + Blue ! DarkBlue + Blue
*color4: #458588 *color4: #55b4d4
*color12: #076678 *color12: #5ccfe6
! DarkMagenta + Magenta ! DarkMagenta + Magenta
*color5: #b16286 *color5: #ffd580
*color13: #8f3f71 *color13: #ffee99
! DarkCyan + Cyan ! DarkCyan + Cyan
*color6: #689d6a *color6: #95e6cb
*color14: #427b58 *color14: #95e6cb
! LightGrey + White ! LightGrey + White
*color7: #7c6f64 *color7: #c7c7c7
*color15: #3c3836 *color15: #ffffff

View File

@@ -1,47 +0,0 @@
# ============================== Prompt
git_branch() {
git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/|\1/'
}
HOST="\[\033[0;93m\]\h\[\033[m\]"
GIT="\[\033[1;91m\]\$(git_branch)\[\033[m\]"
ICON="\[\033[1;92m\]λ\[\033[m\]"
DIR="\[\033[1;94m\]\w\[\033[m\]"
export PS1="${HOST} ${DIR}${GIT} ${ICON} "
# ============================== Aliases
alias c='clear'
alias l='ls -lh' #size,show type,human readable
alias la='ls -lah' #long list,show almost all,show type,human readable
alias ll='ls -l' #long list
alias rm='rm -i' # ask before removal
alias cp='cp -i' # ask before removal
alias mv='mv -i' # ask before removal
# ============================== SSH-Agent
agent() {
if ! [ -S $HOME/.ssh/mthomas-agent.sock ]; then
echo "Starting ssh-agent"
ssh-agent -a $HOME/.ssh/mthomas-agent.sock
ssh-add
else
echo "Agent already running"
fi
}
alias ssha=agent
# ============================== vi-Mode
set -o vi
# ============================== Source global definitions
if [ -f /etc/bashrc ]; then
. /etc/bashrc
fi
# ============================== Source local definitions
if [ -f ~/.bashrc_local ]; then
source ~/.bashrc_local
fi

View File

@@ -9,7 +9,7 @@
import: import:
- ~/.alacritty_local.yml - ~/.alacritty_local.yml
- ~/.config/alacritty/themes/gruvbox_lighter.yml - ~/.config/alacritty/themes/ayu_light.yml
env: env:
TERM: alacritty TERM: alacritty

View File

@@ -0,0 +1,29 @@
# Colors (Ayu Mirage)
colors:
# Default colors
primary:
background: '#fafafa'
foreground: '#575f66'
# Normal colors
normal:
black: '#191E2A'
red: '#FF3333'
green: '#A6CC70'
yellow: '#e7c547'
blue: '#55b4d4'
magenta: '#FFD580'
cyan: '#95E6CB'
white: '#C7C7C7'
# Bright colors
bright:
black: '#686868'
red: '#F27983'
green: '#BAE67E'
yellow: '#FFCC66'
blue: '#5CCFE6'
magenta: '#FFEE99'
cyan: '#95E6CB'
white: '#FFFFFF'

View File

@@ -95,21 +95,14 @@ hide_edge_borders smart
gaps inner 10 gaps inner 10
#set $gruv_bg "#f2e5bc" set $bg "#fafafa"
set $gruv_bg "#f9f5d7" set $bg_1 "#fafaea"
set $gruv_bg_1 "#fbf1c7" set $fg "#282828"
#set $gruv_bg_1 "#f9f5d7" set $green "#a6cc70"
set $gruv_fg "#282828" set $red "#ff3333"
#set $green "#98971a" set $light_red "#f27983"
# actually aqua set $yellow "#e7c547"
set $green "#689d6a"
set $red "#cc242d"
set $light_red "#fb4934"
set $yellow "#d79921"
#set $yellow "#fabd2f"
# Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available)
bar { bar {
status_command i3status status_command i3status
position top position top
@@ -118,28 +111,27 @@ bar {
tray_output primary tray_output primary
colors { colors {
background $gruv_bg background $bg
statusline $gruv_fg statusline $fg
# equivalent to focused # equivalent to focused
focused_workspace $gruv_bg $green $gruv_fg focused_workspace $bg $green $fg
# equivalent to focused_inactive # equivalent to focused_inactive
active_workspace $grub_bg $yellow $gruv_fg active_workspace $grub_bg $yellow $fg
# equivalent to unfocused # equivalent to unfocused
inactive_workspace $gruv_bg $gruv_bg $gruv_fg inactive_workspace $bg $bg $fg
# equivalent to urgent # equivalent to urgent
urgent_workspace $red $light_red $gruv_fg urgent_workspace $red $light_red $fg
# equivalent to urgent # equivalent to urgent
binding_mode $red $light_red $gruv_fg binding_mode $red $light_red $fg
} }
} }
# gruvbox style window titles
# class border backgr. text indicator child_border # class border backgr. text indicator child_border
client.focused $green $green $gruv_fg $green $green client.focused $green $green $fg $green $green
client.focused_inactive $yellow $yellow $gruv_fg $yellow $yellow client.focused_inactive $yellow $yellow $fg $yellow $yellow
client.unfocused $gruv_bg_1 $gruv_bg_1 $gruv_fg $gruv_bg_1 $gruv_bg_1 client.unfocused $bg_1 $bg_1 $fg $bg_1 $bg_1
client.urgent $red $light_red $gruv_fg $red $light_red client.urgent $red $light_red $fg $red $light_red
# startup # startup
exec --no-startup-id $HOME/scripts/start_progs.sh exec --no-startup-id $HOME/scripts/start_progs.sh

View File

@@ -8,44 +8,44 @@ set statusbar-h-padding 0
set statusbar-v-padding 0 set statusbar-v-padding 0
set show-scrollbars false set show-scrollbars false
# gruvbox # colors
set notification-error-bg "#f9f5d7" # bg set notification-error-bg "#fafafa" # bg
set notification-error-fg "#9d0006" # bright:red set notification-error-fg "#9d0006" # bright:red
set notification-warning-bg "#f9f5d7" # bg set notification-warning-bg "#fafafa" # bg
set notification-warning-fg "#b57614" # bright:yellow set notification-warning-fg "#b57614" # bright:yellow
set notification-bg "#f9f5d7" # bg set notification-bg "#fafafa" # bg
set notification-fg "#79740e" # bright:green set notification-fg "#79740e" # bright:green
set completion-bg "#f9f5d7" # bg set completion-bg "#fafafa" # bg
set completion-fg "#3c3836" # fg set completion-fg "#3c3836" # fg
set completion-group-bg "#fbf1c7" # bg1 set completion-group-bg "#fafafa" # bg1
set completion-group-fg "#928374" # gray set completion-group-fg "#928374" # gray
set completion-highlight-bg "#689d6a" # aqua set completion-highlight-bg "#689d6a" # aqua
set completion-highlight-fg "#ebdbb2" # bg2 set completion-highlight-fg "#ebdbb2" # bg2
# Define the color in index mode # Define the color in index mode
set index-bg "#ebdbb2" # bg2 set index-bg "#fafafa" # bg2
set index-fg "#3c3836" # fg set index-fg "#3c3836" # fg
set index-active-bg "#689d6a" # aqua set index-active-bg "#689d6a" # aqua
set index-active-fg "#ebdbb2" # bg2 set index-active-fg "#ebdbb2" # bg2
set inputbar-bg "#f9f5d7" # bg set inputbar-bg "#fafafa" # bg
set inputbar-fg "#3c3836" # fg set inputbar-fg "#3c3836" # fg
set statusbar-bg "#f9f5d7" # bg set statusbar-bg "#fafafa" # bg
set statusbar-fg "#3c3836" # fg set statusbar-fg "#3c3836" # fg
set highlight-color "#b57614" # bright:yellow set highlight-color "#b57614" # bright:yellow
set highlight-active-color "#af3a03" # bright:orange set highlight-active-color "#af3a03" # bright:orange
set default-bg "#f9f5d7" # bg set default-bg "#fafafa" # bg
set default-fg "#3c3836" # fg set default-fg "#3c3836" # fg
set render-loading true set render-loading true
set render-loading-bg "#f9f5d7" # bg set render-loading-bg "#fafafa" # bg
set render-loading-fg "#3c3836" # fg set render-loading-fg "#3c3836" # fg
# Recolor book content's color # Recolor book content's color
set recolor-lightcolor "#f9f5d7" # bg set recolor-lightcolor "#fafafa" # bg
set recolor-darkcolor "#3c3836" # fg set recolor-darkcolor "#3c3836" # fg
set recolor "true" set recolor "true"
set recolor-keephue "true" set recolor-keephue "true"

View File

@@ -123,10 +123,10 @@ export FZF_DEFAULT_OPTS='
--layout=reverse --layout=reverse
--bind=tab:down --bind=tab:down
--bind=btab:up --bind=btab:up
--color=fg:#282828,bg:#f9f5d7,hl:#458588 --color=fg:#575f66,bg:#fafafa,hl:#458588
--color=fg+:#282828,bg+:#f9f5d7,hl+:#458588 --color=fg+:#575f66,bg+:#fafafa,hl+:#458588
--color=info:#282828,prompt:#282828,pointer:#282828 --color=info:#575f66,prompt:#575f66,pointer:#575f66
--color=marker:#282828,spinner:#282828,header:#282828' --color=marker:#575f66,spinner:#575f66,header:#575f66'
## fzf Bindings in zsh (C-r and C-t) ## fzf Bindings in zsh (C-r and C-t)
if [[ -x $(which fzf 2> /dev/null) ]] if [[ -x $(which fzf 2> /dev/null) ]]

View File

@@ -147,8 +147,9 @@
(use-package doom-themes (use-package doom-themes
:straight t :straight t
:config :config
(setq doom-gruvbox-light-variant "hard") (setq doom-themes-enable-bold t
(load-theme 'doom-gruvbox-light t) doom-themes-enable-italic t)
(load-theme 'doom-ayu-light t)
(doom-themes-org-config) (doom-themes-org-config)
(doom-themes-treemacs-config)) (doom-themes-treemacs-config))
@@ -156,7 +157,6 @@
(use-package doom-modeline (use-package doom-modeline
:straight t :straight t
:config :config
(set-face-attribute 'mode-line nil :background "#f9f5d7")
(doom-modeline-mode 1) (doom-modeline-mode 1)
(setq doom-modeline-indent-info t)) (setq doom-modeline-indent-info t))
@@ -340,7 +340,7 @@
org-ellipsis "" org-ellipsis ""
org-hide-emphasis-markers t org-hide-emphasis-markers t
org-todo-keywords '((sequence "TODO" "PROGRESS" "REVIEW" "|" "DONE")) org-todo-keywords '((sequence "TODO" "PROGRESS" "REVIEW" "|" "DONE"))
org-todo-keyword-faces '(("TODO" . "#cc241d") ("PROGRESS" . "#458588") ("REVIEW" . "#b16286") ("DONE" . "#98971a")) org-todo-keyword-faces '(("TODO" . "#cc241d") ("PROGRESS" . "#a6cc70") ("REVIEW" . "#b16286") ("DONE" . "#abb0b6"))
org-edit-src-content-indentation 0 org-edit-src-content-indentation 0
calendar-week-start-day 1 calendar-week-start-day 1
org-log-done 'time org-log-done 'time
@@ -643,7 +643,7 @@
(prog-mode . hl-todo-mode) (prog-mode . hl-todo-mode)
:config :config
(defface hl-todo-TODO (defface hl-todo-TODO
'((t :background "#cc241d" :foreground "#f2e5bc" :inherit (hl-todo))) '((t :background "#cc241d" :inherit (hl-todo)))
"TODO Face") "TODO Face")
(setq hl-todo-highlight-punctuation ":" (setq hl-todo-highlight-punctuation ":"
hl-todo-color-background t hl-todo-color-background t
@@ -653,6 +653,7 @@
;; load local file ;; load local file
(when (file-exists-p "~/.emacs.d/local.el") (when (file-exists-p "~/.emacs.d/local.el")
(message "Loading ~/.emacs.d/local.el") (message "Loading ~/.emacs.d/local.el")
(load-file "~/.emacs.d/local.el")) (load-file "~/.emacs.d/local.el"))

View File

@@ -4,7 +4,7 @@
path=$(pwd) path=$(pwd)
# --- home --- # # --- home --- #
home_files="scripts .bashrc .zshrc .gitconfig .tmux.conf .vimrc .Xresources .profile" home_files="scripts .zshrc .gitconfig .tmux.conf .vimrc .profile"
for file in $home_files for file in $home_files
do do