Add rofi filebrowser

Move rofi-power-menu out of main modi

Change all uses of rofi -replace with pkill rofi || rofi ... for
consistency with rofi-pass
This commit is contained in:
Evie Litherland-Smith 2024-02-05 07:33:42 +00:00
parent 36c48e2bc6
commit be0cac1d59
2 changed files with 8 additions and 9 deletions

View file

@ -227,11 +227,12 @@
# See https://wiki.hyprland.org/Configuring/Keywords/ for more # See https://wiki.hyprland.org/Configuring/Keywords/ for more
"SUPER, F1, exec, ${swaylock.package}/bin/swaylock --screenshots --clock --indicator --grace-no-mouse" "SUPER, F1, exec, ${swaylock.package}/bin/swaylock --screenshots --clock --indicator --grace-no-mouse"
"SUPER, Q, killactive," "SUPER, Q, killactive,"
"SUPER SHIFT, Q, exec, ${rofi.finalPackage}/bin/rofi -replace -show power-menu" "SUPER SHIFT, Q, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show powermenu -modi powermenu:${pkgs.rofi-power-menu}/bin/rofi-power-menu"
"SUPER, V, togglefloating" "SUPER, V, togglefloating"
"SUPER, M, fullscreen, 0" "SUPER, M, fullscreen, 0"
"SUPER SHIFT, M, fullscreen, 1" "SUPER SHIFT, M, fullscreen, 1"
"SUPER, tab, exec, ${rofi.finalPackage}/bin/rofi -replace -show window" "SUPER, tab, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show window"
"SUPER, F, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show filebrowser"
"SUPER, P, exec, pkill rofi || ${rofi.pass.package}/bin/rofi-pass" "SUPER, P, exec, pkill rofi || ${rofi.pass.package}/bin/rofi-pass"
"SUPER SHIFT, P, exec, pkill rofi || ${rofi.pass.package}/bin/rofi-pass --last-used" "SUPER SHIFT, P, exec, pkill rofi || ${rofi.pass.package}/bin/rofi-pass --last-used"
"SUPER ALT, P, exec, pkill rofi || ${rofi.pass.package}/bin/rofi-pass --insert" "SUPER ALT, P, exec, pkill rofi || ${rofi.pass.package}/bin/rofi-pass --insert"
@ -239,7 +240,7 @@
"SUPER SHIFT, Z, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -d -sw" "SUPER SHIFT, Z, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -d -sw"
# Common program shortcuts # Common program shortcuts
"SUPER, Space, exec, ${rofi.finalPackage}/bin/rofi -replace -show combi" "SUPER, Space, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show combi"
"SUPER, Return, exec, ${alacritty.package}/bin/alacritty" "SUPER, Return, exec, ${alacritty.package}/bin/alacritty"
"SUPER SHIFT, Return, exec, ${emacs.finalPackage}/bin/emacsclient -c" "SUPER SHIFT, Return, exec, ${emacs.finalPackage}/bin/emacsclient -c"
"SUPER, S, exec, ${alacritty.package}/bin/alacritty -e btm --group --battery" "SUPER, S, exec, ${alacritty.package}/bin/alacritty -e btm --group --battery"
@ -247,7 +248,7 @@
# Misc useful binds # Misc useful binds
'',Print,exec,${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)"'' '',Print,exec,${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)"''
",XF86Calculator,exec,${rofi.finalPackage}/bin/rofi -replace -show calc" ",XF86Calculator,exec,pkill rofi || ${rofi.finalPackage}/bin/rofi -show calc"
# Movement binds # Movement binds
"SUPER, H, movefocus, l" "SUPER, H, movefocus, l"

View file

@ -13,10 +13,8 @@
USERNAME_field='login' USERNAME_field='login'
''; '';
}; };
extraConfig = let extraConfig = {
power-menu = "power-menu:${pkgs.rofi-power-menu}/bin/rofi-power-menu"; modi = "window,drun,filebrowser,ssh,combi";
in {
modi = "window,run,drun,ssh,${power-menu},combi";
combi-modi = "window,drun,ssh"; combi-modi = "window,drun,ssh";
sidebar-mode = true; sidebar-mode = true;
sort = true; sort = true;
@ -31,9 +29,9 @@
display-window = " 󰧨 Move "; display-window = " 󰧨 Move ";
display-run = " 󰅴 Run "; display-run = " 󰅴 Run ";
display-drun = " 󱓞 Apps "; display-drun = " 󱓞 Apps ";
display-filebrowser = " 󰝰 Files ";
display-ssh = " 󰢹 SSH "; display-ssh = " 󰢹 SSH ";
display-combi = " 󰛡 Combi "; display-combi = " 󰛡 Combi ";
display-power-menu = " 󰐥 Power ";
}; };
theme = with config.lib.stylix.colors; let theme = with config.lib.stylix.colors; let
inherit (config.lib.formats.rasi) mkLiteral; inherit (config.lib.formats.rasi) mkLiteral;