some refactoring
This commit is contained in:
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
cfg = config.modules.wm.hyprland.toothpick.appearance;
|
||||
cfg = config.userModules.wm.hyprland.toothpick.appearance;
|
||||
in {
|
||||
options = {
|
||||
modules.wm.hyprland.toothpick.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland";
|
||||
userModules.wm.hyprland.toothpick.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
|
||||
@@ -3,26 +3,26 @@
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
userModules,
|
||||
umodPath,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption mkDefault;
|
||||
cfg = config.modules.wm.hyprland.toothpick;
|
||||
cfg = config.userModules.wm.hyprland.toothpick;
|
||||
in {
|
||||
imports = [
|
||||
"${userModules}/wm/hyprland/toothpick/appearance.nix"
|
||||
"${userModules}/wm/hyprland/toothpick/inputs.nix"
|
||||
"${userModules}/wm/hyprland/toothpick/keybinds.nix"
|
||||
"${userModules}/wm/hyprland/toothpick/rules.nix"
|
||||
"${userModules}/wm/hyprland/toothpick/startup.nix"
|
||||
"${umodPath}/wm/hyprland/toothpick/appearance.nix"
|
||||
"${umodPath}/wm/hyprland/toothpick/inputs.nix"
|
||||
"${umodPath}/wm/hyprland/toothpick/keybinds.nix"
|
||||
"${umodPath}/wm/hyprland/toothpick/rules.nix"
|
||||
"${umodPath}/wm/hyprland/toothpick/startup.nix"
|
||||
];
|
||||
|
||||
options = {
|
||||
modules.wm.hyprland.toothpick.enable = mkEnableOption "Enable Hyprland";
|
||||
userModules.wm.hyprland.toothpick.enable = mkEnableOption "Enable Hyprland";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
modules.wm.hyprland.toothpick = {
|
||||
userModules.wm.hyprland.toothpick = {
|
||||
appearance.enable = mkDefault cfg.enable;
|
||||
inputs.enable = mkDefault cfg.enable;
|
||||
keybinds.enable = mkDefault cfg.enable;
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
cfg = config.modules.wm.hyprland.toothpick.inputs;
|
||||
cfg = config.userModules.wm.hyprland.toothpick.inputs;
|
||||
in {
|
||||
options = {
|
||||
modules.wm.hyprland.toothpick.inputs.enable = mkEnableOption "Enables input settings in Hyprland";
|
||||
userModules.wm.hyprland.toothpick.inputs.enable = mkEnableOption "Enables input settings in Hyprland";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
cfg = config.modules.wm.hyprland.toothpick.keybinds;
|
||||
cfg = config.userModules.wm.hyprland.toothpick.keybinds;
|
||||
in {
|
||||
options = {
|
||||
modules.wm.hyprland.toothpick.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland";
|
||||
userModules.wm.hyprland.toothpick.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
cfg = config.modules.wm.hyprland.toothpick.rules;
|
||||
cfg = config.userModules.wm.hyprland.toothpick.rules;
|
||||
in {
|
||||
options = {
|
||||
modules.wm.hyprland.toothpick.rules.enable = mkEnableOption "Enables window rule settings in Hyprland";
|
||||
userModules.wm.hyprland.toothpick.rules.enable = mkEnableOption "Enables window rule settings in Hyprland";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
cfg = config.modules.wm.hyprland.toothpick.startup;
|
||||
cfg = config.userModules.wm.hyprland.toothpick.startup;
|
||||
in {
|
||||
options = {
|
||||
modules.wm.hyprland.toothpick.startup.enable = mkEnableOption "Enables startup settings in Hyprland";
|
||||
userModules.wm.hyprland.toothpick.startup.enable = mkEnableOption "Enables startup settings in Hyprland";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
|
||||
Reference in New Issue
Block a user