From f84b2ddc952d0adc46c9255b1fc154881ae9a923 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Fri, 12 Jun 2020 23:12:36 +0300 Subject: [PATCH] Change color scheme --- modules/applications/packages.nix | 1 - modules/themes.nix | 29 ++++++--------- modules/workspace/gtk.nix | 10 +++--- modules/workspace/i3blocks/default.nix | 47 ++++++++++++------------ modules/workspace/kde/default.nix | 50 +++++++++++++------------- modules/workspace/sway/default.nix | 2 +- modules/workspace/xresources.nix | 7 ++-- 7 files changed, 69 insertions(+), 77 deletions(-) diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix index b0d09bf..0dcafe3 100644 --- a/modules/applications/packages.nix +++ b/modules/applications/packages.nix @@ -29,7 +29,6 @@ abiword gnumeric gcalcli - papirus-icon-theme breeze-icons kde-cli-tools xdg_utils diff --git a/modules/themes.nix b/modules/themes.nix index 38b4be3..be3d193 100755 --- a/modules/themes.nix +++ b/modules/themes.nix @@ -61,24 +61,15 @@ in { }; }; config = { - themes.colors = fromBase16 (fromYAML (builtins.readFile - "${inputs.base16-unclaimed-schemes}/irblack.yaml")); - # themes.colors = { - # bg = "#114c00"; - # bg = "#000000"; - # fg = "#ffffff"; - # - # gray = "#9bb953"; - # alt = "#27a6a2"; - # dark = "#169300"; - # - # red = "#d12d17"; - # orange = "#cf7a02"; - # yellow = "#386c34"; - # green = "#386c34"; - # cyan = "#09d0a5"; - # blue = "#a5d048"; - # purple = "#d083be"; - # }; + themes.colors = (fromBase16 (fromYAML + (builtins.readFile "${inputs.base16-unclaimed-schemes}/irblack.yaml"))) + // { + alt = "#001d6c"; + + red = "#da1e28"; + green = "#24a148"; + orange = "#ff832b"; + yellow = "#f1c21b"; + }; }; } diff --git a/modules/workspace/gtk.nix b/modules/workspace/gtk.nix index 14b062f..fc8dcbe 100644 --- a/modules/workspace/gtk.nix +++ b/modules/workspace/gtk.nix @@ -11,15 +11,15 @@ let BTN_FG=${thm'.fg} MENU_BG=${thm'.bg} MENU_FG=${thm'.fg} - ACCENT_BG=${thm'.blue} + ACCENT_BG=${thm'.alt} SEL_BG=${thm'.blue} SEL_FG=${thm'.bg} TXT_BG=${thm'.bg} TXT_FG=${thm'.fg} HDR_BTN_BG=${thm'.bg} HDR_BTN_FG=${thm'.fg} - WM_BORDER_FOCUS=${thm'.blue} - WM_BORDER_UNFOCUS=${thm'.alt} + WM_BORDER_FOCUS=${thm'.alt} + WM_BORDER_UNFOCUS=${thm'.dark} MATERIA_STYLE_COMPACT=True MATERIA_COLOR_VARIANT=dark UNITY_DEFAULT_LAUNCHER_STYLE=False @@ -49,8 +49,8 @@ in { gtk = { enable = true; iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme; + name = "Breeze Dark"; + package = pkgs.breeze-icons; }; theme = { name = "Generated"; diff --git a/modules/workspace/i3blocks/default.nix b/modules/workspace/i3blocks/default.nix index 8cf9c97..269eb9f 100644 --- a/modules/workspace/i3blocks/default.nix +++ b/modules/workspace/i3blocks/default.nix @@ -3,29 +3,30 @@ with import ../../../support.nix { inherit pkgs config lib; }; with lib; let scripts = import ./scripts pkgs config; in { - home-manager.users.balsoft.wayland.windowManager.sway.extraConfig = '' - bar { - id top - font pango:Material Icons 11, IBM Plex 11, Roboto Mono 11 - mode dock - hidden_state hide - position top - status_command ${pkgs.i3blocks}/bin/i3blocks - workspace_buttons yes - strip_workspace_numbers no - tray_output none - colors { - background ${config.themes.colors.bg} - statusline ${config.themes.colors.fg} - separator ${config.themes.colors.alt} - focused_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.blue} - active_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.green} - 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} - binding_mode ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.yellow} - } - } - ''; + home-manager.users.balsoft.wayland.windowManager.sway.config.bars = [{ + id = "top"; + colors = let + thm = config.themes.colors; + default = { + background = thm.bg; + border = thm.bg; + }; + in { + background = thm.bg; + statusline = thm.fg; + separator = thm.alt; + focusedWorkspace = default // { text = thm.fg; }; + activeWorkspace = default // { text = thm.green; }; + inactiveWorkspace = default // { text = thm.dark; }; + urgentWorkspace = default // { text = thm.orange; }; + bindingMode = default // { text = thm.yellow; }; + }; + statusCommand = "${pkgs.i3blocks}/bin/i3blocks"; + 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 scr = x: { diff --git a/modules/workspace/kde/default.nix b/modules/workspace/kde/default.nix index eaf076c..b2793dc 100644 --- a/modules/workspace/kde/default.nix +++ b/modules/workspace/kde/default.nix @@ -25,10 +25,10 @@ with import ../../../support.nix { inherit lib config; }; { "Colors:Button" = { BackgroundAlternate = thmDec.dark; BackgroundNormal = thmDec.bg; - DecorationFocus = thmDec.blue; - DecorationHover = thmDec.blue; - ForegroundActive = thmDec.blue; - ForegroundInactive = thmDec.alt; + DecorationFocus = thmDec.alt; + DecorationHover = thmDec.alt; + ForegroundActive = thmDec.alt; + ForegroundInactive = thmDec.dark; ForegroundLink = thmDec.blue; ForegroundNegative = thmDec.red; ForegroundNeutral = thmDec.orange; @@ -39,22 +39,22 @@ with import ../../../support.nix { inherit lib config; }; { "Colors:Complementary" = { BackgroundAlternate = thmDec.dark; BackgroundNormal = thmDec.bg; - DecorationFocus = thmDec.blue; - DecorationHover = thmDec.blue; + DecorationFocus = thmDec.alt; + DecorationHover = thmDec.alt; ForegroundActive = thmDec.orange; - ForegroundInactive = thmDec.alt; + ForegroundInactive = thmDec.dark; ForegroundLink = thmDec.blue; ForegroundNegative = thmDec.red; ForegroundNeutral = thmDec.yellow; ForegroundNormal = thmDec.fg; ForegroundPositive = thmDec.green; - ForegroundVisited = thmDec.blue; + ForegroundVisited = thmDec.alt; }; "Colors:Selection" = { - BackgroundAlternate = thmDec.blue; - BackgroundNormal = thmDec.blue; - DecorationFocus = thmDec.blue; - DecorationHover = thmDec.blue; + BackgroundAlternate = thmDec.alt; + BackgroundNormal = thmDec.alt; + DecorationFocus = thmDec.alt; + DecorationHover = thmDec.alt; ForegroundActive = thmDec.fg; ForegroundInactive = thmDec.fg; ForegroundLink = thmDec.blue; @@ -67,10 +67,10 @@ with import ../../../support.nix { inherit lib config; }; { "Colors:Tooltip" = { BackgroundAlternate = thmDec.dark; BackgroundNormal = thmDec.bg; - DecorationFocus = thmDec.blue; - DecorationHover = thmDec.blue; - ForegroundActive = thmDec.blue; - ForegroundInactive = thmDec.alt; + DecorationFocus = thmDec.alt; + DecorationHover = thmDec.alt; + ForegroundActive = thmDec.alt; + ForegroundInactive = thmDec.dark; ForegroundLink = thmDec.blue; ForegroundNegative = thmDec.red; ForegroundNeutral = thmDec.orange; @@ -81,10 +81,10 @@ with import ../../../support.nix { inherit lib config; }; { "Colors:View" = { BackgroundAlternate = thmDec.dark; BackgroundNormal = thmDec.bg; - DecorationFocus = thmDec.blue; - DecorationHover = thmDec.blue; - ForegroundActive = thmDec.blue; - ForegroundInactive = thmDec.alt; + DecorationFocus = thmDec.alt; + DecorationHover = thmDec.alt; + ForegroundActive = thmDec.alt; + ForegroundInactive = thmDec.dark; ForegroundLink = thmDec.blue; ForegroundNegative = thmDec.red; ForegroundNeutral = thmDec.orange; @@ -95,10 +95,10 @@ with import ../../../support.nix { inherit lib config; }; { "Colors:Window" = { BackgroundAlternate = thmDec.dark; BackgroundNormal = thmDec.bg; - DecorationFocus = thmDec.blue; - DecorationHover = thmDec.blue; - ForegroundActive = thmDec.blue; - ForegroundInactive = thmDec.alt; + DecorationFocus = thmDec.alt; + DecorationHover = thmDec.alt; + ForegroundActive = thmDec.alt; + ForegroundInactive = thmDec.dark; ForegroundLink = thmDec.blue; ForegroundNegative = thmDec.red; ForegroundNeutral = thmDec.orange; @@ -126,7 +126,7 @@ with import ../../../support.nix { inherit lib config; }; { contrast = 4; widgetStyle = "Breeze"; }; - Icons = { Theme = "Papirus-Dark"; }; + Icons = { Theme = "Breeze Dark"; }; }; home-manager.users.balsoft.home.activation."user-places.xbel" = { data = '' diff --git a/modules/workspace/sway/default.nix b/modules/workspace/sway/default.nix index 093b5a8..397e99c 100755 --- a/modules/workspace/sway/default.nix +++ b/modules/workspace/sway/default.nix @@ -33,7 +33,7 @@ in { colors = rec { background = thm.bg; unfocused = { - text = thm.alt; + text = thm.dark; border = thm.dark; background = thm.bg; childBorder = thm.dark; diff --git a/modules/workspace/xresources.nix b/modules/workspace/xresources.nix index d867c25..b41e902 100644 --- a/modules/workspace/xresources.nix +++ b/modules/workspace/xresources.nix @@ -5,7 +5,7 @@ "*background" = bg; "*foreground" = fg; "*color0" = dark; - "*color1" = red; + "*color1" = orange; "*color2" = green; "*color3" = yellow; "*color4" = blue; @@ -13,13 +13,15 @@ "*color6" = cyan; "*color7" = fg; "*color8" = dark; - "*color9" = red; + "*color9" = orange; "*color10" = green; "*color11" = yellow; "*color12" = blue; "*color13" = purple; "*color14" = cyan; "*color15" = fg; + + "emacs.font" = "IBM Plex Mono 10"; # "emacs.color0" = dark; # "emacs.color1" = green; @@ -37,7 +39,6 @@ # "emacs.color13" = purple; # "emacs.color14" = cyan; # "emacs.color15" = fg; - }; }; }