Change color scheme

This commit is contained in:
Alexander Bantyev 2020-06-12 23:12:36 +03:00
parent 9c907b9241
commit f84b2ddc95
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
7 changed files with 69 additions and 77 deletions

View File

@ -29,7 +29,6 @@
abiword abiword
gnumeric gnumeric
gcalcli gcalcli
papirus-icon-theme
breeze-icons breeze-icons
kde-cli-tools kde-cli-tools
xdg_utils xdg_utils

View File

@ -61,24 +61,15 @@ in {
}; };
}; };
config = { config = {
themes.colors = fromBase16 (fromYAML (builtins.readFile themes.colors = (fromBase16 (fromYAML
"${inputs.base16-unclaimed-schemes}/irblack.yaml")); (builtins.readFile "${inputs.base16-unclaimed-schemes}/irblack.yaml")))
# themes.colors = { // {
# bg = "#114c00"; alt = "#001d6c";
# bg = "#000000";
# fg = "#ffffff"; red = "#da1e28";
# green = "#24a148";
# gray = "#9bb953"; orange = "#ff832b";
# alt = "#27a6a2"; yellow = "#f1c21b";
# dark = "#169300"; };
#
# red = "#d12d17";
# orange = "#cf7a02";
# yellow = "#386c34";
# green = "#386c34";
# cyan = "#09d0a5";
# blue = "#a5d048";
# purple = "#d083be";
# };
}; };
} }

View File

@ -11,15 +11,15 @@ let
BTN_FG=${thm'.fg} BTN_FG=${thm'.fg}
MENU_BG=${thm'.bg} MENU_BG=${thm'.bg}
MENU_FG=${thm'.fg} MENU_FG=${thm'.fg}
ACCENT_BG=${thm'.blue} ACCENT_BG=${thm'.alt}
SEL_BG=${thm'.blue} SEL_BG=${thm'.blue}
SEL_FG=${thm'.bg} SEL_FG=${thm'.bg}
TXT_BG=${thm'.bg} TXT_BG=${thm'.bg}
TXT_FG=${thm'.fg} TXT_FG=${thm'.fg}
HDR_BTN_BG=${thm'.bg} HDR_BTN_BG=${thm'.bg}
HDR_BTN_FG=${thm'.fg} HDR_BTN_FG=${thm'.fg}
WM_BORDER_FOCUS=${thm'.blue} WM_BORDER_FOCUS=${thm'.alt}
WM_BORDER_UNFOCUS=${thm'.alt} WM_BORDER_UNFOCUS=${thm'.dark}
MATERIA_STYLE_COMPACT=True MATERIA_STYLE_COMPACT=True
MATERIA_COLOR_VARIANT=dark MATERIA_COLOR_VARIANT=dark
UNITY_DEFAULT_LAUNCHER_STYLE=False UNITY_DEFAULT_LAUNCHER_STYLE=False
@ -49,8 +49,8 @@ in {
gtk = { gtk = {
enable = true; enable = true;
iconTheme = { iconTheme = {
name = "Papirus-Dark"; name = "Breeze Dark";
package = pkgs.papirus-icon-theme; package = pkgs.breeze-icons;
}; };
theme = { theme = {
name = "Generated"; name = "Generated";

View File

@ -3,29 +3,30 @@ with import ../../../support.nix { inherit pkgs config lib; };
with lib; with lib;
let scripts = import ./scripts pkgs config; let scripts = import ./scripts pkgs config;
in { in {
home-manager.users.balsoft.wayland.windowManager.sway.extraConfig = '' home-manager.users.balsoft.wayland.windowManager.sway.config.bars = [{
bar { id = "top";
id top colors = let
font pango:Material Icons 11, IBM Plex 11, Roboto Mono 11 thm = config.themes.colors;
mode dock default = {
hidden_state hide background = thm.bg;
position top border = thm.bg;
status_command ${pkgs.i3blocks}/bin/i3blocks };
workspace_buttons yes in {
strip_workspace_numbers no background = thm.bg;
tray_output none statusline = thm.fg;
colors { separator = thm.alt;
background ${config.themes.colors.bg} focusedWorkspace = default // { text = thm.fg; };
statusline ${config.themes.colors.fg} activeWorkspace = default // { text = thm.green; };
separator ${config.themes.colors.alt} inactiveWorkspace = default // { text = thm.dark; };
focused_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.blue} urgentWorkspace = default // { text = thm.orange; };
active_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.green} bindingMode = default // { text = thm.yellow; };
inactive_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.fg} };
urgent_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.orange} statusCommand = "${pkgs.i3blocks}/bin/i3blocks";
binding_mode ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.yellow} fonts = [ "IBM Plex Mono 11" "Material Icons 11" "Roboto Mono 11" ];
} mode = "hide";
} position = "bottom";
''; workspaceNumbers = false;
}];
home-manager.users.balsoft.xdg.configFile."i3blocks/config".text = let home-manager.users.balsoft.xdg.configFile."i3blocks/config".text = let
scr = x: { scr = x: {

View File

@ -25,10 +25,10 @@ with import ../../../support.nix { inherit lib config; }; {
"Colors:Button" = { "Colors:Button" = {
BackgroundAlternate = thmDec.dark; BackgroundAlternate = thmDec.dark;
BackgroundNormal = thmDec.bg; BackgroundNormal = thmDec.bg;
DecorationFocus = thmDec.blue; DecorationFocus = thmDec.alt;
DecorationHover = thmDec.blue; DecorationHover = thmDec.alt;
ForegroundActive = thmDec.blue; ForegroundActive = thmDec.alt;
ForegroundInactive = thmDec.alt; ForegroundInactive = thmDec.dark;
ForegroundLink = thmDec.blue; ForegroundLink = thmDec.blue;
ForegroundNegative = thmDec.red; ForegroundNegative = thmDec.red;
ForegroundNeutral = thmDec.orange; ForegroundNeutral = thmDec.orange;
@ -39,22 +39,22 @@ with import ../../../support.nix { inherit lib config; }; {
"Colors:Complementary" = { "Colors:Complementary" = {
BackgroundAlternate = thmDec.dark; BackgroundAlternate = thmDec.dark;
BackgroundNormal = thmDec.bg; BackgroundNormal = thmDec.bg;
DecorationFocus = thmDec.blue; DecorationFocus = thmDec.alt;
DecorationHover = thmDec.blue; DecorationHover = thmDec.alt;
ForegroundActive = thmDec.orange; ForegroundActive = thmDec.orange;
ForegroundInactive = thmDec.alt; ForegroundInactive = thmDec.dark;
ForegroundLink = thmDec.blue; ForegroundLink = thmDec.blue;
ForegroundNegative = thmDec.red; ForegroundNegative = thmDec.red;
ForegroundNeutral = thmDec.yellow; ForegroundNeutral = thmDec.yellow;
ForegroundNormal = thmDec.fg; ForegroundNormal = thmDec.fg;
ForegroundPositive = thmDec.green; ForegroundPositive = thmDec.green;
ForegroundVisited = thmDec.blue; ForegroundVisited = thmDec.alt;
}; };
"Colors:Selection" = { "Colors:Selection" = {
BackgroundAlternate = thmDec.blue; BackgroundAlternate = thmDec.alt;
BackgroundNormal = thmDec.blue; BackgroundNormal = thmDec.alt;
DecorationFocus = thmDec.blue; DecorationFocus = thmDec.alt;
DecorationHover = thmDec.blue; DecorationHover = thmDec.alt;
ForegroundActive = thmDec.fg; ForegroundActive = thmDec.fg;
ForegroundInactive = thmDec.fg; ForegroundInactive = thmDec.fg;
ForegroundLink = thmDec.blue; ForegroundLink = thmDec.blue;
@ -67,10 +67,10 @@ with import ../../../support.nix { inherit lib config; }; {
"Colors:Tooltip" = { "Colors:Tooltip" = {
BackgroundAlternate = thmDec.dark; BackgroundAlternate = thmDec.dark;
BackgroundNormal = thmDec.bg; BackgroundNormal = thmDec.bg;
DecorationFocus = thmDec.blue; DecorationFocus = thmDec.alt;
DecorationHover = thmDec.blue; DecorationHover = thmDec.alt;
ForegroundActive = thmDec.blue; ForegroundActive = thmDec.alt;
ForegroundInactive = thmDec.alt; ForegroundInactive = thmDec.dark;
ForegroundLink = thmDec.blue; ForegroundLink = thmDec.blue;
ForegroundNegative = thmDec.red; ForegroundNegative = thmDec.red;
ForegroundNeutral = thmDec.orange; ForegroundNeutral = thmDec.orange;
@ -81,10 +81,10 @@ with import ../../../support.nix { inherit lib config; }; {
"Colors:View" = { "Colors:View" = {
BackgroundAlternate = thmDec.dark; BackgroundAlternate = thmDec.dark;
BackgroundNormal = thmDec.bg; BackgroundNormal = thmDec.bg;
DecorationFocus = thmDec.blue; DecorationFocus = thmDec.alt;
DecorationHover = thmDec.blue; DecorationHover = thmDec.alt;
ForegroundActive = thmDec.blue; ForegroundActive = thmDec.alt;
ForegroundInactive = thmDec.alt; ForegroundInactive = thmDec.dark;
ForegroundLink = thmDec.blue; ForegroundLink = thmDec.blue;
ForegroundNegative = thmDec.red; ForegroundNegative = thmDec.red;
ForegroundNeutral = thmDec.orange; ForegroundNeutral = thmDec.orange;
@ -95,10 +95,10 @@ with import ../../../support.nix { inherit lib config; }; {
"Colors:Window" = { "Colors:Window" = {
BackgroundAlternate = thmDec.dark; BackgroundAlternate = thmDec.dark;
BackgroundNormal = thmDec.bg; BackgroundNormal = thmDec.bg;
DecorationFocus = thmDec.blue; DecorationFocus = thmDec.alt;
DecorationHover = thmDec.blue; DecorationHover = thmDec.alt;
ForegroundActive = thmDec.blue; ForegroundActive = thmDec.alt;
ForegroundInactive = thmDec.alt; ForegroundInactive = thmDec.dark;
ForegroundLink = thmDec.blue; ForegroundLink = thmDec.blue;
ForegroundNegative = thmDec.red; ForegroundNegative = thmDec.red;
ForegroundNeutral = thmDec.orange; ForegroundNeutral = thmDec.orange;
@ -126,7 +126,7 @@ with import ../../../support.nix { inherit lib config; }; {
contrast = 4; contrast = 4;
widgetStyle = "Breeze"; widgetStyle = "Breeze";
}; };
Icons = { Theme = "Papirus-Dark"; }; Icons = { Theme = "Breeze Dark"; };
}; };
home-manager.users.balsoft.home.activation."user-places.xbel" = { home-manager.users.balsoft.home.activation."user-places.xbel" = {
data = '' data = ''

View File

@ -33,7 +33,7 @@ in {
colors = rec { colors = rec {
background = thm.bg; background = thm.bg;
unfocused = { unfocused = {
text = thm.alt; text = thm.dark;
border = thm.dark; border = thm.dark;
background = thm.bg; background = thm.bg;
childBorder = thm.dark; childBorder = thm.dark;

View File

@ -5,7 +5,7 @@
"*background" = bg; "*background" = bg;
"*foreground" = fg; "*foreground" = fg;
"*color0" = dark; "*color0" = dark;
"*color1" = red; "*color1" = orange;
"*color2" = green; "*color2" = green;
"*color3" = yellow; "*color3" = yellow;
"*color4" = blue; "*color4" = blue;
@ -13,13 +13,15 @@
"*color6" = cyan; "*color6" = cyan;
"*color7" = fg; "*color7" = fg;
"*color8" = dark; "*color8" = dark;
"*color9" = red; "*color9" = orange;
"*color10" = green; "*color10" = green;
"*color11" = yellow; "*color11" = yellow;
"*color12" = blue; "*color12" = blue;
"*color13" = purple; "*color13" = purple;
"*color14" = cyan; "*color14" = cyan;
"*color15" = fg; "*color15" = fg;
"emacs.font" = "IBM Plex Mono 10";
# "emacs.color0" = dark; # "emacs.color0" = dark;
# "emacs.color1" = green; # "emacs.color1" = green;
@ -37,7 +39,6 @@
# "emacs.color13" = purple; # "emacs.color13" = purple;
# "emacs.color14" = cyan; # "emacs.color14" = cyan;
# "emacs.color15" = fg; # "emacs.color15" = fg;
}; };
}; };
} }