chore(module): remove installPackage parameter

This commit is contained in:
Yorick Barbanneau 2024-09-03 00:40:48 +02:00
parent e2e5c9c75e
commit 691e01e22c
7 changed files with 30 additions and 60 deletions

View file

@ -7,12 +7,6 @@ in
options.modules.desktop.sway = {
enable = mkEnableOption "enable Sway Windows Manager";
installPackage = mkOption {
type = types.bool;
default = true;
description = "install Package, if false relies on distribution packages";
};
kanshi = mkOption {
type = types.bool;
default = false;

View file

@ -7,14 +7,6 @@ in
config = mkIf config.modules.desktop.sway.enable {
wayland.windowManager.sway = {
enable = true;
# Do not install sway package on other system that NixOS
# because performance issue
package =
if cfg.installPackage
then pkgs.sway
else null;
wrapperFeatures.gtk = true;
systemd.enable = true;
config = {
@ -69,10 +61,7 @@ in
"${mod}+Shift+q" = "kill";
"${mod}+d" = "exec ${pkgs.fuzzel}/bin/fuzzel";
"${mod}+Shift+c" = "reload";
"${mod}+Alt+l" =
if cfg.installPackage
then "exec ${pkgs.swaylock}/bin/swaylock"
else "exec swaylock";
"${mod}+Alt+l" = "exec ${pkgs.swaylock}/bin/swaylock";
"${mod}+${left} focus" = "left";
"${mod}+${down} focus" = "down";
"${mod}+${up} focus" = "up";

View file

@ -10,34 +10,22 @@ in
timeouts = [
{
timeout = 300;
command =
if cfg.installPackage
then "${pkgs.swaylock}/bin/swaylock -f"
else "swaylock -f";
command = "${pkgs.swaylock}/bin/swaylock -f";
}
{
timeout = 600;
command = ''${pkgs.sway}/bin/swaymsg "output * power off"'';
resumeCommand =
if cfg.installPackage
then ''${pkgs.sway}/bin/swaymsg "output * power on"''
else ''swaymsg "output * power on"'';
resumeCommand =''${pkgs.sway}/bin/swaymsg "output * power on"'';
}
];
events = [
{
event = "before-sleep";
command =
if cfg.installPackage
then "${pkgs.swaylock}/bin/swaylock -f"
else "swaylock -f";
command = "${pkgs.swaylock}/bin/swaylock -f";
}
{
event = "lock";
command =
if cfg.installPackage
then "${pkgs.swaylock}/bin/swaylock -f"
else "swaylock -f";
command = "${pkgs.swaylock}/bin/swaylock -f";
}
];
};

View file

@ -7,10 +7,6 @@ in
config = mkIf config.modules.desktop.sway.enable {
programs.swaylock = {
enable = true;
package =
if cfg.installPackage
then pkgs.swaylock
else pkgs.emptyDirectory;
settings = {
image = "${cfg.wallpapers.lockscreen}";
scaling = "center";