From 26a4a16638583b7d3781d3d051547770d9185819 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Sun, 5 Jun 2022 17:27:17 +0200 Subject: [PATCH] Update rice --- flake.lock | 24 +++++++++---------- home_manager/modules/kitty.nix | 1 + home_manager/modules/polybar.nix | 21 ++++++++++------ home_manager/modules/sxhkd.nix | 2 +- rice.nix | 41 +++++++++++++------------------- themes/monokai-pro-machine.nix | 22 +++++++++++++++++ 6 files changed, 66 insertions(+), 45 deletions(-) create mode 100644 themes/monokai-pro-machine.nix diff --git a/flake.lock b/flake.lock index 2766bd8..3f46c8b 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1654113406, - "narHash": "sha256-70esZvhal+FsyU89mJRcAb+cDGHKt0sgZ6MlRr9Cplg=", + "lastModified": 1654422613, + "narHash": "sha256-ZxkMM13AnrMwYOV99ohzcqeTkAOqD9Q2SBdZ9WoFE9Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "684e85d01d333be91c4875baebb05b93c7d2ffaa", + "rev": "20703892473d01c70fb10248442231fe94f4ceb4", "type": "github" }, "original": { @@ -65,11 +65,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1654188574, - "narHash": "sha256-wl87aE0JGd2viY7io0FLS4nHKAa8f9MVZWXohUvEbDU=", + "lastModified": 1654440289, + "narHash": "sha256-Mgm0eUNDb9td3aVImg7jYq/0W0XWPJo1g6K4ONgr31U=", "owner": "bertof", "repo": "nix-rice", - "rev": "0ce38b26d5fc9392cc2972f77e42549075a8e78d", + "rev": "9faf7bdc8935577f48eb80d4625a01a024e82489", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1654252671, - "narHash": "sha256-R5kyXCUC8wy4tsCbXppfyvk/q0CgiHtq7zbvR7SXoZ4=", + "lastModified": 1654435734, + "narHash": "sha256-5heW64p01GTp3vhOlTKVsZSRlQlqM37cCYcVByfg0WA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d06103277d3982e86d7eea927706376b42085c61", + "rev": "e56f11391a431fa1063cd8ae9784c2efd4516619", "type": "github" }, "original": { @@ -211,11 +211,11 @@ }, "unstable": { "locked": { - "lastModified": 1654019511, - "narHash": "sha256-s3fcwUxa2rV2ZmSbdOtisNmXqeqnF9IFrvhPQL5GCBU=", + "lastModified": 1654230545, + "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "692517bf851f2d8d999f0ad50f53fa1d2dd5c8f9", + "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec", "type": "github" }, "original": { diff --git a/home_manager/modules/kitty.nix b/home_manager/modules/kitty.nix index 6bb7737..e0fa498 100644 --- a/home_manager/modules/kitty.nix +++ b/home_manager/modules/kitty.nix @@ -23,6 +23,7 @@ in { programs.kitty = { enable = true; + package = pkgs.unstable.kitty; settings = { scrollback_lines = 10000; enable_audio_bell = false; diff --git a/home_manager/modules/polybar.nix b/home_manager/modules/polybar.nix index 50ade43..b6c5f23 100644 --- a/home_manager/modules/polybar.nix +++ b/home_manager/modules/polybar.nix @@ -1,6 +1,6 @@ { config, pkgs, ... }: let - inherit (pkgs.rice) colorPalette; + inherit (pkgs.rice) colorPalette opacity; grep = "${pkgs.gnugrep}/bin/grep"; cut = "${pkgs.coreutils}/bin/cut"; head = "${pkgs.coreutils}/bin/head"; @@ -16,20 +16,27 @@ let session=`${loginctl} session-status | ${pkgs.coreutils}/bin/head -n 1 | ${pkgs.gawk}/bin/awk '{print $1}'` ${loginctl} terminate-session $session ''; - colors = with pkgs.lib.rice; palette.toARGBHex rec { + colors = with pkgs.lib.rice; let + alpha = 255 * opacity; + in + palette.toARGBHex rec { normal = { foreground = colorPalette.normal.white; - background = colorPalette.normal.black; - underline = colorPalette.normal.blue; + background = color.setAlphaRgba alpha (colorPalette.normal.black); + underline = colorPalette.dark.blue; }; - active = palette.brighten "50%" normal; + active = { + foreground = colorPalette.bright.white; + background = color.setAlphaRgba alpha (colorPalette.normal.black); + underline = colorPalette.bright.blue; + }; selected = { foreground = colorPalette.bright.white; - background = colorPalette.bright.black; - underline = colorPalette.normal.white; + background = color.setAlphaRgba alpha (color.brighten 10 colorPalette.bright.black); + underline = builtins.trace colorPalette.bright.red colorPalette.bright.red; }; alert = colorPalette.bright.red; diff --git a/home_manager/modules/sxhkd.nix b/home_manager/modules/sxhkd.nix index 12bab42..6b65d6b 100644 --- a/home_manager/modules/sxhkd.nix +++ b/home_manager/modules/sxhkd.nix @@ -2,7 +2,7 @@ { imports = [ ./thunar.nix ]; home.packages = with pkgs; [ - kitty + unstable.kitty lockscreen pamixer playerctl diff --git a/rice.nix b/rice.nix index 484a483..69bdbc8 100644 --- a/rice.nix +++ b/rice.nix @@ -1,39 +1,30 @@ final: prev: let # nord = prev.lib.rice.palette.tPalette prev.lib.rice.color.hexToRgba (import ./themes/nord.nix); - onedark = prev.lib.rice.palette.tPalette prev.lib.rice.color.hexToRgba (import ./themes/onedark.nix); + # onedark = prev.lib.rice.palette.tPalette prev.lib.rice.color.hexToRgba (import ./themes/onedark.nix); # tomorrow-night = prev.lib.rice.palette.tPalette prev.lib.rice.color.hexToRgba (import ./themes/tomorrow-night.nix); + mkpm = with prev.lib.rice; palette.tPalette color.hexToRgba (import ./themes/monokai-pro-machine.nix); in ( rec { rice = { - colorPalette = with prev.lib.rice; palette.defaultPalette // rec { - normal = { - black = onedark.black; - blue = onedark.blue; - cyan = onedark.cyan; - green = onedark.green; - magenta = onedark.magenta; - red = onedark.darkRed; - white = onedark.white; - yellow = onedark.darkYellow; + colorPalette = with prev.lib.rice; rec { + normal = palette.defaultPalette // { + black = mkpm.base2; + blue = mkpm.blue; + green = mkpm.green; + red = mkpm.red; + white = mkpm.base7; + yellow = mkpm.yellow; }; bright = palette.brighten 10 normal // { - red = onedark.lightRed; - yellow = onedark.lightYellow; - # blue = nord.n9; - # black = nord.n2; - # red = nord.n12; - # white = nord.n6; + red = mkpm.orange; + black = mkpm.base3; + white = mkpm.base8; + }; + dark = palette.darken 10 normal // { + black = mkpm.base0; }; - dark = palette.darken 10 normal - # // { - # # black = nord.n0; - # # blue = nord.n3; - # # cyan = nord.n7; - # # white = nord.n4; - # } - ; }; font = { normal = { diff --git a/themes/monokai-pro-machine.nix b/themes/monokai-pro-machine.nix new file mode 100644 index 0000000..9e267dc --- /dev/null +++ b/themes/monokai-pro-machine.nix @@ -0,0 +1,22 @@ +# Monokai Pro Machine palette (https://github.com/helix-editor/helix/blob/9be810fd01f495c795ab5e5b7240a32708d19f5c/runtime/themes/monokai_pro_machine.toml) +{ + # primary colors + red = "#ff6d7e"; + orange = "#ffb270"; + yellow = "#ffed72"; + green = "#a2e57b"; + blue = "#7cd5f1"; + purple = "#baa0f8"; + # base colors + base0 = "#161b1e"; + base1 = "#1d2528"; + base2 = "#273136"; + base3 = "#3a4449"; + base4 = "#545f62"; + base5 = "#6b7678"; + base6 = "#798384"; + base7 = "#b8c4c3"; + base8 = "#f2fffc"; + # variants + base8x0c = "#303a3e"; +}