From e47a26c475054ab81151f8a0ca1656031d2c8dcd Mon Sep 17 00:00:00 2001
From: Klesh Wong <klesh@qq.com>
Date: Sun, 15 May 2022 15:30:44 +0800
Subject: [PATCH] feat: improve rofi

---
 gui/awesome.sh           |  5 +----
 gui/awesome/rc.lua       |  6 +++---
 gui/rofi/catppuccin.rasi |  3 ++-
 gui/rofi/config.rasi     | 11 ++++-------
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/gui/awesome.sh b/gui/awesome.sh
index 82c973e..ad170ce 100755
--- a/gui/awesome.sh
+++ b/gui/awesome.sh
@@ -14,7 +14,7 @@ esac
 # necessary tools
 #$DIR/dmenu.sh
 #$DIR/slock.sh
-$DRI/dict.sh
+$DIR/dict.sh
 
 # install widgets
 if [ ! -d "$XDG_CONFIG_HOME/awesome/awesome-wm-widgets" ]; then
@@ -24,9 +24,6 @@ fi
 
 # ~/.xinitrc
 cat <<'EOT' > ~/.xinitrc
-export BOOKMARK_SEARCHER="rofi -dmenu"
-export D_SELECTOR="rofi -dmenu"
-
 export QT_QPA_PLATFORMTHEME="qt5ct"
 export GTK2_RC_FILES="$HOME/.gtkrc-2.0"
 
diff --git a/gui/awesome/rc.lua b/gui/awesome/rc.lua
index 09319f0..41f3859 100644
--- a/gui/awesome/rc.lua
+++ b/gui/awesome/rc.lua
@@ -516,15 +516,15 @@ globalkeys = gears.table.join(
     -- Launcher
     --awful.key({ modkey }, "p", function() awful.spawn.with_shell("dmenu_launcher") end,
     --          {description = "dmenu launcher", group = "launcher"}),
-    awful.key({ modkey }, "p", function() awful.spawn.with_shell("rofi -show combi -combi-modi drun,window,run") end,
+    awful.key({ modkey }, "p", function() awful.spawn.with_shell("rofi -show combi") end,
               {description = "rofi", group = "launcher"}),
 
     -- Bookmark
-    awful.key({ modkey }, "b", function() awful.spawn.with_shell('bm') end,
+    awful.key({ modkey }, "b", function() awful.spawn.with_shell('BOOKMARK_SEARCHER="rofi -dmenu -p bookmark" bm') end,
               {description = "bookmark", group = "launcher"}),
 
     -- Dict.sh
-    awful.key({ modkey }, "t", function() awful.spawn.with_shell('D_SELECTOR= d "$(xsel -o)"') end,
+    awful.key({ modkey }, "t", function() awful.spawn.with_shell('D_SELECTOR="rofi -dmenu -p dict.sh" d "$(xsel -o)"') end,
               {description = "dict.sh", group = "launcher"})
 )
 
diff --git a/gui/rofi/catppuccin.rasi b/gui/rofi/catppuccin.rasi
index a996149..7eac0d0 100644
--- a/gui/rofi/catppuccin.rasi
+++ b/gui/rofi/catppuccin.rasi
@@ -7,6 +7,7 @@
     fg-col: #D9E0EE;
     fg-col2: #F28FAD;
     grey: #D9E0EE;
-    width: 600;
+    width: 900;
+    border-radius: 5px;
 }
 
diff --git a/gui/rofi/config.rasi b/gui/rofi/config.rasi
index 6075297..8bf69de 100644
--- a/gui/rofi/config.rasi
+++ b/gui/rofi/config.rasi
@@ -1,7 +1,7 @@
 configuration{
-    modi: "run,drun,window";
+    modi: "drun,run,window";
     lines: 5;
-    font: "JetBrainsMono Nerd Font 14";
+    font: "monospace 14";
     show-icons: true;
     icon-theme: "Oranchelo";
     terminal: "st";
@@ -14,9 +14,6 @@ configuration{
     display-window: " 﩯  window";
     display-Network: " 󰤨  Network";
     sidebar-mode: true;
-    drun {
-        parse-user: true;
-    }
 }
 
 @theme "catppuccin"
@@ -89,13 +86,13 @@ element selected {
 
 mode-switcher {
     spacing: 0;
-  }
+}
 
 button {
     padding: 10px;
     background-color: @bg-col-light;
     text-color: @grey;
-    vertical-align: 0.5; 
+    vertical-align: 0.5;
     horizontal-align: 0.5;
 }