From 650138427f55bab1f30d27b6959eb4107b26b8db Mon Sep 17 00:00:00 2001 From: Tyler Kelley Date: Sun, 14 Jan 2024 01:35:25 -0600 Subject: [PATCH] Updated Nix Colors Variables --- config/kitty.nix | 60 ++++++++++++++++++++++---------------------- config/waybar.nix | 64 +++++++++++++++++++++++------------------------ flake.lock | 51 +++++++++++++++++++++++++++++++++++++ home.nix | 1 - 4 files changed, 113 insertions(+), 63 deletions(-) diff --git a/config/kitty.nix b/config/kitty.nix index 8e57405..073eb74 100644 --- a/config/kitty.nix +++ b/config/kitty.nix @@ -15,41 +15,41 @@ background_opacity = "0.85"; }; extraConfig = '' - foreground ${base15} - background ${base00} - color0 ${base00} - color8 ${base00} - color1 ${base01} - color9 ${base09} - color2 ${base02} - color10 ${base0A} - color3 ${base03} - color11 ${base0B} - color4 ${base04} - color12 ${base0C} - color5 ${base05} - color13 ${base0D} - color6 ${base06} - color14 ${base0E} - color7 ${base07} - color15 ${base0F} - cursor ${base07} - cursor_text_color ${base00} + foreground ${config.colorScheme.colors.base15} + background ${config.colorScheme.colors.base00} + color0 ${config.colorScheme.colors.base00} + color8 ${config.colorScheme.colors.base00} + color1 ${config.colorScheme.colors.base01} + color9 ${config.colorScheme.colors.base09} + color2 ${config.colorScheme.colors.base02} + color10 ${config.colorScheme.colors.base0A} + color3 ${config.colorScheme.colors.base03} + color11 ${config.colorScheme.colors.base0B} + color4 ${config.colorScheme.colors.base04} + color12 ${config.colorScheme.colors.base0C} + color5 ${config.colorScheme.colors.base05} + color13 ${config.colorScheme.colors.base0D} + color6 ${config.colorScheme.colors.base06} + color14 ${config.colorScheme.colors.base0E} + color7 ${config.colorScheme.colors.base07} + color15 ${config.colorScheme.colors.base0F} + cursor ${config.colorScheme.colors.base07} + cursor_text_color ${config.colorScheme.colors.base00} selection_foreground none - selection_background ${base08} - url_color ${base02} - active_border_color ${base04} - inactive_border_color ${base00} - bell_border_color ${base03} + selection_background ${config.colorScheme.colors.base08} + url_color ${config.colorScheme.colors.base02} + active_border_color ${config.colorScheme.colors.base04} + inactive_border_color ${config.colorScheme.colors.base00} + bell_border_color ${config.colorScheme.colors.base03} tab_bar_style fade tab_fade 1 - active_tab_foreground ${base04} - active_tab_background ${base00} + active_tab_foreground ${config.colorScheme.colors.base04} + active_tab_background ${config.colorScheme.colors.base00} active_tab_font_style bold - inactive_tab_foreground ${base07} - inactive_tab_background ${base08} + inactive_tab_foreground ${config.colorScheme.colors.base07} + inactive_tab_background ${config.colorScheme.colors.base08} inactive_tab_font_style bold - tab_bar_background ${base00} + tab_bar_background ${config.colorScheme.colors.base00} ''; }; } diff --git a/config/waybar.nix b/config/waybar.nix index dab7f81..ad09678 100644 --- a/config/waybar.nix +++ b/config/waybar.nix @@ -114,115 +114,115 @@ background-color: rgba(26,27,38,0); border-bottom: 1px solid rgba(26,27,38,0); border-radius: 0px; - color: ${base0F}; + color: ${config.colorScheme.colors.base0F}; } #workspaces { - background: linear-gradient(180deg, ${base00}, ${base08}); + background: linear-gradient(180deg, ${config.colorScheme.colors.base00}, ${config.colorScheme.colors.base08}); margin: 5px; padding: 0px 1px; border-radius: 15px; border: 0px; font-style: normal; - color: ${base00}; + color: ${config.colorScheme.colors.base00}; } #workspaces button { padding: 0px 5px; margin: 4px 3px; border-radius: 15px; border: 0px; - color: ${base00}; - background-color: ${base00}; + color: ${config.colorScheme.colors.base00}; + background-color: ${config.colorScheme.colors.base00}; opacity: 1.0; transition: all 0.3s ease-in-out; } #workspaces button.active { - color: ${base00}; - background: ${base04}; + color: ${config.colorScheme.colors.base00}; + background: ${config.colorScheme.colors.base04}; border-radius: 15px; min-width: 40px; transition: all 0.3s ease-in-out; opacity: 1.0; } #workspaces button:hover { - color: ${base00}; - background: ${base04}; + color: ${config.colorScheme.colors.base00}; + background: ${config.colorScheme.colors.base04}; border-radius: 15px; opacity: 1.0; } tooltip { - background: ${base00}; - border: 1px solid ${base04}; + background: ${config.colorScheme.colors.base00}; + border: 1px solid ${config.colorScheme.colors.base04}; border-radius: 10px; } tooltip label { - color: ${base07}; + color: ${config.colorScheme.colors.base07}; } #window { - color: ${base06}; - background: ${base00}; + color: ${config.colorScheme.colors.base06}; + background: ${config.colorScheme.colors.base00}; border-radius: 0px 15px 50px 0px; margin: 5px 5px 5px 0px; padding: 2px 20px; } #memory { - color: ${base05}; - background: ${base00}; + color: ${config.colorScheme.colors.base05}; + background: ${config.colorScheme.colors.base00}; border-radius: 15px 50px 15px 50px; margin: 5px; padding: 2px 20px; } #clock { - color: ${base07}; - background: ${base00}; + color: ${config.colorScheme.colors.base07}; + background: ${config.colorScheme.colors.base00}; border-radius: 15px 50px 15px 50px; margin: 5px; padding: 2px 20px; } #cpu { - color: ${base05}; - background: ${base00}; + color: ${config.colorScheme.colors.base05}; + background: ${config.colorScheme.colors.base00}; border-radius: 50px 15px 50px 15px; margin: 5px; padding: 2px 20px; } #disk { - color: ${base02}; - background: ${base00}; + color: ${config.colorScheme.colors.base02}; + background: ${config.colorScheme.colors.base00}; border-radius: 15px 50px 15px 50px; margin: 5px; padding: 2px 20px; } #battery { - color: ${base01}; - background: ${base00}; + color: ${config.colorScheme.colors.base01}; + background: ${config.colorScheme.colors.base00}; border-radius: 15px; margin: 5px; padding: 2px 20px; } #network { - color: ${base03}; - background: ${base00}; + color: ${config.colorScheme.colors.base03}; + background: ${config.colorScheme.colors.base00}; border-radius: 50px 15px 50px 15px; margin: 5px; padding: 2px 20px; } #tray { - color: ${base07}; - background: ${base00}; + color: ${config.colorScheme.colors.base07}; + background: ${config.colorScheme.colors.base00}; border-radius: 15px 0px 0px 50px; margin: 5px 0px 5px 5px; padding: 2px 20px; } #pulseaudio { - color: ${base05}; - background: ${base00}; + color: ${config.colorScheme.colors.base05}; + background: ${config.colorScheme.colors.base00}; border-radius: 50px 15px 50px 15px; margin: 5px; padding: 2px 20px; } #custom-notification { - color: ${base04}; - background: ${base00}; + color: ${config.colorScheme.colors.base04}; + background: ${config.colorScheme.colors.base00}; border-radius: 15px 50px 15px 50px; margin: 5px; padding: 2px 20px; diff --git a/flake.lock b/flake.lock index f957ae0..84f0a1e 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "base16-schemes": { + "flake": false, + "locked": { + "lastModified": 1689473676, + "narHash": "sha256-L0RhUr9+W5EPWBpLcmkKpUeCEWRs/kLzVMF3Vao2ZU0=", + "owner": "tinted-theming", + "repo": "base16-schemes", + "rev": "d95123ca6377cd849cfdce92c0a24406b0c6a789", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-schemes", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -86,6 +102,25 @@ "type": "github" } }, + "nix-colors": { + "inputs": { + "base16-schemes": "base16-schemes", + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1695388192, + "narHash": "sha256-2jelpE7xK+4M7jZNyWL7QYOYegQLYBDQS5bvdo8XRUQ=", + "owner": "misterio77", + "repo": "nix-colors", + "rev": "37227f274b34a3b51649166deb94ce7fec2c6a4c", + "type": "github" + }, + "original": { + "owner": "misterio77", + "repo": "nix-colors", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1704194953, @@ -102,6 +137,21 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1694911725, + "narHash": "sha256-8YqI+YU1DGclEjHsnrrGfqsQg3Wyga1DfTbJrN3Ud0c=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "819180647f428a3826bfc917a54449da1e532ce0", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1702645756, @@ -138,6 +188,7 @@ "inputs": { "home-manager": "home-manager", "hyprland": "hyprland", + "nix-colors": "nix-colors", "nixpkgs": "nixpkgs_3" } }, diff --git a/home.nix b/home.nix index 32333fb..501311a 100644 --- a/home.nix +++ b/home.nix @@ -10,7 +10,6 @@ colorScheme = inputs.nix-colors.colorSchemes.gruvbox-dark-medium; imports = [ - inputs.nix-colors.homeManagerModules.default ./config/waybar.nix ./config/kitty.nix ];