From 863514ef9c4da3cce8410f89e1b4c547cc31cf6f Mon Sep 17 00:00:00 2001
From: Josh Rahm <joshuarahm@gmail.com>
Date: Mon, 10 Jan 2022 21:22:19 -0700
Subject: Convert run menus over to Rofi.

This makes things prettier and rofi is more feature rich than DMenu.
---
 src/Internal/DMenu.hs    | 13 ++++++-------
 src/Internal/PassMenu.hs |  8 +++-----
 2 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'src/Internal')

diff --git a/src/Internal/DMenu.hs b/src/Internal/DMenu.hs
index 850612e..360ad58 100644
--- a/src/Internal/DMenu.hs
+++ b/src/Internal/DMenu.hs
@@ -8,6 +8,7 @@ import Data.Map (Map)
 import qualified Data.Map as Map
 import XMonad.Util.Run
 import Data.List (intercalate)
+import Text.Printf (printf)
 
 data Colors =
   Colors {
@@ -17,8 +18,7 @@ data Colors =
 
 runDMenu :: X ()
 runDMenu = void $
-  safeSpawn "dmenu_run" [
-    "-p", "Execute ", "-l", "12", "-dim", "0.4"]
+  safeSpawn "rofi" ["-p", "Execute ", "-show", "run"]
 
 runDMenuPrompt :: String -> Maybe String -> [String] -> X String
 runDMenuPrompt prompt color select =
@@ -32,8 +32,7 @@ runDMenuPrompt prompt color select =
 
 runDMenuPromptWithMap :: String -> Maybe String -> Map String a -> X (Maybe a)
 runDMenuPromptWithMap prompt color map = do
-  let realColor = maybe [] (\c -> ["-sb", c, "-nf", c]) color
-  menuMapArgs "dmenu"([
-      "-p", prompt,
-      "-l", "12",
-      "-dim", "0.4" ]  ++ realColor) map
+  let realColor = maybe [] (
+          \c -> ["-theme-str", printf "* {theme-color: %s;}" c]) color
+  menuMapArgs "rofi"
+    (["-p", prompt, "-dmenu"] ++ realColor) map
diff --git a/src/Internal/PassMenu.hs b/src/Internal/PassMenu.hs
index 7374bed..bb3bc4d 100644
--- a/src/Internal/PassMenu.hs
+++ b/src/Internal/PassMenu.hs
@@ -6,10 +6,8 @@ import Control.Monad
 
 runPassMenu :: X ()
 runPassMenu = void $
-  safeSpawn "passmenu" [
+  safeSpawn "rofi-pass" [
     "-p", "Password ", 
-    "-l", "12",
-    "-dim", "0.4",
-    "-sb", "#f54245",
-    "-nf", "#f54245" ]
+    "-theme-str",
+    "* {theme-color: #f54245;}"]
     
-- 
cgit