diff --git a/containers/default.nix b/containers/default.nix index a1a46d25..7077c1fe 100644 --- a/containers/default.nix +++ b/containers/default.nix @@ -20,7 +20,6 @@ nixpkgs.overlays = builtins.attrValues nix-config.overlays; modules = { - desktop.container = true; system.noRoot = true; }; diff --git a/modules/desktop.nix b/modules/desktop.nix index a72655eb..69833f1a 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -9,6 +9,7 @@ let inherit (lib.types) float int; inherit (config.modules.system) username; + inherit (config.boot) isContainer; inherit (nix-config.packages.${pkgs.system}) aleo-fonts; inherit (builtins) attrValues; inherit (config.lib.stylix.colors.withHashtag) base00 base03 base05; @@ -22,7 +23,6 @@ let inherit (cfg) bloat - container opacity fontSize graphical @@ -58,7 +58,6 @@ in }; bloat = mkEnableOption "GUI applications"; - container = mkEnableOption "disable some options for container performance"; graphical = mkEnableOption "xserver for graphical containers"; }; @@ -66,7 +65,7 @@ in hardware.graphics.enable32Bit = true; programs = { - hyprland.enable = mkIf (!container) true; + hyprland.enable = mkIf (!isContainer) true; cdemu.enable = true; thunar = { @@ -104,13 +103,13 @@ in }; }; - xserver = mkIf (!container || graphical) { + xserver = mkIf (!isContainer || graphical) { enable = true; excludePackages = with pkgs; [ xterm ]; - displayManager.startx.enable = mkIf (!container) true; + displayManager.startx.enable = mkIf (!isContainer) true; - windowManager.dwm = mkIf (!container) { + windowManager.dwm = mkIf (!isContainer) { enable = true; package = pkgs.dwm.override { @@ -252,7 +251,7 @@ in pulse.enable = true; }; - greetd = mkIf (!container) { + greetd = mkIf (!isContainer) { enable = true; restart = false; diff --git a/tests/neovim.nix b/tests/neovim.nix index 353ca09c..6bb700d4 100644 --- a/tests/neovim.nix +++ b/tests/neovim.nix @@ -14,8 +14,6 @@ self.inputs.nixpkgs.lib.nixos.runTest { system ]; - modules.desktop.container = true; - home-manager.sharedModules = with nix-config.homeModules; [ neovim ];