rofi: move setting package and terminal into hyprland/default.nix
Allows setting alternate packages / terminals depending on how it's used Change hyprland to reference rofi.finalPackage instead of package
This commit is contained in:
parent
5353091a1e
commit
81c1382843
|
@ -20,6 +20,11 @@
|
||||||
../nyxt/default.nix
|
../nyxt/default.nix
|
||||||
../obs/default.nix
|
../obs/default.nix
|
||||||
];
|
];
|
||||||
|
programs.rofi = with pkgs; {
|
||||||
|
package = rofi-wayland;
|
||||||
|
terminal = "${alacritty}/bin/alacritty";
|
||||||
|
pass.package = rofi-pass-wayland;
|
||||||
|
};
|
||||||
services = {
|
services = {
|
||||||
gpg-agent.pinentryFlavor = "gnome3";
|
gpg-agent.pinentryFlavor = "gnome3";
|
||||||
avizo.enable = true;
|
avizo.enable = true;
|
||||||
|
@ -218,11 +223,11 @@
|
||||||
# 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.package}/bin/rofi -replace -show power-menu"
|
"SUPER SHIFT, Q, exec, ${rofi.finalPackage}/bin/rofi -replace -show 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.package}/bin/rofi -replace -show window"
|
"SUPER, tab, exec, ${rofi.finalPackage}/bin/rofi -replace -show window"
|
||||||
"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"
|
||||||
|
@ -230,7 +235,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.package}/bin/rofi -replace -show combi"
|
"SUPER, Space, exec, ${rofi.finalPackage}/bin/rofi -replace -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"
|
||||||
|
@ -238,7 +243,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.package}/bin/rofi -replace -show calc"
|
",XF86Calculator,exec,${rofi.finalPackage}/bin/rofi -replace -show calc"
|
||||||
|
|
||||||
# Movement binds
|
# Movement binds
|
||||||
"SUPER, H, movefocus, l"
|
"SUPER, H, movefocus, l"
|
||||||
|
|
|
@ -6,12 +6,9 @@
|
||||||
stylix.targets.rofi.enable = true;
|
stylix.targets.rofi.enable = true;
|
||||||
programs.rofi = {
|
programs.rofi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.rofi-wayland;
|
|
||||||
location = "center";
|
location = "center";
|
||||||
terminal = "${pkgs.alacritty}/bin/alacritty";
|
|
||||||
pass = {
|
pass = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.rofi-pass-wayland;
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
USERNAME_field='login'
|
USERNAME_field='login'
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue