From de19539c1e77d308b4c05bbb1e87000a3a6953ee Mon Sep 17 00:00:00 2001 From: TheWanderingCrow Date: Wed, 25 Dec 2024 17:16:54 -0500 Subject: [PATCH] Update desktop options to be standardized --- modules/desktops/wayland/sway.nix | 2 -- modules/desktops/x11/i3.nix | 2 -- modules/options.nix | 5 +++++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/desktops/wayland/sway.nix b/modules/desktops/wayland/sway.nix index fbfc62f..cf16f6d 100644 --- a/modules/desktops/wayland/sway.nix +++ b/modules/desktops/wayland/sway.nix @@ -5,8 +5,6 @@ config, ... }: { - options.desktop.sway.enable = lib.mkEnableOption "enables sway"; - config = { programs.sway = lib.mkIf config.desktop.sway.enable { enable = true; diff --git a/modules/desktops/x11/i3.nix b/modules/desktops/x11/i3.nix index 3427a3e..cfcda63 100644 --- a/modules/desktops/x11/i3.nix +++ b/modules/desktops/x11/i3.nix @@ -5,8 +5,6 @@ config, ... }: { - options.desktop.i3.enable = lib.mkEnableOption "enables i3"; - config = lib.mkIf config.desktop.i3.enable { services.xserver = { displayManager.startx.enable = true; diff --git a/modules/options.nix b/modules/options.nix index 2aa70d1..61067b3 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -36,6 +36,11 @@ enable = lib.mkEnableOption "enable container overseer user"; }; }; + + desktop = { + sway.enable = lib.mkEnableOption "enables sway"; + i3.enable = lib.mkEnableOption "enables i3"; + }; }; # Set default option states in config