[feat]: Everforest

raexera · Jan 7, 2024 · ff89364 · ff89364
1 parent 6d4c234
commit ff89364
Show file tree

Hide file tree

Showing 8 changed files with 111 additions and 126 deletions.
diff --git a/home/modules/windowManager/hyprland/programs/swaylock.nix b/home/modules/windowManager/hyprland/programs/swaylock.nix
@@ -23,25 +23,25 @@
       fade-in = "0.1";
       effect-blur = "20x5";
 
-      ring-color = "${xcolors.base00}33";
-      line-color = "${xcolors.base00}66";
-      inside-color = "${xcolors.base00}66";
-      inside-ver-color = "${xcolors.base00}66";
-      inside-wrong-color = "${xcolors.base00}66";
-      inside-clear-color = "${xcolors.base00}66";
-      line-clear-color = "${xcolors.base00}66";
-      line-wrong-color = "${xcolors.base00}66";
-      text-color = "${xcolors.base05}CC";
-      text-caps-lock-color = "${xcolors.base05}CC";
-      text-ver-color = "${xcolors.base05}CC";
-      text-clear-color = "${xcolors.base05}CC";
-      text-wrong-color = "${xcolors.base08}CC";
-      ring-wrong-color = "${xcolors.base08}CC";
-      key-hl-color = "${xcolors.base0C}CC";
-      line-ver-color = "${xcolors.base0C}CC";
-      ring-ver-color = "${xcolors.base0C}CC";
-      ring-clear-color = "${xcolors.base0C}CC";
-      bs-hl-color = "${xcolors.base0C}CC";
+      ring-color = "${xcolors.background}33";
+      line-color = "${xcolors.background}66";
+      inside-color = "${xcolors.background}66";
+      inside-ver-color = "${xcolors.background}66";
+      inside-wrong-color = "${xcolors.background}66";
+      inside-clear-color = "${xcolors.background}66";
+      line-clear-color = "${xcolors.background}66";
+      line-wrong-color = "${xcolors.background}66";
+      text-color = "${xcolors.foreground}CC";
+      text-caps-lock-color = "${xcolors.foreground}CC";
+      text-ver-color = "${xcolors.foreground}CC";
+      text-clear-color = "${xcolors.foreground}CC";
+      text-wrong-color = "${xcolors.color1}CC";
+      ring-wrong-color = "${xcolors.color1}CC";
+      key-hl-color = "${xcolors.color4}CC";
+      line-ver-color = "${xcolors.color4}CC";
+      ring-ver-color = "${xcolors.color4}CC";
+      ring-clear-color = "${xcolors.color4}CC";
+      bs-hl-color = "${xcolors.color4}CC";
     };
   };
 }
diff --git a/home/modules/windowManager/hyprland/programs/waybar.nix b/home/modules/windowManager/hyprland/programs/waybar.nix
@@ -69,18 +69,18 @@ in {
           };
         };
         network = {
-          format-wifi = formatIcons "${xcolors.base08}CC" "󰖩" + " {essid}";
-          format-ethernet = formatIcons "${xcolors.base08}CC" "󰈀" + " {ipaddr}/{cidr}";
-          format-disconnected = formatIcons "${xcolors.base08}CC" "󰖪";
+          format-wifi = formatIcons "${xcolors.color6}CC" "󰖩" + " {essid}";
+          format-ethernet = formatIcons "${xcolors.color6}CC" "󰈀" + " {ipaddr}/{cidr}";
+          format-disconnected = formatIcons "${xcolors.color1}CC" "󰖪";
           tooltip-format = ''
             󰅃 {bandwidthUpBytes} 󰅀 {bandwidthDownBytes}
             {ipaddr}/{ifname} via {gwaddr} ({signalStrength}%)'';
         };
         "pulseaudio#microphone" = {
           tooltip = false;
           format = "{format_source}";
-          format-source = formatIcons "${xcolors.base09}CC" "󰍬" + " {volume}%";
-          format-source-muted = formatIcons "${xcolors.base08}CC" "󰍭";
+          format-source = formatIcons "${xcolors.color5}CC" "󰍬" + " {volume}%";
+          format-source-muted = formatIcons "${xcolors.color1}CC" "󰍭";
           on-click = "${_ pamixer} --default-source -t";
           on-scroll-up = "${_ pamixer} --default-source -d 1";
           on-scroll-down = "${_ pamixer} --default-source -i 1";
@@ -104,8 +104,8 @@ in {
         };
         pulseaudio = {
           tooltip = false;
-          format = formatIcons "${xcolors.base0A}CC" "{icon}" + " {volume}%";
-          format-muted = formatIcons "${xcolors.base08}CC" "󰖁";
+          format = formatIcons "${xcolors.color5}CC" "{icon}" + " {volume}%";
+          format-muted = formatIcons "${xcolors.color1}CC" "󰖁";
           format-icons = {default = ["󰕿" "󰖀" "󰕾"];};
           on-click = "${_ pamixer} -t";
           on-scroll-up = "${_ pamixer} -d 1";
@@ -130,7 +130,7 @@ in {
         };
         backlight = {
           tooltip = false;
-          format = formatIcons "${xcolors.base0B}CC" "{icon}" + " {percent}%";
+          format = formatIcons "${xcolors.color4}CC" "{icon}" + " {percent}%";
           format-icons = ["󰋙" "󰫃" "󰫄" "󰫅" "󰫆" "󰫇" "󰫈"];
           on-scroll-up = "${_ brightnessctl} -q s 1%-";
           on-scroll-down = "${_ brightnessctl} -q s +1%";
@@ -141,20 +141,20 @@ in {
             critical = 15;
           };
           tooltip-format = "{timeTo}, {capacity}%";
-          format = formatIcons "${xcolors.base0C}CC" "{icon}" + " {capacity}%";
-          format-charging = formatIcons "${xcolors.base0B}CC" "󰂄" + " {capacity}%";
-          format-plugged = formatIcons "${xcolors.base0B}CC" "󰚥" + " {capacity}%";
+          format = formatIcons "${xcolors.color3}CC" "{icon}" + " {capacity}%";
+          format-charging = formatIcons "${xcolors.color3}CC" "󰂄" + " {capacity}%";
+          format-plugged = formatIcons "${xcolors.color3}CC" "󰚥" + " {capacity}%";
           format-icons = ["󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
         };
         "clock#date" = {
-          format = formatIcons "${xcolors.base0D}CC" "󰃶" + " {:%a %d %b}";
+          format = formatIcons "${xcolors.color2}CC" "󰃶" + " {:%a %d %b}";
           tooltip-format = ''
             <big>{:%Y %B}</big>
             <tt><small>{calendar}</small></tt>'';
         };
         clock = {
-          format = formatIcons "${xcolors.base0E}CC" "󱑎" + " {:%I:%M %p}";
-          format-alt = formatIcons "${xcolors.base0E}CC" "󱑎" + " {:%H:%M}";
+          format = formatIcons "${xcolors.color2}CC" "󱑎" + " {:%I:%M %p}";
+          format-alt = formatIcons "${xcolors.color2}CC" "󱑎" + " {:%H:%M}";
         };
         "group/group-power" = {
           orientation = "inherit";
@@ -172,27 +172,27 @@ in {
           ];
         };
         "custom/quit" = {
-          format = formatIcons "${xcolors.base0C}CC" "󰍃";
+          format = formatIcons "${xcolors.color5}CC" "󰍃";
           onclick = "loginctl terminate-user $USER";
           tooltip = false;
         };
         "custom/lock" = {
-          format = formatIcons "${xcolors.base0B}CC" "󰌾";
+          format = formatIcons "${xcolors.color4}CC" "󰌾";
           onclick = "loginctl lock-session";
           tooltip = false;
         };
         "custom/suspend" = {
-          format = formatIcons "${xcolors.base0D}CC" "󰒲";
+          format = formatIcons "${xcolors.color3}CC" "󰒲";
           onclick = "systemctl suspend";
           tooltip = false;
         };
         "custom/reboot" = {
-          format = formatIcons "${xcolors.base0E}CC" "󰜉";
+          format = formatIcons "${xcolors.color2}CC" "󰜉";
           on-click = "systemctl reboot";
           tooltip = false;
         };
         "custom/power" = {
-          format = formatIcons "${xcolors.base0F}CC" "󰐥";
+          format = formatIcons "${xcolors.color1}CC" "󰐥";
           on-click = "systemctl poweroff";
           tooltip = false;
         };
@@ -211,7 +211,7 @@ in {
       }
 
       window#waybar {
-        background-color: alpha(${xcolors.base00}, 0.2);
+        background-color: alpha(${xcolors.background}, 0.2);
       }
 
       #custom-search {
@@ -223,8 +223,18 @@ in {
         background-repeat: no-repeat;
       }
 
+      #user {
+        color: alpha(${xcolors.color7}, 0.8);
+        text-shadow:
+          0 0 0.14em ${xcolors.color7},
+          0 0 0.27em ${xcolors.color7},
+          0 0 0.41em ${xcolors.color7},
+          0 0 0.55em ${xcolors.color7},
+          0 0 0.68em ${xcolors.color7};
+      }
+
       #workspaces {
-        background-color: alpha(${xcolors.base00}, 0.2);
+        background-color: alpha(${xcolors.background}, 0.4);
         border-radius: 4px;
         margin: 0.41em 0.21em;
         padding: 0.41em 0.82em;
@@ -240,36 +250,23 @@ in {
       }
 
       #workspaces button label {
-        color: alpha(${xcolors.base05}, 0.8);
+        color: alpha(${xcolors.foreground}, 0.8);
       }
 
       #workspaces button.empty label {
-        color: alpha(${xcolors.base05}, 0.4);
+        color: alpha(${xcolors.foreground}, 0.4);
       }
 
       #workspaces button.urgent label {
-        color: alpha(${xcolors.base08}, 0.8);
+        color: alpha(${xcolors.color1}, 0.8);
       }
 
       #workspaces button.special label {
-        color: alpha(${xcolors.base0A}, 0.8);
-        text-shadow:
-          0 0 0.14em ${xcolors.base0A},
-          0 0 0.27em ${xcolors.base0A},
-          0 0 0.41em ${xcolors.base0A},
-          0 0 0.55em ${xcolors.base0A},
-          0 0 0.68em ${xcolors.base0A};
+        color: alpha(${xcolors.color3}, 0.8);
       }
 
-      #user,
       #workspaces button.active label {
-        color: alpha(${xcolors.base08}, 0.8);
-        text-shadow:
-          0 0 0.14em ${xcolors.base08},
-          0 0 0.27em ${xcolors.base08},
-          0 0 0.41em ${xcolors.base08},
-          0 0 0.55em ${xcolors.base08},
-          0 0 0.68em ${xcolors.base08};
+        color: alpha(${xcolors.color4}, 0.8);
       }
 
       #backlight,
@@ -288,8 +285,8 @@ in {
       #pulseaudio.microphone,
       #tray,
       #user {
-        color: alpha(${xcolors.base05}, 0.8);
-        background-color: alpha(${xcolors.base00}, 0.2);
+        color: alpha(${xcolors.foreground}, 0.8);
+        background-color: alpha(${xcolors.background}, 0.4);
         border-radius: 4px;
         margin: 0.41em 0.21em;
         padding: 0.41em 0.82em;
@@ -311,7 +308,7 @@ in {
         min-height: 0.68em;
         min-width: 5.47em;
         border-radius: 8px;
-        background-color: alpha(${xcolors.base00}, 0.2);
+        background-color: alpha(${xcolors.background}, 0.4);
       }
 
       #backlight-slider highlight,
@@ -321,26 +318,26 @@ in {
       }
 
       #backlight-slider highlight {
-        background-color: alpha(${xcolors.base0B}, 0.8);
+        background-color: alpha(${xcolors.color4}, 0.8);
         box-shadow:
-          0 0 0.14em ${xcolors.base0B},
-          0 0 0.27em ${xcolors.base0B},
-          0 0 0.41em ${xcolors.base0B},
-          0 0 0.55em ${xcolors.base0B};
+          0 0 0.14em ${xcolors.color4},
+          0 0 0.27em ${xcolors.color4},
+          0 0 0.41em ${xcolors.color4},
+          0 0 0.55em ${xcolors.color4};
       }
 
       #pulseaudio-slider highlight {
-        background-color: alpha(${xcolors.base0A}, 0.8);
+        background-color: alpha(${xcolors.color5}, 0.8);
         box-shadow:
-          0 0 0.14em ${xcolors.base0A},
-          0 0 0.27em ${xcolors.base0A},
-          0 0 0.41em ${xcolors.base0A},
-          0 0 0.55em ${xcolors.base0A};
+          0 0 0.14em ${xcolors.color5},
+          0 0 0.27em ${xcolors.color5},
+          0 0 0.41em ${xcolors.color5},
+          0 0 0.55em ${xcolors.color5};
       }
 
       tooltip {
-        color: alpha(${xcolors.base05}, 0.8);
-        background-color: alpha(${xcolors.base00}, 0.2);
+        color: alpha(${xcolors.foreground}, 0.8);
+        background-color: alpha(${xcolors.background}, 0.4);
         font-family: "Dosis", sans-serif;
         border-radius: 8px;
         padding: 1.37em;

diff --git a/home/modules/windowManager/hyprland/programs/wofi.nix b/home/modules/windowManager/hyprland/programs/wofi.nix
@@ -32,14 +32,14 @@
       }
 
       #window {
-        background: alpha(${xcolors.base00}, 0.2);
+        background: alpha(${xcolors.background}, 0.2);
         border-radius: 12px;
       }
 
       #input {
         border-radius: 12px;
-        border: 1px solid alpha(${xcolors.base0C}, 0.8);
-        background: alpha(${xcolors.base00}, 0.2);
+        border: 1px solid alpha(${xcolors.color4}, 0.8);
+        background: alpha(${xcolors.background}, 0.2);
         padding: 0.75em;
         margin-bottom: 1.5em;
       }
@@ -50,7 +50,7 @@
 
       #text {
         margin: 0.25em;
-        color: alpha(${xcolors.base05}, 0.8);
+        color: alpha(${xcolors.foreground}, 0.8);
       }
 
       #img {
@@ -64,7 +64,7 @@
       }
 
       #entry:selected {
-        background: alpha(${xcolors.base00}, 0.2);
+        background: alpha(${xcolors.background}, 0.2);
         font-weight: bold;
       }
     '';

diff --git a/home/modules/windowManager/hyprland/services/dunst.nix b/home/modules/windowManager/hyprland/services/dunst.nix
@@ -121,23 +121,23 @@ in {
       fullscreen_delay_everything.fullscreen = "delay";
 
       urgency_low = {
-        background = "${xcolors.base00}33";
-        foreground = "${xcolors.base05}CC";
-        highlight = "${xcolors.base0C}CC";
+        background = "${xcolors.background}33";
+        foreground = "${xcolors.foreground}CC";
+        highlight = "${xcolors.color4}CC";
         timeout = 2;
       };
 
       urgency_normal = {
-        background = "${xcolors.base00}33";
-        foreground = "${xcolors.base05}CC";
-        highlight = "${xcolors.base0C}CC";
+        background = "${xcolors.background}33";
+        foreground = "${xcolors.foreground}CC";
+        highlight = "${xcolors.color4}CC";
         timeout = 2;
       };
 
       urgency_critical = {
-        background = "${xcolors.base08}33";
-        foreground = "${xcolors.base05}CC";
-        highlight = "${xcolors.base0C}CC";
+        background = "${xcolors.color1}33";
+        foreground = "${xcolors.foreground}CC";
+        highlight = "${xcolors.color4}CC";
         timeout = 10;
       };
     };

diff --git a/modules/theme/base16-schemes/everforest.nix b/modules/theme/base16-schemes/everforest.nix
diff --git a/modules/theme/colorscheme.nix b/modules/theme/colorscheme.nix
@@ -3,24 +3,10 @@
 in {
   options.colorscheme = mkOption {
     type = types.submodule {
-      options = {
-        author = mkOption {
-          type = types.str;
-          default = "";
-          description = "Author of the theme";
-        };
-
-        name = mkOption {
-          type = types.str;
-          default = "";
-          description = "Name of the theme";
-        };
-
-        colors = mkOption {
-          type = types.attrsOf types.str;
-          default = {};
-          description = "Base16 representation of the theme";
-        };
+      options.colors = mkOption {
+        type = types.attrsOf types.str;
+        default = {};
+        description = "Base16 representation of the theme";
       };
     };
     default = {};