diff --git a/home/desktops/hyprland/anyrun.nix b/home/desktops/hyprland/anyrun.nix
new file mode 100644
index 0000000..3a6f396
--- /dev/null
+++ b/home/desktops/hyprland/anyrun.nix
@@ -0,0 +1,59 @@
+{pkgs}: {
+  enable = true;
+  config = {
+    plugins = with pkgs.anyrunPlugins; [
+      applications
+      symbols
+      rink
+      dictionary
+      shell
+    ];
+    y.fraction = 0.2;
+    closeOnClick = true;
+  };
+  extraCss =
+    /*
+    css
+    */
+    ''
+      * {
+        font-family: "NotoSans NF";
+      }
+
+      window#window {
+        background: transparent;
+      }
+
+      box#main {
+        background: rgba(48, 52, 70, 0.4);
+        box-shadow: 0 0 15px rgba(0, 0, 0, 0.29);
+        border-radius: 24px;
+      }
+
+      entry#entry {
+        border: none;
+        box-shadow: none;
+        padding: 8px 24px;
+      }
+
+      entry#entry,
+      list#main {
+        border-radius: 24px;
+        background: transparent;
+      }
+
+      row#match {
+        border-radius: 8px;
+        padding: 0 4px;
+      }
+
+      row#plugin {
+        border-radius: 16px;
+        padding: 16px;
+      }
+
+      list#plugin {
+        background: transparent;
+      }
+    '';
+}
diff --git a/home/desktops/hyprland/default.nix b/home/desktops/hyprland/default.nix
index 187941b..43a827b 100644
--- a/home/desktops/hyprland/default.nix
+++ b/home/desktops/hyprland/default.nix
@@ -157,66 +157,8 @@
     configDir = ./ags;
   };
   programs.kitty = import ./kitty.nix {inherit pkgs;};
-  programs.anyrun = {
-    enable = true;
-    config = {
-      plugins = with pkgs.anyrunPlugins; [
-        applications
-        symbols
-        rink
-        dictionary
-        shell
-      ];
-      y.fraction = 0.2;
-      closeOnClick = true;
-    };
-    extraCss =
-      /*
-      css
-      */
-      ''
-        * {
-          font-family: "NotoSans NF";
-        }
-
-        window#window {
-          background: transparent;
-        }
-
-        box#main {
-          background: rgba(48, 52, 70, 0.4);
-          box-shadow: 0 0 15px rgba(0, 0, 0, 0.29);
-          border-radius: 24px;
-        }
-
-        entry#entry {
-          border: none;
-          box-shadow: none;
-          padding: 8px 24px;
-        }
-
-        entry#entry,
-        list#main {
-          border-radius: 24px;
-          background: transparent;
-        }
-
-        row#match {
-          border-radius: 8px;
-          padding: 0 4px;
-        }
-
-        row#plugin {
-          border-radius: 16px;
-          padding: 16px;
-        }
-
-        list#plugin {
-          background: transparent;
-        }
-      '';
-  };
-
+  programs.anyrun = import ./anyrun.nix {inherit pkgs;};
+  programs.waybar = import ./waybar.nix {inherit pkgs;};
   services.udiskie.enable = true;
   services.udiskie.tray = "never";
 
diff --git a/home/desktops/hyprland/waybar.nix b/home/desktops/hyprland/waybar.nix
index 91436f8..31fb4f9 100644
--- a/home/desktops/hyprland/waybar.nix
+++ b/home/desktops/hyprland/waybar.nix
@@ -1,20 +1,16 @@
-{
+{pkgs}: {
   enable = true;
   settings = {
     mainBar = {
       layer = "top";
-      position = "top";
-      height = 48;
-      output = "HDMI-A-1";
-      modules-left = ["wlr/workspaces"];
-      modules-center = ["wlr/taskbar"];
-      modules-right = ["custom/weather" "clock"];
+      position = "left";
+      width = 16;
+      modules-left = ["hyprland/workspaces"];
+      modules-center = ["clock"];
+      modules-right = ["custom/weather"];
 
-      "wlr/taskbar" = {
-        all-outputs = true;
-        format = "{icon}";
-        icon-size = 32;
-        on-click = "activate";
+      "clock" = {
+        format = "<b>{%H}</b>\n{%M}";
       };
 
       "custom/weather" = {
@@ -25,12 +21,16 @@
         return-type = "json";
       };
 
-      "wlr/workspaces" = {
-        all-outputs = true;
-        format = "<sub>{icon}</sub>\n{windows}";
+      "hyprland/workspaces" = {
+        format = "{windows}";
         format-window-separator = "\n";
         window-rewrite = {
-          "(.*) — Mozilla Firefox" = "";
+          "title<.*youtube.*>" = "";
+          "class<firefox>" = "";
+          "title<nvim.*>" = "";
+          "class<kitty>" = "";
+          "class<VencordDesktop>" = "󰙯";
+          "class<org.gnome.Nautilus>" = "󰝰";
         };
       };
     };