Fix unbearable colors

This commit is contained in:
Tim Schubert 2021-04-20 21:33:17 +02:00
parent 089a73bdb2
commit 89d331cd95
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
3 changed files with 43 additions and 75 deletions

View file

@ -8,15 +8,16 @@ in
enable = mkEnableOption "Enable alacritty config"; enable = mkEnableOption "Enable alacritty config";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ fonts.fontconfig.enable = true;
jetbrains-mono home.packages = [
pkgs.source-code-pro
]; ];
programs.alacritty = { programs.alacritty = {
enable = true; enable = true;
settings = { settings = {
scrolling.history = 0; scrolling.history = 0;
font = { font = {
size = 8; size = 10;
normal = { normal = {
family = "Source Code Pro"; family = "Source Code Pro";
style = "Regular"; style = "Regular";
@ -36,87 +37,54 @@ in
}; };
shell.program = "tmux"; shell.program = "tmux";
window.decorations = "none"; window.decorations = "none";
# XTerm's default colors
colors = { colors = {
# Base16 Spacemacs 256 - alacritty color config
# Nasser Alshammari (https://github.com/nashamri/spacemacs-theme)
# Default colors
primary = { primary = {
background = "#ffffff"; background = "0x1f2022";
foreground = "#000000"; foreground = "0xa3a3a3";
}; };
# Colors the cursor will use if `custom_cursor_colors` is true # Colors the cursor will use if `custom_cursor_colors` is true
cursor = { cursor = {
text = "#ffffff"; text = "0x1f2022";
cursor = "#000000"; cursor = "0xa3a3a3";
}; };
# Normal colors
normal = { normal = {
black = "#000000"; black = "0x1f2022";
red = "#cd0000"; red = "0xf2241f";
green = "#00cd00"; green = "0x67b11d";
yellow = "#cdcd00"; yellow = "0xb1951d";
blue = "#0000ee"; blue = "0x4f97d7";
magenta = "#cd00cd"; magenta = "0xa31db1";
cyan = "#00cdcd"; cyan = "0x2d9574";
white = "#e5e5e5"; white = "0xa3a3a3";
}; };
# Bright colors
bright = { bright = {
black = "#7f7f7f"; black = "0x585858";
red = "#ff0000"; red = "0xf2241f";
green = "#00ff00"; green = "0x67b11d";
yellow = "#ffff00"; yellow = "0xb1951d";
blue = "#5c5cff"; blue = "0x4f97d7";
magenta = "#ff00ff"; magenta = "0xa31db1";
cyan = "#00ffff"; cyan = "0x2d9574";
white = "#ffffff"; white = "0xf8f8f8";
}; };
indexed_colors = [
{ index = 16; color = "0xffa500"; }
{ index = 17; color = "0xb03060"; }
{ index = 18; color = "0x282828"; }
{ index = 19; color = "0x444155"; }
{ index = 20; color = "0xb8b8b8"; }
{ index = 21; color = "0xe8e8e8"; }
];
}; };
#colors = {
# # Base16 Spacemacs 256 - alacritty color config
# # Nasser Alshammari (https://github.com/nashamri/spacemacs-theme)
# # Default colors
# primary = {
# background = "0x1f2022";
# foreground = "0xa3a3a3";
# };
# # Colors the cursor will use if `custom_cursor_colors` is true
# cursor = {
# text = "0x1f2022";
# cursor = "0xa3a3a3";
# };
# # Normal colors
# normal = {
# black = "0x1f2022";
# red = "0xf2241f";
# green = "0x67b11d";
# yellow = "0xb1951d";
# blue = "0x4f97d7";
# magenta = "0xa31db1";
# cyan = "0x2d9574";
# white = "0xa3a3a3";
# };
# # Bright colors
# bright = {
# black = "0x585858";
# red = "0xf2241f";
# green = "0x67b11d";
# yellow = "0xb1951d";
# blue = "0x4f97d7";
# magenta = "0xa31db1";
# cyan = "0x2d9574";
# white = "0xf8f8f8";
# };
# indexed_colors = [
# { index = 16; color = "0xffa500"; }
# { index = 17; color = "0xb03060"; }
# { index = 18; color = "0x282828"; }
# { index = 19; color = "0x444155"; }
# { index = 20; color = "0xb8b8b8"; }
# { index = 21; color = "0xe8e8e8"; }
# ];
#};
}; };
}; };
}; };

View file

@ -11,7 +11,7 @@ in
gtk = { gtk = {
enable = true; enable = true;
theme.package = pkgs.gnome3.gnome-themes-extra; theme.package = pkgs.gnome3.gnome-themes-extra;
theme.name = "Adwaita"; theme.name = "Adwaita-dark";
iconTheme.package = pkgs.gnome3.adwaita-icon-theme; iconTheme.package = pkgs.gnome3.adwaita-icon-theme;
iconTheme.name = "Adwaita"; iconTheme.name = "Adwaita";
font.package = pkgs.cantarell-fonts; font.package = pkgs.cantarell-fonts;

View file

@ -56,8 +56,8 @@ endif
set t_Co=256 set t_Co=256
set background=light set background=dark
"colorscheme spacemacs-theme colorscheme spacemacs-theme
" Use tabs for indent " Use tabs for indent
set smarttab set smarttab