This commit is contained in:
Nathan McCarty 2023-06-20 02:10:20 -04:00
parent 63e7c14a8e
commit a737f7e3d7
Signed by: thatonelutenist
SSH Key Fingerprint: SHA256:hwQEcmak9E6sdU9bXc98RHw/Xd1AhpB5HZT7ZSVJkRM
2 changed files with 7 additions and 3 deletions

View File

@ -3,13 +3,16 @@ let
swaylock-package = config.nathan.config.desktop.swaylock.package; swaylock-package = config.nathan.config.desktop.swaylock.package;
swaylock-command = config.nathan.config.desktop.swaylock.command; swaylock-command = config.nathan.config.desktop.swaylock.command;
targets = config.nathan.config.desktop.targets; targets = config.nathan.config.desktop.targets;
hyprland = config.nathan.programs.hyprland.enable;
in lib.mkMerge [ in lib.mkMerge [
(lib.mkIf config.nathan.programs.hyprland.enable { # Hyprland specific
(lib.mkIf hyprland {
wayland.windowManager.hyprland.extraConfig = '' wayland.windowManager.hyprland.extraConfig = ''
bind = SUPER, Z, exec, ${swaylock-package}/bin/swaylock ${swaylock-command} bind = SUPER, Z, exec, ${swaylock-package}/bin/swaylock ${swaylock-command}
''; '';
}) })
({ # General
(lib.mkIf hyprland {
home.packages = with pkgs; [ swaylock-package swayidle ]; home.packages = with pkgs; [ swaylock-package swayidle ];
services.swayidle = { services.swayidle = {

View File

@ -2,7 +2,8 @@
let let
fuzzel-command = config.nathan.config.desktop.fuzzel-command; fuzzel-command = config.nathan.config.desktop.fuzzel-command;
targets = config.nathan.config.desktop.targets; targets = config.nathan.config.desktop.targets;
in { hyprland = config.nathan.programs.hyprland.enable;
in lib.mkIf hyprland {
######################### #########################
## Waybar ## Waybar
######################### #########################