From e4514389f1acc1e675e40bb415a8fc4ef5a01184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 13 Dec 2022 14:12:40 +0100 Subject: [PATCH] feat(color): use papercolor --- .bin/dummy-alert | 43 ++++++++++++++++++++++++++++++++ configs/alacritty.nix | 4 +-- lib/colours/papercolor-dark.nix | 37 +++++++++++++++++++++++++++ lib/colours/papercolor-light.nix | 37 +++++++++++++++++++++++++++ lib/default.nix | 2 +- lib/i3status-rust.nix | 2 +- 6 files changed, 121 insertions(+), 4 deletions(-) create mode 100755 .bin/dummy-alert create mode 100644 lib/colours/papercolor-dark.nix create mode 100644 lib/colours/papercolor-light.nix diff --git a/.bin/dummy-alert b/.bin/dummy-alert new file mode 100755 index 0000000..1dcb7c5 --- /dev/null +++ b/.bin/dummy-alert @@ -0,0 +1,43 @@ +#!/bin/bash + +name=$RANDOM +url='http://localhost:9093/api/v1/alerts' + +echo "firing up alert $name" + +# change url o +curl -XPOST $url -d "[{ + \"status\": \"firing\", + \"labels\": { + \"alertname\": \"$name\", + \"service\": \"my-service\", + \"severity\":\"warning\", + \"instance\": \"$name.example.net\" + }, + \"annotations\": { + \"summary\": \"High latency is high!\" + }, + \"generatorURL\": \"http://prometheus.int.example.net/\" +}]" + +echo "" + +echo "press enter to resolve alert" +read + +echo "sending resolve" +curl -XPOST $url -d "[{ + \"status\": \"resolved\", + \"labels\": { + \"alertname\": \"$name\", + \"service\": \"my-service\", + \"severity\":\"warning\", + \"instance\": \"$name.example.net\" + }, + \"annotations\": { + \"summary\": \"High latency is high!\" + }, + \"generatorURL\": \"http://prometheus.int.example.net/\" +}]" + +echo "" diff --git a/configs/alacritty.nix b/configs/alacritty.nix index 1559cf3..d08d4c1 100644 --- a/configs/alacritty.nix +++ b/configs/alacritty.nix @@ -57,7 +57,7 @@ in { ]; environment.etc = { - "themes/dark/alacritty.yml".source = alacritty-cfg (import ); - "themes/light/alacritty.yml".source = alacritty-cfg (import ); + "themes/dark/alacritty.yml".source = alacritty-cfg (import ); + "themes/light/alacritty.yml".source = alacritty-cfg (import ); }; } diff --git a/lib/colours/papercolor-dark.nix b/lib/colours/papercolor-dark.nix new file mode 100644 index 0000000..9e4515b --- /dev/null +++ b/lib/colours/papercolor-dark.nix @@ -0,0 +1,37 @@ +rec { + black = { + dark = "#1c1c1c"; + bright = "#585858"; + }; + red = { + dark = "#af005f"; + bright = "#5faf5f"; + }; + green = { + bright = "#afd700"; + dark = "#5faf00"; + }; + yellow = { + bright = "#af87d7"; + dark = "#d7af5f"; + }; + blue = { + dark = "#5fafd7"; + bright = "#ffaf00"; + }; + magenta = { + bright = "#ff5faf"; + dark = "#808080"; + }; + cyan = { + dark = "#d7875f"; + bright = "#00afaf"; + }; + white = { + dark = "#d0d0d0"; + bright = "#5f8787"; + }; + background = black.dark; + foreground = white.dark; + cursor = blue.bright; +} diff --git a/lib/colours/papercolor-light.nix b/lib/colours/papercolor-light.nix new file mode 100644 index 0000000..e27ea64 --- /dev/null +++ b/lib/colours/papercolor-light.nix @@ -0,0 +1,37 @@ +rec { + black = { + dark = "#eeeeee"; + bright = "#bcbcbc"; + }; + red = { + dark = "#af0000"; + bright = "#d70000"; + }; + green = { + dark = "#008700"; + bright = "#d70087"; + }; + yellow = { + dark = "#5f8700"; + bright = "#8700af"; + }; + blue = { + dark = "#0087af"; + bright = "#d75f00"; + }; + magenta = { + bright = "#878787"; + dark = "#d75f00"; + }; + cyan = { + dark = "#005f87"; + bright = "#005faf"; + }; + white = { + dark = "#444444"; + bright = "#005f87"; + }; + background = black.dark; + foreground = white.dark; + cursor = blue.bright; +} diff --git a/lib/default.nix b/lib/default.nix index 1943243..43e6471 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -40,7 +40,7 @@ rec { sshPort = 22022; - colours = import ./colours/ibm-3270.nix; + colours = import ./colours/papercolor-dark.nix; theme = pkgs: { gtk = { diff --git a/lib/i3status-rust.nix b/lib/i3status-rust.nix index 6cd6b3e..ceffd4e 100644 --- a/lib/i3status-rust.nix +++ b/lib/i3status-rust.nix @@ -23,7 +23,7 @@ in { warning_fg = colours.yellow.bright; warning_bg = colours.background; alternating_tint_bg = colours.background; - alternating_tint_fg = colours.background; + alternating_tint_fg = colours.foreground; critical_bg = colours.background; good_bg = colours.background; idle_bg = colours.background;