home/modules/default.nix

@@ -8,6 +8,6 @@
     ./browsers.nix
     ./productivity.nix
     ./media.nix
-    #./hyprland/hyprland.nix
+    ./hyprland/hyprland.nix
   ];
 }

home/modules/hyprland/hyprland.nix

@@ -199,7 +199,6 @@
       gestures = {
         workspace_swipe = true;
         workspace_swipe_fingers = 3;
-	workspace_swipe_distance = 450;
       };
     };
 

home/modules/hyprland/waybar.nix

@@ -11,21 +11,16 @@
           "HDMI-A-1"
         ];
         modules-left = ["hyprland/workspaces" "hyprland/window"];
-        modules-center = ["bluetooth" "tray"];
+        modules-center = ["tray"];
-        modules-right = ["pulseaudio" "backlight" "battery" "clock" "custom/power"];
+        modules-right = ["pulseaudio" "backlight" "bluetooth" "network" "battery" "clock" "custom/power"];
 
         "hyprland/workspaces" = {
           on-scroll-up = "hyprctl dispatch workspace e+1";
           on-scroll-down = "hyprctl dispatch workspace e-1";
         };
 
-        "hyprland/window" = {
+        "hyrland/window" = {
           separate-outputs = true;
-	  format = " 󱂬 {class}";
-	  icon = true;
-	  rewrite = {
-	  	"(.*) — Mozilla Firefox" = "Firefox";
-	  };
         };
 
 	# ----------------------------------------------
@@ -49,26 +44,6 @@
 	  format = "󰃠 {percent}%";
 	};
 
-	"bluetooth" = {
-	  format-disabled = "󰂲";
-	  format-off = "󰂲";
-	  format-on = "󰂯";
-	  format-connected = "󰂱";
-	  tooltip-format-connected = "Connected to {device_alias}";
-	  format-connected-battery = "󰂱 {device_battery_percentage}%";
-	};
-
-	"network" = {
-	  format = "{ifname}";
-	  format-ethernet = "󰈀";
-	  tooltip-format-ethernet = "{ifname}";
-	  format-wifi = "{icon}";
-	  tooltip-format-wifi = "Connected to {essid} with IP: {ipaddr} and signal strength: {signalStrength}";
-	  format-disconnected = "󰤭";
-	  tooltip-format-disconnected = "Disconnected";
-	  format-icons = [ "󰤯" "󰤟" "󰤢" "󰤥" "󰤨" ];
-	};
-
 	"battery" = {
 	  states = {
 	    warning = 30;
@@ -144,10 +119,11 @@
             }
 
             #battery.charging {
-      	 color: @green;
+               background-color: @green;
+      	 color: @base;
             }
 
-      #battery.warning:not(.charging), #battery.critical:not(.charging) {
+            #battery.warning:not(.charging) {
                background-color: @red;
       	 color: @base;
             }
@@ -166,13 +142,13 @@
       }
 
       #workspaces button {
-        color: @text;
+        color: @lavender;
         border-radius: 1rem;
         padding: 0.4rem;
       }
 
       #workspaces button.active {
-        color: @mauve;
+        color: @sky;
         border-radius: 1rem;
       }
 
@@ -202,18 +178,6 @@
           border-radius: 0;
       }
 
-      #bluetooth.off {
-        color: @red;
-      }
-
-      #bluetooth.on {
-        color: @blue;
-      }
-
-      #bluetooth.connected {
-        color: @blue;
-      }
-
       #pulseaudio {
         color: @maroon;
         border-radius: 1rem 0px 0px 1rem;
@@ -240,18 +204,6 @@
         margin-right: 1rem;
         border-radius: 1rem;
       }
-
-      #network {
-         color: @text;
-      }
-
-      #network.disabled {
-          color: @red;
-      }
-
-      #network.disconnected {
-          color: @red;
-      }
     '';
   };
 }

system/modules/default.nix

@@ -4,7 +4,7 @@
     ./graphics.nix
     ./powerManagement.nix
     ./wireless.nix
-    #./wayland.nix
+    ./wayland.nix
     ./syncthing.nix
     ./kdePlasma.nix
     ./media.nix