From 5d59383543aefc0c8e88d929c236cd0a2a8a4ec1 Mon Sep 17 00:00:00 2001 From: Tovi Jaeschke-Rogers Date: Mon, 29 Apr 2024 11:17:04 +0930 Subject: [PATCH] fix: alacritty config for mac --- .config/alacritty/alacritty.toml | 17 ++-- .config/alacritty/themes/Nightfly.toml | 31 -------- .config/alacritty/themes/Nightfly.yml | 36 --------- .config/alacritty/themes/carbonfox.toml | 79 ------------------- .../alacritty/themes/catppuccin-mocha.toml | 75 ++++++++++++++++++ .config/alacritty/themes/catppuccin-mocha.yml | 78 ------------------ .config/nvim/lua/tovi/plugins/colorscheme.lua | 2 +- .tmux.conf | 4 +- 8 files changed, 89 insertions(+), 233 deletions(-) delete mode 100644 .config/alacritty/themes/Nightfly.toml delete mode 100644 .config/alacritty/themes/Nightfly.yml delete mode 100644 .config/alacritty/themes/carbonfox.toml create mode 100644 .config/alacritty/themes/catppuccin-mocha.toml delete mode 100644 .config/alacritty/themes/catppuccin-mocha.yml diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 94ce0bd..e902dcc 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -1,22 +1,27 @@ -# import = ["/home/tovi/.config/alacritty/themes/carbonfox.toml.toml"] +import = [ + "~/.config/alacritty/themes/catppuccin-mocha.toml" +] + +[env] +TERM = "xterm-256color" [font] -size = 11 +size = 14 [font.bold] -family = "Inconsolata" +family = "Inconsolata Nerd Font" style = "Bold" [font.bold_italic] -family = "Inconsolata" +family = "Inconsolata Nerd Font" style = "Bold Italic" [font.italic] -family = "Inconsolata" +family = "Inconsolata Nerd Font" style = "Italic" [font.normal] -family = "Inconsolata" +family = "Inconsolata Nerd Font" style = "Regular" [[keyboard.bindings]] diff --git a/.config/alacritty/themes/Nightfly.toml b/.config/alacritty/themes/Nightfly.toml deleted file mode 100644 index 6e8cf06..0000000 --- a/.config/alacritty/themes/Nightfly.toml +++ /dev/null @@ -1,31 +0,0 @@ -[colors.bright] -black = "#7c8f8f" -blue = "#82aaff" -cyan = "#7fdbca" -green = "#21c7a8" -magenta = "#ae81ff" -red = "#ff5874" -white = "#d6deeb" -yellow = "#ecc48d" - -[colors.cursor] -cursor = "#9ca1aa" -text = "#fafafa" - -[colors.normal] -black = "#1d3b53" -blue = "#82aaff" -cyan = "#7fdbca" -green = "#a1cd5e" -magenta = "#c792ea" -red = "#fc514e" -white = "#a1aab8" -yellow = "#e3d18a" - -[colors.primary] -background = "#011627" -foreground = "#acb4c2" - -[colors.selection] -background = "#b2ceee" -text = "#080808" diff --git a/.config/alacritty/themes/Nightfly.yml b/.config/alacritty/themes/Nightfly.yml deleted file mode 100644 index 69091ec..0000000 --- a/.config/alacritty/themes/Nightfly.yml +++ /dev/null @@ -1,36 +0,0 @@ -# Colors (Nightfly) -colors: - # Default colors - primary: - background: '#011627' - foreground: '#acb4c2' - - cursor: - text: '#fafafa' - cursor: '#9ca1aa' - - selection: - text: '#080808' - background: '#b2ceee' - - # Normal colors - normal: - black: '#1d3b53' - red: '#fc514e' - green: '#a1cd5e' - yellow: '#e3d18a' - blue: '#82aaff' - magenta: '#c792ea' - cyan: '#7fdbca' - white: '#a1aab8' - - # Bright colors - bright: - black: '#7c8f8f' - red: '#ff5874' - green: '#21c7a8' - yellow: '#ecc48d' - blue: '#82aaff' - magenta: '#ae81ff' - cyan: '#7fdbca' - white: '#d6deeb' diff --git a/.config/alacritty/themes/carbonfox.toml b/.config/alacritty/themes/carbonfox.toml deleted file mode 100644 index f98a5b9..0000000 --- a/.config/alacritty/themes/carbonfox.toml +++ /dev/null @@ -1,79 +0,0 @@ -# Nightfox Alacritty Colors -## name: carbonfox -## upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/carbonfox/alacritty.toml - -[colors.primary] -background = "#161616" -foreground = "#f2f4f8" -dim_foreground = "#b6b8bb" -bright_foreground = "#f9fbff" - -[colors.cursor] -text = "#f2f4f8" -cursor = "#b6b8bb" - -[colors.vi_mode_cursor] -text = "#f2f4f8" -cursor = "#33b1ff" - -[colors.search.matches] -foreground = "#f2f4f8" -background = "#525253" - -[colors.search.focused_match] -foreground = "#f2f4f8" -background = "#3ddbd9" - -[colors.footer_bar] -foreground = "#f2f4f8" -background = "#353535" - -[colors.hints.start] -foreground = "#f2f4f8" -background = "#3ddbd9" - -[colors.hints.end] -foreground = "#f2f4f8" -background = "#353535" - -[colors.selection] -text = "#f2f4f8" -background = "#2a2a2a" - -[colors.normal] -black = "#282828" -red = "#ee5396" -green = "#25be6a" -yellow = "#08bdba" -blue = "#78a9ff" -magenta = "#be95ff" -cyan = "#33b1ff" -white = "#dfdfe0" - -[colors.bright] -black = "#484848" -red = "#f16da6" -green = "#46c880" -yellow = "#2dc7c4" -blue = "#8cb6ff" -magenta = "#c8a5ff" -cyan = "#52bdff" -white = "#e4e4e5" - -[colors.dim] -black = "#222222" -red = "#ca4780" -green = "#1fa25a" -yellow = "#07a19e" -blue = "#6690d9" -magenta = "#a27fd9" -cyan = "#2b96d9" -white = "#bebebe" - -[[colors.indexed_colors]] -index = 16 -color = "#3ddbd9" - -[[colors.indexed_colors]] -index = 17 -color = "#ff7eb6" diff --git a/.config/alacritty/themes/catppuccin-mocha.toml b/.config/alacritty/themes/catppuccin-mocha.toml new file mode 100644 index 0000000..08a7e3a --- /dev/null +++ b/.config/alacritty/themes/catppuccin-mocha.toml @@ -0,0 +1,75 @@ +[colors.primary] +background = "#1e1e2e" +foreground = "#cdd6f4" +dim_foreground = "#7f849c" +bright_foreground = "#cdd6f4" + +[colors.cursor] +text = "#1e1e2e" +cursor = "#f5e0dc" + +[colors.vi_mode_cursor] +text = "#1e1e2e" +cursor = "#b4befe" + +[colors.search.matches] +foreground = "#1e1e2e" +background = "#a6adc8" + +[colors.search.focused_match] +foreground = "#1e1e2e" +background = "#a6e3a1" + +[colors.footer_bar] +foreground = "#1e1e2e" +background = "#a6adc8" + +[colors.hints.start] +foreground = "#1e1e2e" +background = "#f9e2af" + +[colors.hints.end] +foreground = "#1e1e2e" +background = "#a6adc8" + +[colors.selection] +text = "#1e1e2e" +background = "#f5e0dc" + +[colors.normal] +black = "#45475a" +red = "#f38ba8" +green = "#a6e3a1" +yellow = "#f9e2af" +blue = "#89b4fa" +magenta = "#f5c2e7" +cyan = "#94e2d5" +white = "#bac2de" + +[colors.bright] +black = "#585b70" +red = "#f38ba8" +green = "#a6e3a1" +yellow = "#f9e2af" +blue = "#89b4fa" +magenta = "#f5c2e7" +cyan = "#94e2d5" +white = "#a6adc8" + +[colors.dim] +black = "#45475a" +red = "#f38ba8" +green = "#a6e3a1" +yellow = "#f9e2af" +blue = "#89b4fa" +magenta = "#f5c2e7" +cyan = "#94e2d5" +white = "#bac2de" + +[[colors.indexed_colors]] +index = 16 +color = "#fab387" + +[[colors.indexed_colors]] +index = 17 +color = "#f5e0dc" \ No newline at end of file diff --git a/.config/alacritty/themes/catppuccin-mocha.yml b/.config/alacritty/themes/catppuccin-mocha.yml deleted file mode 100644 index e787352..0000000 --- a/.config/alacritty/themes/catppuccin-mocha.yml +++ /dev/null @@ -1,78 +0,0 @@ -colors: - primary: - background: "#1E1E2E" # base - foreground: "#CDD6F4" # text - # Bright and dim foreground colors - dim_foreground: "#CDD6F4" # text - bright_foreground: "#CDD6F4" # text - - # Cursor colors - cursor: - text: "#1E1E2E" # base - cursor: "#F5E0DC" # rosewater - vi_mode_cursor: - text: "#1E1E2E" # base - cursor: "#B4BEFE" # lavender - - # Search colors - search: - matches: - foreground: "#1E1E2E" # base - background: "#A6ADC8" # subtext0 - focused_match: - foreground: "#1E1E2E" # base - background: "#A6E3A1" # green - footer_bar: - foreground: "#1E1E2E" # base - background: "#A6ADC8" # subtext0 - - # Keyboard regex hints - hints: - start: - foreground: "#1E1E2E" # base - background: "#F9E2AF" # yellow - end: - foreground: "#1E1E2E" # base - background: "#A6ADC8" # subtext0 - - # Selection colors - selection: - text: "#1E1E2E" # base - background: "#F5E0DC" # rosewater - - # Normal colors - normal: - black: "#45475A" # surface1 - red: "#F38BA8" # red - green: "#A6E3A1" # green - yellow: "#F9E2AF" # yellow - blue: "#89B4FA" # blue - magenta: "#F5C2E7" # pink - cyan: "#94E2D5" # teal - white: "#BAC2DE" # subtext1 - - # Bright colors - bright: - black: "#585B70" # surface2 - red: "#F38BA8" # red - green: "#A6E3A1" # green - yellow: "#F9E2AF" # yellow - blue: "#89B4FA" # blue - magenta: "#F5C2E7" # pink - cyan: "#94E2D5" # teal - white: "#A6ADC8" # subtext0 - - # Dim colors - dim: - black: "#45475A" # surface1 - red: "#F38BA8" # red - green: "#A6E3A1" # green - yellow: "#F9E2AF" # yellow - blue: "#89B4FA" # blue - magenta: "#F5C2E7" # pink - cyan: "#94E2D5" # teal - white: "#BAC2DE" # subtext1 - - indexed_colors: - - { index: 16, color: "#FAB387" } - - { index: 17, color: "#F5E0DC" } diff --git a/.config/nvim/lua/tovi/plugins/colorscheme.lua b/.config/nvim/lua/tovi/plugins/colorscheme.lua index 7f4887d..d460ed0 100644 --- a/.config/nvim/lua/tovi/plugins/colorscheme.lua +++ b/.config/nvim/lua/tovi/plugins/colorscheme.lua @@ -4,7 +4,7 @@ return { priority = 1000, config = function () require("catppuccin").setup({ - flavour = "auto", -- latte, frappe, macchiato, mocha + flavour = "mocha", -- latte, frappe, macchiato, mocha background = { -- :h background light = "latte", dark = "mocha", diff --git a/.tmux.conf b/.tmux.conf index f823cc4..c3e1dde 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -1,4 +1,4 @@ -set -g default-terminal "screen-256color" +# set -g default-terminal "screen-256color" set-option -sa terminal-overrides ",xterm*:Tc" # easy reload config @@ -67,7 +67,7 @@ set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'catppuccin/tmux' -set -g @catppuccin_flavour 'mocha' # or frappe, macchiato, mocha +set -g @catppuccin_flavour 'mocha' set -g @catppuccin_status_left_separator "" set -g @catppuccin_window_middle_separator " "