options/custom/desktops/niri/binds.nix

@@ -130,7 +130,6 @@ in {
             (key "M" "Ctrl+Alt" (spawn [pkill "youtube-music"]))
             (key "M" "Mod" (spawn youtube-music))
             (key "Minus" "Mod" (spawn [swayosd-client "--output-volume" "lower"]))
-            (key "N" "Mod" (spawn networkmanager_dmenu))
             (key "O" "Mod" (spawn [loupe "/tmp/wallpaper.png"]))
             (key "P" "Ctrl+Alt" (spawn [pkill "bitwarden"]))
             (key "P" "Mod" (spawn [bash "-c" config.custom.menus.vault.show]))
@@ -181,7 +180,7 @@ in {
             #// (key "Shift_L" "Mod" focus-workspace-previous)
             # TODO: Use "Super_L" when fixed
             (key "Space" "Mod" (spawn [bash "-c" config.custom.menus.show]))
-            (key "Space" "Mod+Ctrl" (spawn [bash "-c" config.custom.menus.calculator.show]))
+            (key "Space" "Mod+Ctrl+Shift" (spawn networkmanager_dmenu))
             (key "Space" "Mod+Shift" (spawn [bash "-c" config.custom.menus.search.show]))
 
             # Media keys

options/custom/menus/default.nix

@@ -9,7 +9,6 @@ in {
   options.custom.menus = {
     enable = mkOption {default = config.custom.full;};
     show = mkOption {default = "";};
-    calculator.show = mkOption {default = "";};
 
     clipboard = {
       clear = mkOption {default = "";};

options/custom/menus/rofi/custom.rasi

@@ -1,5 +1,5 @@
 /***
-https://davatorium.github.io/rofi/current/rofi-theme.5/
+https://github.com/lbonn/rofi/blob/wayland/doc/rofi-theme.5.markdown
 https://github.com/newmanls/rofi-themes-collection/blob/master/themes/rounded-common.rasi
 https://github.com/newmanls/rofi-themes-collection/blob/master/themes/rounded-pink-dark.rasi
 ***/
@@ -11,62 +11,52 @@ https://github.com/newmanls/rofi-themes-collection/blob/master/themes/rounded-pi
   padding: 0;
   spacing: 0;
   text-color: #93a1a1;
-  vertical-align: 0.5;
 }
 
 window {
   background-color: #002b36;
   border-color: #073642;
-  border-radius: 32px;
+  border-radius: 30px;
   location: north;
   width: 750;
   y-offset: calc(50% - 25% / 2);
 }
 
 mainbox {
-  children: [inputbox, listview];
   padding: 4px;
 }
 
-inputbox {
-  background-color: #073642;
-  border-radius: 24px;
-  children: [inputbar, message];
-  expand: false;
-}
-
 inputbar {
-  background-color: #002b36;
+  background-color: #073642;
   border-color: #d33682;
-  border-radius: 32px;
-  children: [entry, prompt];
-  padding: 4px;
+  border-radius: 30px;
+  padding: 8px 8px 8px 4px;
+  spacing: 4px;
 }
 
 prompt {
-  background-color: #073642;
-  border-radius: 32px;
-  font: 'monospace 18';
-  padding: 4px 18px;
+  font: 'monospace 16';
+  padding: 4px 4px 4px 8px;
   text-color: #93a1a1;
+  vertical-align: 0.5;
 }
 
 entry {
   font: 'monospace 18';
-  margin: 4px 12px;
   placeholder-color: #586e7580;
+  vertical-align: 0.5;
 }
 
 message {
-  padding: 16px;
+  padding: 8px 8px 4px 8px;
 }
 
 textbox {
-  font: 'monospace 16';
-  horizontal-align: 0.5;
+  font: 'sans-serif 10';
 }
 
 listview {
+  background-color: transparent;
   columns: 1;
   fixed-height: false;
   lines: 5;
@@ -74,9 +64,9 @@ listview {
 }
 
 element {
-  border-radius: 32px;
+  border-radius: 30px;
   padding: 12px;
-  spacing: 4px;
+  spacing: 8px;
 }
 
 element selected normal,
@@ -86,10 +76,10 @@ element selected active {
 
 element-icon {
   size: 32px;
+  vertical-align: 0.5;
 }
 
 element-text {
-  highlight: #d33682;
-  margin: 4px;
-  tab-stops: [700px];
+  text-color: inherit;
+  vertical-align: 0.5;
 }

options/custom/menus/rofi/default.nix

@@ -25,8 +25,7 @@ in {
       menus = let
         quit = "${pkill} --exact rofi";
       in {
-        show = "${quit} || ${rofi} -show combi -show-icons -theme-str 'prompt { enabled: false; }'";
-        calculator.show = "${quit} || ${rofi} -show calc";
+        show = "${quit} || ${rofi} -show combi -show-icons";
 
         clipboard = {
           show = "${quit} || ${rofi} -show clipboard -show-icons";
@@ -34,10 +33,10 @@ in {
         };
 
         dmenu.show = "${quit} || ${rofi} -dmenu";
-        emoji.show = "${quit} || ${rofimoji} --prompt 󰱰";
-        network.show = "${quit} || ${rofi} -dmenu -p 󰛳";
+        emoji.show = "${quit} || ${rofimoji} --prompt 󰞅";
+        network.show = "${quit} || ${rofi} -dmenu -p ";
         search.show = "";
-        vault.show = "${quit} || ${rofi-rbw} --prompt 󰌾";
+        vault.show = "${quit} || ${rofi-rbw} --prompt ";
       };
 
       services = {
@@ -58,35 +57,36 @@ in {
           enable = true;
 
           # https://github.com/lbonn/rofi
+          # https://github.com/lbonn/rofi/tree/wayland/doc
           package = pkgs.rofi-wayland; # Wayland fork
 
           plugins = with pkgs; [
             rofi-calc # https://github.com/svenstaro/rofi-calc
           ];
 
-          # https://davatorium.github.io/rofi/themes/themes/
           #?? rofi-theme-selector
           theme = "custom";
 
-          # https://davatorium.github.io/rofi/current/rofi.1/
+          # https://github.com/lbonn/rofi/blob/wayland/CONFIG.md
+          # https://github.com/lbonn/rofi/blob/wayland/doc/rofi.1.markdown
           # https://www.nerdfonts.com/cheat-sheet
           extraConfig = {
             combi-hide-mode-prefix = true;
-            combi-modes = ["drun" "run"];
+            combi-modes = ["drun" "run" "calc"];
             cycle = false;
-            display-calc = "";
-            display-clipboard = "";
-            display-combi = "";
+            display-calc = "󱖦";
+            display-clipboard = "󰅌";
+            display-combi = "";
             display-dmenu = "󰗧";
-            display-drun = "󱗼";
-            display-keys = "󰌌";
+            display-drun = "";
+            display-keys = "";
             display-run = "";
             display-ssh = "";
             drun-display-format = "{name}"; # Display only names
             drun-match-fields = "name"; # Disable matching of invisible desktop attributes
             matching = "prefix"; # Match beginning of words
 
-            # https://davatorium.github.io/rofi/current/rofi.1/#available-modes
+            # https://github.com/lbonn/rofi/blob/wayland/doc/rofi.1.markdown#available-modes
             modes = [
               "calc"
               "clipboard"
@@ -100,7 +100,7 @@ in {
         };
 
         xdg.configFile = {
-          # https://davatorium.github.io/rofi/current/rofi-theme.5/
+          # https://github.com/lbonn/rofi/blob/wayland/doc/rofi-theme.5.markdown
           "rofi/custom.rasi".text = ''
             ${readFile ./custom.rasi}
 
@@ -109,7 +109,7 @@ in {
             }
           '';
 
-          # https://davatorium.github.io/rofi/current/rofi-script.5/
+          # https://github.com/lbonn/rofi/blob/wayland/doc/rofi-script.5.markdown
           # https://github.com/sentriz/cliphist?tab=readme-ov-file#picker-examples
           "rofi/scripts/clipboard" = {
             #// source = getExe' hm.services.cliphist.package "cliphist-rofi-img";

options/custom/programs/rbw.nix

@@ -38,7 +38,6 @@ in {
         xdg.configFile = {
           "rofi-rbw.rc".text = ''
             action=copy
-            no-help=true
             selector=${config.custom.menu}
           '';
         };