diff --git a/flake.nix b/flake.nix
index 3135eff..29864f2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,8 +15,8 @@
     nix-colors.url = "github:misterio77/nix-colors";
   };
 
-  outputs = { self, nix-colors, nixpkgs, home-manager
-    , hyprland, agenix, deploy-rs, ... }@inputs:
+  outputs = { self, nix-colors, nixpkgs, home-manager, hyprland
+    , agenix, deploy-rs, ... }@inputs:
     let
       inherit (self) outputs;
       lib = nixpkgs.lib;
@@ -26,35 +26,22 @@
       nixosConfigurations = {
         lkk-nix-1 = lib.nixosSystem {
           specialArgs = { inherit inputs; };
-          modules = [
-            allowUnfree
-            ./hosts/lkk-nix-1
-            agenix.nixosModules.default
-          ];
+          modules =
+            [ allowUnfree ./hosts/lkk-nix-1 agenix.nixosModules.default ];
         };
         lkk-prod-1 = lib.nixosSystem {
           specialArgs = { inherit inputs; };
-          modules = [
-            allowUnfree
-            ./hosts/lkk-prod-1
-            agenix.nixosModules.default
-          ];
+          modules =
+            [ allowUnfree ./hosts/lkk-prod-1 agenix.nixosModules.default ];
         };
         lkk-prod-2 = lib.nixosSystem {
           specialArgs = { inherit inputs; };
-          modules = [
-            allowUnfree
-            ./hosts/lkk-prod-2
-            agenix.nixosModules.default
-          ];
+          modules =
+            [ allowUnfree ./hosts/lkk-prod-2 agenix.nixosModules.default ];
         };
         m3-nix = lib.nixosSystem {
           specialArgs = { inherit inputs outputs; };
-          modules = [
-            allowUnfree
-            ./hosts/m3-nix
-            agenix.nixosModules.default
-          ];
+          modules = [ allowUnfree ./hosts/m3-nix agenix.nixosModules.default ];
         };
       };
       homeConfigurations = {
@@ -62,10 +49,7 @@
         "m3tam3re@m3-nix" = home-manager.lib.homeManagerConfiguration {
           pkgs = nixpkgs.legacyPackages."x86_64-linux";
           extraSpecialArgs = { inherit inputs nix-colors; };
-          modules = [
-            ./home/users/m3tam3re/m3-nix.nix
-            allowUnfree
-          ];
+          modules = [ ./home/users/m3tam3re/m3-nix.nix allowUnfree ];
         };
         "m3tam3re@lkk-nix-1" = home-manager.lib.homeManagerConfiguration {
           extraSpecialArgs = { # pass things to t
diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix
index 93f50b4..d995fa9 100644
--- a/home/features/desktop/default.nix
+++ b/home/features/desktop/default.nix
@@ -4,13 +4,13 @@
     ./crypto.nix
     ./design.nix
     ./extrafonts.nix
-    #./hyprland
     ./media.nix
     ./office.nix
     ./qt.nix
-    ./rofi.nix
     ./syncthing.nix
     ./waybar.nix
+    ./wofi.nix
+#    ./wofi-pass.nix
   ];
 
   xdg.mimeApps = {
@@ -32,7 +32,7 @@
 
   fonts.fontconfig.enable = true;
 
-  services.dunst = {
+  services.mako = {
     enable = true;
   };
 
diff --git a/home/features/desktop/rofi.nix b/home/features/desktop/rofi.nix
deleted file mode 100644
index 0f1fd91..0000000
--- a/home/features/desktop/rofi.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ pkgs, ... }: {
-  programs.rofi = {
-    enable = true;
-    package = pkgs.rofi-wayland;
-    plugins = [ pkgs.rofi-calc pkgs.rofi-emoji ];
-    theme = "themes/dracula";
-    extraConfig = {
-      modi = "drun,ssh,filebrowser,keys,window";
-      kb-primary-paste = "Control+V,Shift+Insert";
-      kb-secondary-paste = "Control+v,Insert";
-    };
-  };
-
-  programs.rofi.pass = {
-    enable = true;
-    extraConfig = ''
-      layout_cmd () {
-        setxkbmap de
-      }
-    '';
-  };
-}
diff --git a/home/features/desktop/wofi.nix b/home/features/desktop/wofi.nix
new file mode 100644
index 0000000..7b6eb97
--- /dev/null
+++ b/home/features/desktop/wofi.nix
@@ -0,0 +1,8 @@
+{ pkgs, ...}:
+{
+
+  home.packages = with pkgs; [
+    wofi
+    wofi-emoji
+  ];
+}
diff --git a/home/users/m3tam3re/dotfiles/hyprland.nix b/home/users/m3tam3re/dotfiles/hyprland.nix
index 3f69397..6b3e539 100644
--- a/home/users/m3tam3re/dotfiles/hyprland.nix
+++ b/home/users/m3tam3re/dotfiles/hyprland.nix
@@ -158,8 +158,7 @@
     bind=  $mainMod, F, fullscreen
     bind = $mainMod, E, exec, thunar
     bind = $mainMod, V, togglefloating, 
-    bind = $mainMod, D, exec, rofi -modi 'drun,emoji,calc,ssh' -show drun -font 'Fira Code 13' -show-icons 
-    bind = $mainMod, D, exec, rofi -modi 'drun,emoji,calc,ssh' -show drun -font 'Fira Code 13' -show-icons 
+    bind = $mainMod, D, exec, wofi --show drun --allow-images
     bind = $mainMod SHIFT, P, pseudo, # dwindle
     bind = $mainMod, J, togglesplit, # dwindle
 
diff --git a/pkgs/default.nix b/pkgs/default.nix
new file mode 100644
index 0000000..57fa452
--- /dev/null
+++ b/pkgs/default.nix
@@ -0,0 +1,4 @@
+{ pkgs, ... }: {
+
+  imports = [ ./wofi-pass ];
+}
diff --git a/pkgs/wofi-pass/default.nix b/pkgs/wofi-pass/default.nix
new file mode 100644
index 0000000..0be2344
--- /dev/null
+++ b/pkgs/wofi-pass/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, lib, fetchFromGitHub, bash, makeWrapper }:
+
+with lib;
+
+stdenv.mkDerivation {
+  pname = "wofi-pass";
+  version = "0.1";
+  src = fetchFromGitHub {
+    owner = "TinfoilSubmarine";
+    repo = "wofi-pass";
+    rev = "869c545";
+    sha256 = "gcfW8E/3/dqv0P3S4z9fDv8k4R7czcIKwpo/OHFFWj0=";
+  };
+  buildInputs = [ bash ];
+  nativeBuildInputs = [ makeWrapper ];
+  installPhase = ''
+    mkdir -p $out/bin
+    cp wofi-pass $out/bin/wofi-pass
+    wrapProgram $out/bin/wofi-pass \
+      --prefix PATH : ${makeBinPath [ bash ]}
+  '';
+}