move sway options to options.nix and follow osConfig

This commit is contained in:
Aly Raffauf 2024-06-21 17:44:27 -04:00
parent 96ac335435
commit b329714206
5 changed files with 22 additions and 31 deletions

View file

@ -6,28 +6,6 @@
}: { }: {
imports = [./randomWallpaper.nix ./redShift.nix]; imports = [./randomWallpaper.nix ./redShift.nix];
options = {
alyraffauf.desktop.sway = {
enable =
lib.mkEnableOption "Enables sway with extra apps.";
autoSuspend = lib.mkOption {
description = "Whether to autosuspend on idle.";
default = config.alyraffauf.desktop.sway.enable;
type = lib.types.bool;
};
randomWallpaper = lib.mkOption {
description = "Whether to enable random wallpaper script.";
default = config.alyraffauf.desktop.sway.enable;
type = lib.types.bool;
};
redShift = lib.mkOption {
description = "Whether to redshift display colors at night.";
default = config.alyraffauf.desktop.sway.enable;
type = lib.types.bool;
};
};
};
config = lib.mkIf config.alyraffauf.desktop.sway.enable { config = lib.mkIf config.alyraffauf.desktop.sway.enable {
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;

View file

@ -234,6 +234,28 @@
}; };
}; };
}; };
sway = {
enable = lib.mkOption {
description = "Sway with full desktop session components.";
default = osConfig.alyraffauf.desktop.sway.enable;
type = lib.types.bool;
};
autoSuspend = lib.mkOption {
description = "Whether to autosuspend on idle.";
default = config.alyraffauf.desktop.sway.enable;
type = lib.types.bool;
};
randomWallpaper = lib.mkOption {
description = "Whether to enable random wallpaper script.";
default = config.alyraffauf.desktop.sway.enable;
type = lib.types.bool;
};
redShift = lib.mkOption {
description = "Whether to redshift display colors at night.";
default = config.alyraffauf.desktop.sway.enable;
type = lib.types.bool;
};
};
startupApps = lib.mkOption { startupApps = lib.mkOption {
description = "Apps to launch at startup"; description = "Apps to launch at startup";
default = []; default = [];

View file

@ -40,7 +40,6 @@
enable = true; enable = true;
password = "$y$j9T$NSS7QcEtN4yiigPyofwlI/$nxdgz0lpySa0heDMjGlHe1gX3BWf48jK6Tkfg4xMEs6"; password = "$y$j9T$NSS7QcEtN4yiigPyofwlI/$nxdgz0lpySa0heDMjGlHe1gX3BWf48jK6Tkfg4xMEs6";
}; };
dustin.enable = false;
}; };
desktop = { desktop = {
enable = true; enable = true;
@ -53,7 +52,6 @@
}; };
}; };
hyprland.enable = true; hyprland.enable = true;
sway.enable = true;
}; };
apps = { apps = {
steam.enable = true; steam.enable = true;

View file

@ -36,7 +36,6 @@
enable = true; enable = true;
password = "$y$j9T$TitXX3J690cnK41XciNMg/$APKHM/os6FKd9H9aXGxaHaQ8zP5SenO9EO94VYafl43"; password = "$y$j9T$TitXX3J690cnK41XciNMg/$APKHM/os6FKd9H9aXGxaHaQ8zP5SenO9EO94VYafl43";
}; };
dustin.enable = false;
}; };
desktop = { desktop = {
enable = true; enable = true;
@ -49,7 +48,6 @@
}; };
}; };
hyprland.enable = true; hyprland.enable = true;
sway.enable = true;
}; };
apps = { apps = {
steam.enable = true; steam.enable = true;

View file

@ -36,7 +36,6 @@
enable = true; enable = true;
password = "$y$j9T$VdtiEyMOegHpcUwgmCVFD0$K8Ne6.zk//VJNq2zxVQ0xE0Wg3LohvAQd3Xm9aXdM15"; password = "$y$j9T$VdtiEyMOegHpcUwgmCVFD0$K8Ne6.zk//VJNq2zxVQ0xE0Wg3LohvAQd3Xm9aXdM15";
}; };
dustin.enable = false;
}; };
desktop = { desktop = {
enable = true; enable = true;
@ -48,12 +47,8 @@
user = "aly"; user = "aly";
}; };
}; };
sway.enable = false;
hyprland.enable = true; hyprland.enable = true;
}; };
apps = {
steam.enable = false;
};
scripts = { scripts = {
hoenn.enable = true; hoenn.enable = true;
}; };