From e5e97e426192291721e557be373cbe4fbb8cfcca Mon Sep 17 00:00:00 2001 From: Frost-Phoenix <67cyril6767@gmail.com> Date: Sun, 12 Nov 2023 18:26:30 +0100 Subject: [PATCH] change waybar config --- modules/home/waybar/default.nix | 30 ++++++++++++++++++++++++++++++ modules/home/waybar/settings.nix | 22 +++++++++++----------- modules/home/waybar/style.nix | 22 +++++++++++----------- 3 files changed, 52 insertions(+), 22 deletions(-) diff --git a/modules/home/waybar/default.nix b/modules/home/waybar/default.nix index 9b8b240..8f664fe 100755 --- a/modules/home/waybar/default.nix +++ b/modules/home/waybar/default.nix @@ -1,5 +1,35 @@ { ... }: +let + custom = { + font = "RobotoMono Nerd Font"; + fontsize = "12"; + primary_accent = "cba6f7"; + secondary_accent= "89b4fa"; + tertiary_accent = "f5f5f5"; + background = "11111B"; + opacity = "1"; + cursor = "Numix-Cursor"; + palette = { + primary_accent_hex = "cba6f7"; + secondary_accent_hex = "89b4fa"; + tertiary_accent_hex = "f5f5f5"; + primary_background_hex = "11111B"; + secondary_background_hex = "1b1b2b"; + tertiary_background_hex = "25253a"; + + primary_accent_rgba = "rgba(203,166,247,${opacity})"; + secondary_accent_rgba = "rgba(137,180,250,${opacity})"; + tertiary_accent_rgba = "rgba(245,245,245,${opacity})"; + primary_background_rgba = "rgba(17,17,27,${opacity})"; + secondary_background_rgba = "rgba(27,27,43,${opacity})"; + tertiary_background_rgba = "rgba(37,37,58,${opacity})"; + + opacity = "1"; + }; + }; +in { + _module.args = { inherit custom; }; imports = [ (import ./waybar.nix) ] ++ [ (import ./settings.nix) ] ++ [ (import ./style.nix) ]; diff --git a/modules/home/waybar/settings.nix b/modules/home/waybar/settings.nix index cb884d6..80dd6e2 100644 --- a/modules/home/waybar/settings.nix +++ b/modules/home/waybar/settings.nix @@ -1,14 +1,14 @@ -{ ... }: -let - custom = { - font = "JetBrainsMono Nerd Font"; - fontsize = "12"; - primary_accent = "cba6f7"; - secondary_accent = "89b4fa"; - tertiary_accent = "f5f5f5"; - background = "11111B"; - }; -in +{ + custom ? { + font = "JetBrainsMono Nerd Font"; + fontsize = "12"; + primary_accent = "cba6f7"; + secondary_accent = "89b4fa"; + tertiary_accent = "f5f5f5"; + background = "11111B"; + }, + ... +}: { programs.waybar.settings.mainBar = { position= "top"; diff --git a/modules/home/waybar/style.nix b/modules/home/waybar/style.nix index 9b1b970..463d030 100644 --- a/modules/home/waybar/style.nix +++ b/modules/home/waybar/style.nix @@ -1,14 +1,14 @@ -{ ... }: -let - custom = { - font = "JetBrainsMono Nerd Font"; - fontsize = "12"; - primary_accent = "cba6f7"; - secondary_accent = "89b4fa"; - tertiary_accent = "f5f5f5"; - background = "11111B"; - }; -in +{ + custom ? { + font = "JetBrainsMono Nerd Font"; + fontsize = "12"; + primary_accent = "cba6f7"; + secondary_accent = "89b4fa"; + tertiary_accent = "f5f5f5"; + background = "11111B"; + }, + ... +}: { programs.waybar.style = '' * {