From ba7174224c6e23c74ebb113c8dd8e949b94bdb02 Mon Sep 17 00:00:00 2001
From: biscuit <biscuit@nixos.com>
Date: Mon, 2 Jun 2025 14:05:20 -0500
Subject: [PATCH] upd

---
 modules/app.nix                                  | 2 ++
 modules/desktop/display-manager.nix              | 4 ++--
 pkgs/hyprland/default.nix                        | 5 ++---
 pkgs/{wofi => rofi}/default.nix                  | 8 +++++++-
 pkgs/{wofi => rofi}/launcher/colors/onedark.rasi | 0
 pkgs/{wofi => rofi}/launcher/config.rasi         | 0
 pkgs/{wofi => rofi}/launcher/launcher.sh         | 0
 pkgs/{wofi => rofi}/launcher/shared/colors.rasi  | 0
 pkgs/{wofi => rofi}/launcher/shared/fonts.rasi   | 0
 9 files changed, 13 insertions(+), 6 deletions(-)
 rename pkgs/{wofi => rofi}/default.nix (80%)
 rename pkgs/{wofi => rofi}/launcher/colors/onedark.rasi (100%)
 rename pkgs/{wofi => rofi}/launcher/config.rasi (100%)
 rename pkgs/{wofi => rofi}/launcher/launcher.sh (100%)
 rename pkgs/{wofi => rofi}/launcher/shared/colors.rasi (100%)
 rename pkgs/{wofi => rofi}/launcher/shared/fonts.rasi (100%)

diff --git a/modules/app.nix b/modules/app.nix
index 0e08b72..dbbab17 100644
--- a/modules/app.nix
+++ b/modules/app.nix
@@ -1,5 +1,7 @@
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
     delfin
+    rofi
+    rofi-calc
   ];
 }
diff --git a/modules/desktop/display-manager.nix b/modules/desktop/display-manager.nix
index 4fa02b8..2b630d6 100644
--- a/modules/desktop/display-manager.nix
+++ b/modules/desktop/display-manager.nix
@@ -1,10 +1,10 @@
 {...}: {
   imports = [
     ../../pkgs/hyprland/default.nix
-    ../../pkgs/ags/default.nix 
+    ../../pkgs/ags/default.nix
     ../../pkgs/swww/default.nix
     ../../pkgs/waybar/default.nix
-    ../../pkgs/wofi/default.nix
+    ../../pkgs/rofi/default.nix
     ../../pkgs/hypridle/default.nix
     ../../pkgs/hyprlock/default.nix
   ];
diff --git a/pkgs/hyprland/default.nix b/pkgs/hyprland/default.nix
index 832a50b..86b1258 100644
--- a/pkgs/hyprland/default.nix
+++ b/pkgs/hyprland/default.nix
@@ -1,5 +1,4 @@
 {...}: {
-
   wayland.windowManager.hyprland = {
     enable = true;
     xwayland.enable = true;
@@ -159,10 +158,10 @@
 
           "$mod, mouse_down, workspace, e+1"
           "$mod, mouse_up, workspace, e-1"
-          
+
           "$mod, F, fullscreen, 0"
 
-          "$mod, Space, exec, pkill wofi || wofi --show drun"
+          "$mod, Space, exec, pkill rofi || rofi -show drun"
         ]
         ++ (
           # workspaces
diff --git a/pkgs/wofi/default.nix b/pkgs/rofi/default.nix
similarity index 80%
rename from pkgs/wofi/default.nix
rename to pkgs/rofi/default.nix
index 0b4e3c5..42ffa9d 100644
--- a/pkgs/wofi/default.nix
+++ b/pkgs/rofi/default.nix
@@ -7,7 +7,13 @@
   # };
   wofiSource = builtins.toPath ./launcher;
 in {
-  programs.wofi.enable = true;
+  programs.rofi = {
+    enable = true;
+    package = with pkgs; [
+      rofi-calc
+    ];
+  };
+
   # home.file.".config/wofi" = {
   #   source = wofiSource;
   #   recursive = true;
diff --git a/pkgs/wofi/launcher/colors/onedark.rasi b/pkgs/rofi/launcher/colors/onedark.rasi
similarity index 100%
rename from pkgs/wofi/launcher/colors/onedark.rasi
rename to pkgs/rofi/launcher/colors/onedark.rasi
diff --git a/pkgs/wofi/launcher/config.rasi b/pkgs/rofi/launcher/config.rasi
similarity index 100%
rename from pkgs/wofi/launcher/config.rasi
rename to pkgs/rofi/launcher/config.rasi
diff --git a/pkgs/wofi/launcher/launcher.sh b/pkgs/rofi/launcher/launcher.sh
similarity index 100%
rename from pkgs/wofi/launcher/launcher.sh
rename to pkgs/rofi/launcher/launcher.sh
diff --git a/pkgs/wofi/launcher/shared/colors.rasi b/pkgs/rofi/launcher/shared/colors.rasi
similarity index 100%
rename from pkgs/wofi/launcher/shared/colors.rasi
rename to pkgs/rofi/launcher/shared/colors.rasi
diff --git a/pkgs/wofi/launcher/shared/fonts.rasi b/pkgs/rofi/launcher/shared/fonts.rasi
similarity index 100%
rename from pkgs/wofi/launcher/shared/fonts.rasi
rename to pkgs/rofi/launcher/shared/fonts.rasi