From 225b28e01d8374d7956521a0602bf4f851f706f4 Mon Sep 17 00:00:00 2001
From: andrey_varnavskiy <andrey_varnavskiy@student.itpu.uz>
Date: Sat, 14 Dec 2024 13:53:27 +0500
Subject: [PATCH] main.nix => default.nix

---
 home-manager/modules/waybar/default.nix | 91 ++++++++++++++++++++++++-
 home-manager/modules/waybar/main.nix    | 90 ------------------------
 2 files changed, 88 insertions(+), 93 deletions(-)
 delete mode 100644 home-manager/modules/waybar/main.nix

diff --git a/home-manager/modules/waybar/default.nix b/home-manager/modules/waybar/default.nix
index ee19a6d..07dfe23 100644
--- a/home-manager/modules/waybar/default.nix
+++ b/home-manager/modules/waybar/default.nix
@@ -1,5 +1,90 @@
 {
-  imports = [
-    ./main.nix
-  ];
+  programs.waybar = {
+    enable = true;
+    style = ./style.css;
+    settings = {
+      mainBar = {
+        layer = "top";
+        position = "top";
+        height = 30;
+        modules-left = ["hyprland/workspaces"];
+        modules-center = ["hyprland/window"];
+        modules-right = ["hyprland/language" "custom/weather" "pulseaudio" "battery" "clock" "tray"];
+        "hyprland/workspaces" = {
+          disable-scroll = true;
+          show-special = true;
+          special-visible-only = true;
+          all-outputs = false;
+          format = "{icon}";
+          format-icons = {
+            "1" = "";
+            "2" = "";
+            "3" = "";
+            "4" = "";
+            "5" = "";
+            "6" = "";
+            "7" = "";
+            "8" = "";
+            "9" = "";
+            "magic" = "";
+          };
+
+          persistent-workspaces = {
+            "*" = 9;
+          };
+        };
+
+        "hyprland/language" = {
+          format-en = "🇺🇸";
+          format-ru = "🇷🇺";
+          min-length = 5;
+          tooltip = false;
+        };
+
+        "custom/weather" = {
+          format = " {} ";
+          exec = "curl -s 'wttr.in/Tashkent?format=%c%t'";
+          interval = 300;
+          class = "weather";
+        };
+
+        "pulseaudio" = {
+          format = "{icon} {volume}%";
+          format-bluetooth = "{icon} {volume}% ";
+          format-muted = "";
+          format-icons = {
+            "headphones" = "";
+            "handsfree" = "";
+            "headset" = "";
+            "phone" = "";
+            "portable" = "";
+            "car" = "";
+            "default" = ["" ""];
+          };
+          on-click = "pavucontrol";
+        };
+
+        "battery" = {
+          states = {
+            warning = 30;
+            critical = 1;
+          };
+          format = "{icon} {capacity}%";
+          format-charging = " {capacity}%";
+          format-alt = "{time} {icon}";
+          format-icons = ["" "" "" "" ""];
+        };
+
+        "clock" = {
+          format = "{:%d.%m.%Y - %H:%M}";
+          format-alt = "{:%A, %B %d at %R}";
+        };
+
+        "tray" = {
+          icon-size = 14;
+          spacing = 1;
+        };
+      };
+    };
+  };
 }
diff --git a/home-manager/modules/waybar/main.nix b/home-manager/modules/waybar/main.nix
deleted file mode 100644
index 07dfe23..0000000
--- a/home-manager/modules/waybar/main.nix
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  programs.waybar = {
-    enable = true;
-    style = ./style.css;
-    settings = {
-      mainBar = {
-        layer = "top";
-        position = "top";
-        height = 30;
-        modules-left = ["hyprland/workspaces"];
-        modules-center = ["hyprland/window"];
-        modules-right = ["hyprland/language" "custom/weather" "pulseaudio" "battery" "clock" "tray"];
-        "hyprland/workspaces" = {
-          disable-scroll = true;
-          show-special = true;
-          special-visible-only = true;
-          all-outputs = false;
-          format = "{icon}";
-          format-icons = {
-            "1" = "";
-            "2" = "";
-            "3" = "";
-            "4" = "";
-            "5" = "";
-            "6" = "";
-            "7" = "";
-            "8" = "";
-            "9" = "";
-            "magic" = "";
-          };
-
-          persistent-workspaces = {
-            "*" = 9;
-          };
-        };
-
-        "hyprland/language" = {
-          format-en = "🇺🇸";
-          format-ru = "🇷🇺";
-          min-length = 5;
-          tooltip = false;
-        };
-
-        "custom/weather" = {
-          format = " {} ";
-          exec = "curl -s 'wttr.in/Tashkent?format=%c%t'";
-          interval = 300;
-          class = "weather";
-        };
-
-        "pulseaudio" = {
-          format = "{icon} {volume}%";
-          format-bluetooth = "{icon} {volume}% ";
-          format-muted = "";
-          format-icons = {
-            "headphones" = "";
-            "handsfree" = "";
-            "headset" = "";
-            "phone" = "";
-            "portable" = "";
-            "car" = "";
-            "default" = ["" ""];
-          };
-          on-click = "pavucontrol";
-        };
-
-        "battery" = {
-          states = {
-            warning = 30;
-            critical = 1;
-          };
-          format = "{icon} {capacity}%";
-          format-charging = " {capacity}%";
-          format-alt = "{time} {icon}";
-          format-icons = ["" "" "" "" ""];
-        };
-
-        "clock" = {
-          format = "{:%d.%m.%Y - %H:%M}";
-          format-alt = "{:%A, %B %d at %R}";
-        };
-
-        "tray" = {
-          icon-size = 14;
-          spacing = 1;
-        };
-      };
-    };
-  };
-}