From ee8d454148aa36f93f3cbb0b0956d8f95d11234d Mon Sep 17 00:00:00 2001 From: Tyler Kelley Date: Mon, 12 Feb 2024 21:29:39 -0600 Subject: [PATCH] Add New Waybar Theme & move comments in options.nix to right place --- config/home/waybar.nix | 85 ++++++++++++++++++++++++++++++++++++++++++ options.nix | 11 +++--- 2 files changed, 91 insertions(+), 5 deletions(-) diff --git a/config/home/waybar.nix b/config/home/waybar.nix index 155a7a1..bdf15bb 100644 --- a/config/home/waybar.nix +++ b/config/home/waybar.nix @@ -145,6 +145,11 @@ in with lib; { border-bottom: 1px solid rgba(26,27,38,0); border-radius: 0px; color: #${palette.base0F}; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background-color: #${palette.base00}; + border-radius: 0px; + border-bottom: 1px solid rgba(26,27,38,0); '' else '' background-color: #${palette.base00}; border-bottom: 1px solid #${palette.base00}; @@ -161,6 +166,12 @@ in with lib; { border: 0px; font-style: normal; color: #${palette.base00}; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + border-radius: 0px; + border: 0px; + font-style: normal; '' else '' background: linear-gradient(45deg, #${palette.base01}, #${palette.base01}); margin: 4px; @@ -181,6 +192,12 @@ in with lib; { background: linear-gradient(45deg, #${palette.base0D}, #${palette.base0E}); opacity: 0.5; transition: all 0.3s ease-in-out; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + opacity: 0.3; + border: 0px; + transition: all 0.3s ease-in-out; '' else '' padding: 0px 5px; margin: 4px 3px; @@ -203,6 +220,12 @@ in with lib; { opacity: 1.0; min-width: 40px; transition: all 0.3s ease-in-out; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + opacity: 1.0; + border: 0px; + transition: all 0.3s ease-in-out; '' else '' padding: 0px 5px; margin: 4px 3px; @@ -221,6 +244,12 @@ in with lib; { color: #${palette.base00}; background: linear-gradient(45deg, #${palette.base0D}, #${palette.base0E}); opacity: 0.8; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + opacity: 0.8; + border: 0px; + transition: all 0.3s ease-in-out; '' else '' border-radius: 10px; color: #${palette.base00}; @@ -243,6 +272,10 @@ in with lib; { border-radius: 50px 15px 50px 15px; margin: 5px; padding: 2px 20px; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + margin: 4px; '' else '' margin: 4px; padding: 2px 10px; @@ -258,6 +291,10 @@ in with lib; { border-radius: 15px 50px 15px 50px; margin: 5px; padding: 2px 20px; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + margin: 4px; '' else '' background: #${palette.base01}; margin: 4px; @@ -272,6 +309,10 @@ in with lib; { border-radius: 15px 50px 15px 50px; margin: 5px; padding: 2px 20px; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + margin: 4px; '' else '' background: #${palette.base01}; margin: 4px; @@ -286,6 +327,10 @@ in with lib; { border-radius: 50px 15px 50px 15px; margin: 5px; padding: 2px 20px; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + margin: 4px; '' else '' background: #${palette.base01}; margin: 4px; @@ -300,6 +345,10 @@ in with lib; { border-radius: 50px 15px 50px 15px; margin: 5px; padding: 2px 20px; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + margin: 4px; '' else '' background: #${palette.base01}; margin: 4px; @@ -314,6 +363,10 @@ in with lib; { border-radius: 15px 50px 15px 50px; margin: 5px; padding: 2px 20px; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + margin: 4px; '' else '' background: #${palette.base01}; margin: 4px; @@ -328,6 +381,10 @@ in with lib; { border-radius: 15px 50px 15px 50px; margin: 5px; padding: 2px 20px; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + margin: 4px; '' else '' background: #${palette.base01}; margin: 4px; @@ -342,6 +399,10 @@ in with lib; { border-radius: 50px 15px 50px 15px; margin: 5px; padding: 2px 20px; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + margin: 4px; '' else '' background: #${palette.base01}; margin: 4px; @@ -356,6 +417,10 @@ in with lib; { border-radius: 15px 0px 0px 50px; margin: 5px 0px 5px 5px; padding: 2px 20px; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + margin: 4px; '' else '' background: #${palette.base01}; margin: 4px; @@ -370,6 +435,10 @@ in with lib; { border-radius: 50px 15px 50px 15px; margin: 5px; padding: 2px 20px; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + margin: 4px; '' else '' background: #${palette.base01}; margin: 4px; @@ -384,6 +453,10 @@ in with lib; { border-radius: 15px 50px 15px 50px; margin: 5px; padding: 2px 20px; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + margin: 4px; '' else '' background: #${palette.base01}; margin: 4px; @@ -398,6 +471,10 @@ in with lib; { border-radius: 15px 50px 15px 50px; margin: 5px; padding: 2px 20px; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + margin: 4px; '' else '' background: #${palette.base01}; margin: 4px; @@ -412,6 +489,10 @@ in with lib; { border-radius: 0px 15px 50px 0px; margin: 5px 5px 5px 0px; padding: 2px 20px; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + margin: 4px; '' else '' background: #${palette.base01}; margin: 4px; @@ -426,6 +507,10 @@ in with lib; { border-radius: 15px 50px 15px 50px; margin: 5px; padding: 2px 20px; + '' else if simplebar == true then '' + color: #${config.colorScheme.colors.base05}; + background: transparent; + margin: 4px; '' else '' background: #${palette.base01}; margin: 4px; diff --git a/options.nix b/options.nix index da44d38..7dec004 100644 --- a/options.nix +++ b/options.nix @@ -5,11 +5,9 @@ let username = "zaney"; hostname = "hyprnix"; - # This is for running NixOS - # On a tmpfs or root on RAM - # You Most Like Want This -> false userHome = "/home/${username}"; flakeDir = "${userHome}/zaneyos"; + waybarStyle = "default"; # simplebar, slickbar, or default in { # User Variables username = "${username}"; @@ -17,8 +15,8 @@ in { gitUsername = "Tyler Kelley"; gitEmail = "tylerzanekelley@gmail.com"; theme = "gigavolt"; - slickbar = true; - simplebar = false; # DO NOT ENABLE! + slickbar = if waybarStyle == "slickbar" then true else false; + simplebar = if waybarStyle == "simplebar" then true else false; borderAnim = true; browser = "firefox"; wallpaperGit = "https://gitlab.com/Zaney/my-wallpapers.git"; # This will give you my wallpapers @@ -38,6 +36,9 @@ in { theTimezone = "America/Chicago"; theShell = "bash"; # Possible options: bash, zsh theKernel = "default"; # Possible options: default, latest, lqx, xanmod, zen + # This is for running NixOS + # On a tmpfs or root on RAM + # You Most Like Want This -> false impermanence = true; # This should be set to false unless you know what your doing! sdl-videodriver = "x11"; # Either x11 or wayland ONLY. Games might require x11 set here # For Hybrid Systems intel-nvidia