diff --git a/home/core/cnst.nix b/home/core/cnst.nix
index 47c4a8c6..318a5d52 100644
--- a/home/core/cnst.nix
+++ b/home/core/cnst.nix
@@ -12,7 +12,7 @@
   };
   imports = [
     ./git
-    ./hypr
+    ./gui
     ./shell/cnst.nix
     ./appearance
   ];
diff --git a/home/core/hypr/default.nix b/home/core/gui/default.nix
similarity index 86%
rename from home/core/hypr/default.nix
rename to home/core/gui/default.nix
index 46c1b128..7ac80450 100644
--- a/home/core/hypr/default.nix
+++ b/home/core/gui/default.nix
@@ -4,7 +4,10 @@
   pkgs,
   ...
 }: {
-  imports = [../../extra/mako];
+  imports = [
+    ../../extra/mako
+    ./rofi.nix
+  ];
 
   xdg.portal = let
     hyprland = config.wayland.windowManager.hyprland.package;
@@ -23,6 +26,8 @@
   ];
   wayland.windowManager.hyprland = {
     enable = true;
+    package = pkgs.hyprland;
+    xwayland.enable = true;
     extraConfig = ''
       ${builtins.readFile ./hyprland.conf}
     '';
diff --git a/home/core/hypr/hyprland.conf b/home/core/gui/hyprland.conf
similarity index 100%
rename from home/core/hypr/hyprland.conf
rename to home/core/gui/hyprland.conf
diff --git a/home/core/gui/rofi.nix b/home/core/gui/rofi.nix
new file mode 100644
index 00000000..edbe2cc7
--- /dev/null
+++ b/home/core/gui/rofi.nix
@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  programs.rofi = {
+    enable = true;
+    package = pkgs.rofi-wayland-unwrapped;
+    configPath = "$XDG_CONFIG_HOME/rofi/config.rasi";
+    font = "Rec Mono Linear 11";
+  };
+}
diff --git a/home/extra/mako/default.nix b/home/extra/mako/default.nix
index 45010a1d..bec88acf 100644
--- a/home/extra/mako/default.nix
+++ b/home/extra/mako/default.nix
@@ -1,14 +1,13 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.libnotify ];
+{pkgs, ...}: {
+  home.packages = [pkgs.libnotify];
 
   services.mako = {
     enable = true;
     iconPath = "$HOME/.nix-profile/share/icons/Gruvbox-Plus-Dark";
     font = "FiraCode Nerd Font Medium 12";
-    padding = "10";
+    padding = "20";
     margin = "10";
-    anchor = "bottom-right";
+    anchor = "top-right";
     width = 400;
     height = 150;
     borderSize = 2;
@@ -19,9 +18,12 @@
     layer = "overlay";
     extraConfig = ''
       max-history=50
+      max-visible=4
       outer-margin=25
       icon-location=right
       max-icon-size=48
+      [mode=do-not-disturb]
+      invisible=1
     '';
   };
 }
diff --git a/hosts/core/default.nix b/hosts/core/default.nix
index df861a72..f7555354 100644
--- a/hosts/core/default.nix
+++ b/hosts/core/default.nix
@@ -11,7 +11,6 @@
     ./zsh.nix
     ./cnix-pkgs.nix
     ./fonts.nix
-    ./hyprland.nix
   ];
   home-manager = {
     # useGlobalPkgs = true;