Refactor Rofi configuration paths and update theme imports for consis…

…tency
ryanwclark1 · Dec 27, 2024 · d6678a1 · d6678a1
1 parent b7ea3a3
commit d6678a1
Show file tree

Hide file tree

Showing 14 changed files with 309 additions and 20 deletions.
diff --git a/home/features/desktop/hyprland/default.nix b/home/features/desktop/hyprland/default.nix
@@ -74,6 +74,7 @@
     (import ./scripts/cliphist-copy.nix { inherit pkgs; })
     (import ./scripts/cliphist-delete.nix { inherit pkgs; })
     (import ./scripts/emopicker9000.nix { inherit pkgs; })
+    (import ./scripts/grimblast.nix { inherit pkgs; })
     (import ./scripts/list-hypr-bindings.nix { inherit pkgs; })
     (import ./scripts/microphone-status.nix { inherit pkgs; })
     (import ./scripts/power-big.nix { inherit pkgs; })

diff --git a/home/features/desktop/hyprland/rofi/config/style/applet2-1.nix b/home/features/desktop/hyprland/rofi/config/style/applet2-1.nix
@@ -66,7 +66,7 @@
       textbox-prompt-colon {
         enabled:                     true;
         expand:                      false;
-        str:                         "";
+        str:                         "";
         padding:                     10px 13px;
         border-radius:               0px;
         background-color:            @urgent;

diff --git a/home/features/desktop/hyprland/rofi/config/style/applet2-2.nix b/home/features/desktop/hyprland/rofi/config/style/applet2-2.nix
@@ -65,7 +65,7 @@
       textbox-prompt-colon {
         enabled:                     true;
         expand:                      false;
-        str:                         "";
+        str:                         "";
         padding:                     10px 13px;
         border-radius:               12px;
         background-color:            @urgent;

diff --git a/home/features/desktop/hyprland/rofi/config/style/applet2-3.nix b/home/features/desktop/hyprland/rofi/config/style/applet2-3.nix
@@ -65,7 +65,7 @@
       textbox-prompt-colon {
         enabled:                     true;
         expand:                      false;
-        str:                         "";
+        str:                         "";
         padding:                     10px 13px;
         border-radius:               100%;
         background-color:            @urgent;

diff --git a/home/features/desktop/hyprland/rofi/config/style/applet3-1.nix b/home/features/desktop/hyprland/rofi/config/style/applet3-1.nix
@@ -65,7 +65,7 @@
       textbox-prompt-colon {
         enabled:                     true;
         expand:                      false;
-        str:                         "";
+        str:                         "";
         padding:                     10px 13px;
         border-radius:               0px;
         background-color:            @urgent;

diff --git a/home/features/desktop/hyprland/rofi/config/style/applet3-2.nix b/home/features/desktop/hyprland/rofi/config/style/applet3-2.nix
@@ -65,7 +65,7 @@
       textbox-prompt-colon {
         enabled:                     true;
         expand:                      false;
-        str:                         "";
+        str:                         "";
         padding:                     10px 13px;
         border-radius:               0px;
         background-color:            @urgent;

diff --git a/home/features/desktop/hyprland/rofi/config/style/applet3-3.nix b/home/features/desktop/hyprland/rofi/config/style/applet3-3.nix
@@ -66,7 +66,7 @@
       textbox-prompt-colon {
         enabled:                     true;
         expand:                      false;
-        str:                         "";
+        str:                         "";
         padding:                     10px 13px;
         border-radius:               0px;
         background-color:            @urgent;

diff --git a/home/features/desktop/hyprland/rofi/config/style/cliphist-2.nix b/home/features/desktop/hyprland/rofi/config/style/cliphist-2.nix
@@ -46,9 +46,9 @@
         spacing:                      0px;
         padding:                      0px;
         margin:                       0px;
-        color:                        #FFFFFF;
+        color:                      #FFFFFF;
         border:                       @border-width;
-        border-color:                 #FFFFFF;
+        border-color:               #FFFFFF;
         cursor:                       "default";
         transparency:                 "real";
         location:                     northeast;

diff --git a/home/features/desktop/hyprland/rofi/config/style/cliphist.nix b/home/features/desktop/hyprland/rofi/config/style/cliphist.nix
@@ -39,9 +39,9 @@
           spacing:                      0px;
           padding:                      0px;
           margin:                       0px;
-          color:                        #FFFFFF;
+          color:                      #FFFFFF;
           border:                       @border-width;
-          border-color:                 #FFFFFF;
+          border-color:               #FFFFFF;
           cursor:                       "default";
           transparency:                 "real";
           location:                     northeast;

diff --git a/home/features/desktop/hyprland/rofi/config/style/config-emoji.nix b/home/features/desktop/hyprland/rofi/config/style/config-emoji.nix
@@ -1,9 +1,9 @@
 { ... }:
 
 {
-  home.file.".config/rofi/config-emoji.rasi" = {
+  home.file.".config/rofi/style/config-emoji.rasi" = {
     text = ''
-      @import "~/.config/rofi/config-long.rasi"
+      @import "~/.config/rofi/style/config-long.rasi"
       entry {
         width: 45%;
         placeholder: "🔎 Search Emoji's 👀";

diff --git a/home/features/desktop/hyprland/rofi/config/style/config-long.nix b/home/features/desktop/hyprland/rofi/config/style/config-long.nix
@@ -1,8 +1,8 @@
 { ... }:
 
 {
-  home.file.".config/rofi/config-long.rasi".text = ''
-    @import "~/.config/rofi/config.rasi" 
+  home.file.".config/rofi/style/config-long.rasi".text = ''
+    @import "~/.config/rofi/config.rasi"
     window {
       width: 50%;
     }

diff --git a/home/features/desktop/hyprland/scripts/emopicker9000.nix b/home/features/desktop/hyprland/scripts/emopicker9000.nix
@@ -5,7 +5,10 @@
 
 pkgs.writeShellScriptBin "emopicker9000" ''
   # Get user selection via rofi from emoji file.
-  chosen=$(cat $HOME/.emoji | ${pkgs.rofi-wayland}/bin/rofi -dmenu | awk '{print $1}')
+  dir="$HOME/.config/rofi/style"
+  theme='config-emoji'
+
+  chosen=$(cat $HOME/.config/.emoji | ${pkgs.rofi-wayland}/bin/rofi -dmenu  -theme "$dir/$theme.rasi" | awk '{print $1}')
 
   # Exit if none chosen.
   [ -z "$chosen" ] && exit