From 858c859b9cad0c9e4f32cd9fb1c053a1a1f35fa3 Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Sat, 22 Oct 2022 19:57:23 +0200
Subject: Style and configure rofi and rofi-calc properly

---
 catppuccin/rofi        |  2 +-
 home-configuration.scm | 12 ++++--------
 i3.conf                |  5 +++--
 rofi.rasi              | 41 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 11 deletions(-)
 create mode 100644 rofi.rasi

diff --git a/catppuccin/rofi b/catppuccin/rofi
index 28e2a035..62a78eaf 160000
--- a/catppuccin/rofi
+++ b/catppuccin/rofi
@@ -1 +1 @@
-Subproject commit 28e2a035ce6b32353b5ad3c6036d46b267e2a778
+Subproject commit 62a78eaf0e12b69b75fdee9def6d333cebcb74a0
diff --git a/home-configuration.scm b/home-configuration.scm
index 6c3b7661..ec904cec 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -100,7 +100,7 @@ replacement spec (to which `regexp-substitute/global' is applied)."
     ;; acpilight is a drop-in xbacklight replacement, as xbacklight doesn't work on my system.
     "acpilight" "arandr" "gnupg" "gimp" "hsetroot" "i3status"
     "inkscape" "icecat" "kitty" "mpv" "nheko" "neomutt"
-    "password-store" "rofi" "signal-desktop" "simple-scan"
+    "password-store" "rofi" "rofi-calc" "signal-desktop" "simple-scan"
     "xdg-utils" "xdot" "xclip" "xdotool" "xdpyinfo" "xev" "xfd"
     "xfontsel" "xinput" "xkill" "xprop" "xrandr" "xrdb" "xsel"
     "xset" "xwininfo" "zoom" "zathura" "zathura-ps" "zathura-pdf-poppler"
@@ -221,17 +221,13 @@ replacement spec (to which `regexp-substitute/global' is applied)."
                                                          catppuccin-theme-variant ".conf")
                                         "kitty-theme.conf")))
       ("picom/picom.conf" ,(local-file "picom.conf"))
-      ("rofi/config.rasi"
-       ,(text-file/substitutions "rofi-config.rasi"
-          (local-file "catppuccin/rofi/basic/.config/rofi/config.rasi")
-          '("Oranchelo" pre "Papirus" post)                 ; icon theme
-          '("alacritty" pre "rofi-sensible-terminal" post)  ; default terminal
-          '("catppuccin-mocha" pre "catppuccin" post)))     ; @theme name
+      ("rofi/config.rasi" ,(local-file "rofi.rasi"))
       ("rofi/themes/catppuccin.rasi"
        ,(text-file/substitutions "catppuccin.rasi"
          (local-file #.(string-append "catppuccin/rofi/basic/.local/share/rofi/themes/catppuccin-"
                                       catppuccin-theme-variant ".rasi"))
-         '("JetBrainsMono Nerd Font 14" pre "Fira Sans 12" post)))   ; default font
+         '("JetBrainsMono Nerd Font 14" pre "Fira Sans 12" post)         ; default font
+         '("border-col: #[0-9a-f]*;" pre "border-col: #585b70;" post)))  ; i3 border colour
       ("zathura/zathurarc" ,(local-file "zathurarc"))
       ("zathura/catppuccin"
        ,(local-file #.(string-append "catppuccin/zathura/src/catppuccin-"
diff --git a/i3.conf b/i3.conf
index d78a51d2..d176e769 100644
--- a/i3.conf
+++ b/i3.conf
@@ -71,8 +71,9 @@ bindsym $mod+shift+slash exec dunstctl set-paused true && xset dpms 5 5 5 && i3l
 bindsym $mod+shift+q kill
 
 # rofi menus
-bindsym $mod+q exec rofi -show combi
-bindsym $mod+d exec rofi -show drun
+bindsym $mod+d exec rofi -show combi
+# When selecting a history line in rofi-calc, it is printed; copy it so we can use it elsewhere.
+bindsym $mod+q exec rofi -show calc | xclip -quiet -i -rmlastnl -selection clipboard
 bindsym $mod+p exec passmenu --type-all
 bindsym $mod+shift+p exec passmenu --type-pass
 bindsym $mod+o exec passmenu --type-otp
diff --git a/rofi.rasi b/rofi.rasi
new file mode 100644
index 00000000..b557691e
--- /dev/null
+++ b/rofi.rasi
@@ -0,0 +1,41 @@
+/* -*- mode: css -*- */
+configuration {
+    modi: "combi,windowcd,calc";
+    combi-modi: "window,drun,ssh,run";
+    terminal: "rofi-sensible-terminal";
+    icon-theme: "Papirus-Dark";
+    drun-show-actions: true;   /* show actions defined in .desktop files as well */
+    combi-display-format: "{text}"; /* hide {mode} prefix */
+    show-icons: true;
+    disable-history: false;
+    case-sensitive: false;
+    cycle: true;
+    hover-select: true;
+    matching: "normal";
+    scroll-method: 0;
+    /* Needed by Catppuccin theme: */
+    sidebar-mode: true;
+    hide-scrollbar: true;
+    location: 0;
+    /* End of theme-related config. */
+    display-window: "Windows";
+    display-windowcd: "Workspace";
+    display-run: "Run";
+    display-ssh: "SSH";
+    display-drun: "Desktop";
+    display-combi: "Combined";
+    display-calc: "Calculator";
+    display-keys: "Keys";
+    display-filebrowser: "Files";
+    display-emoji: "Emoji";
+    timeout {
+        action: "kb-cancel";
+        delay: 0;
+    }
+    filebrowser {
+        directories-first: true;
+        sorting-method: "name";
+    }
+}
+
+@theme "catppuccin"
-- 
cgit v1.2.3