refactor: waybar module refactor

khaneliman · Oct 20, 2023 · c573abb · c573abb
1 parent a1356eb
commit c573abb
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 55 deletions.
diff --git a/modules/home/desktop/addons/waybar/default.nix b/modules/home/desktop/addons/waybar/default.nix
@@ -13,6 +13,9 @@ let
 
   cfg = config.khanelinix.desktop.addons.waybar;
 
+  theme = builtins.readFile ./styles/catppuccin.css;
+  style = builtins.readFile ./styles/style.css;
+
   custom-modules = import ./modules/custom-modules.nix { inherit config lib pkgs; };
   default-modules = import ./modules/default-modules.nix { inherit lib pkgs; };
   group-modules = import ./modules/group-modules.nix;
@@ -25,20 +28,26 @@ let
     (lib.mkIf config.khanelinix.desktop.hyprland.enable hyprland-modules)
   ];
 
-  mainBar = {
+  bar = {
     "layer" = "top";
     "position" = "top";
-    "output" = "DP-1";
+
     "margin-top" = 10;
     "margin-left" = 20;
     "margin-right" = 20;
-    # "modules-center" = [ "mpris" ];
+
     "modules-left" = [
       "group/power"
       "hyprland/workspaces"
       "custom/separator-left"
       "hyprland/window"
     ];
+  };
+
+  mainBar = {
+    "output" = "DP-1";
+    # "modules-center" = [ "mpris" ];
+
     "modules-right" = [
       "group/tray"
       "custom/separator-right"
@@ -52,19 +61,8 @@ let
   };
 
   secondaryBar = {
-    "layer" = "top";
-    "position" = "top";
     "output" = "DP-3";
-    "margin-top" = 10;
-    "margin-left" = 20;
-    "margin-right" = 20;
-    "modules-center" = [ ];
-    "modules-left" = [
-      "group/power"
-      "hyprland/workspaces"
-      "custom/separator-left"
-      "hyprland/window"
-    ];
+
     "modules-right" = [
       "group/tray-drawer"
       "group/stats-drawer"
@@ -93,11 +91,11 @@ in
 
       # TODO: make dynamic / support different number of bars etc
       settings = {
-        mainBar = mkMerge [ mainBar all-modules ];
-        secondaryBar = mkMerge [ secondaryBar all-modules ];
+        mainBar = mkMerge [ bar mainBar all-modules ];
+        secondaryBar = mkMerge [ bar secondaryBar all-modules ];
       };
 
-      style = ./style.css;
+      style = "${theme}${style}";
     };
   };
 }
diff --git a/modules/home/desktop/addons/waybar/styles/catppuccin.css b/modules/home/desktop/addons/waybar/styles/catppuccin.css
@@ -0,0 +1,36 @@
+/*
+*
+* Catppuccin Macchiato palette
+*
+*/
+
+@define-color base   #24273a;
+@define-color mantle #1e2030;
+@define-color crust  #181926;
+
+@define-color text     #cad3f5;
+@define-color subtext0 #b8c0e0;
+@define-color subtext1 #a5adcb;
+
+@define-color surface0 #363a4f;
+@define-color surface1 #494d64;
+@define-color surface2 #5b6078;
+
+@define-color overlay0 #6e738d;
+@define-color overlay1 #8087a2;
+@define-color overlay2 #939ab7;
+
+@define-color blue      #8aadf4;
+@define-color lavender  #b7bdf8;
+@define-color sapphire  #7dc4e4;
+@define-color sky       #91d7e3;
+@define-color teal      #8bd5ca;
+@define-color green     #a6da95;
+@define-color yellow    #eed49f;
+@define-color peach     #f5a97f;
+@define-color maroon    #ee99a0;
+@define-color red       #ed8796;
+@define-color mauve     #c6a0f6;
+@define-color pink      #f5bde6;
+@define-color flamingo  #f0c6c6;
+@define-color rosewater #f4dbd6;
diff --git a/modules/home/desktop/addons/waybar/style.css → ...me/desktop/addons/waybar/styles/style.css b/modules/home/desktop/addons/waybar/style.css → ...me/desktop/addons/waybar/styles/style.css
@@ -1,40 +1,3 @@
-/*
-*
-* Catppuccin Macchiato palette
-*
-*/
-
-@define-color base   #24273a;
-@define-color mantle #1e2030;
-@define-color crust  #181926;
-
-@define-color text     #cad3f5;
-@define-color subtext0 #b8c0e0;
-@define-color subtext1 #a5adcb;
-
-@define-color surface0 #363a4f;
-@define-color surface1 #494d64;
-@define-color surface2 #5b6078;
-
-@define-color overlay0 #6e738d;
-@define-color overlay1 #8087a2;
-@define-color overlay2 #939ab7;
-
-@define-color blue      #8aadf4;
-@define-color lavender  #b7bdf8;
-@define-color sapphire  #7dc4e4;
-@define-color sky       #91d7e3;
-@define-color teal      #8bd5ca;
-@define-color green     #a6da95;
-@define-color yellow    #eed49f;
-@define-color peach     #f5a97f;
-@define-color maroon    #ee99a0;
-@define-color red       #ed8796;
-@define-color mauve     #c6a0f6;
-@define-color pink      #f5bde6;
-@define-color flamingo  #f0c6c6;
-@define-color rosewater #f4dbd6;
-
 /**
 * Custom styling for a catppuccin style waybar
 * Config settings listed in order from left -> right on bar