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

---
 home-configuration.scm | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'home-configuration.scm')

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-"
-- 
cgit v1.2.3