extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2025-02-16 09:49:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

meta: Replace desktop.container with config.boot.isContainer

Browse Source 
No need to say that we're a container when NixOS already handles this.
This commit is contained in:
Donovan Glover 2024-09-01 14:31:45 -04:00
parent c501f713a5
commit 50f8c3eb00
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
containers/default.nix
View File

@ -20,7 +20,6 @@
nixpkgs.overlays = builtins.attrValues nix-config.overlays; nixpkgs.overlays = builtins.attrValues nix-config.overlays;
modules = { modules = {
desktop.container = true;
system.noRoot = true; system.noRoot = true;
}; };

13
modules/desktop.nix
View File

@ -9,6 +9,7 @@
let let
inherit (lib.types) float int; inherit (lib.types) float int;
inherit (config.modules.system) username; inherit (config.modules.system) username;
inherit (config.boot) isContainer;
inherit (nix-config.packages.${pkgs.system}) aleo-fonts; inherit (nix-config.packages.${pkgs.system}) aleo-fonts;
inherit (builtins) attrValues; inherit (builtins) attrValues;
inherit (config.lib.stylix.colors.withHashtag) base00 base03 base05; inherit (config.lib.stylix.colors.withHashtag) base00 base03 base05;
@ -22,7 +23,6 @@ let
inherit (cfg) inherit (cfg)
bloat bloat
container
opacity opacity
fontSize fontSize
graphical graphical
@ -58,7 +58,6 @@ in
}; };
bloat = mkEnableOption "GUI applications"; bloat = mkEnableOption "GUI applications";
container = mkEnableOption "disable some options for container performance";
graphical = mkEnableOption "xserver for graphical containers"; graphical = mkEnableOption "xserver for graphical containers";
}; };
@ -66,7 +65,7 @@ in
hardware.graphics.enable32Bit = true; hardware.graphics.enable32Bit = true;
programs = { programs = {
hyprland.enable = mkIf (!container) true; hyprland.enable = mkIf (!isContainer) true;
cdemu.enable = true; cdemu.enable = true;
thunar = { thunar = {
@ -104,13 +103,13 @@ in
}; };
}; };
xserver = mkIf (!container || graphical) { xserver = mkIf (!isContainer || graphical) {
enable = true; enable = true;
excludePackages = with pkgs; [ xterm ]; 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; enable = true;
package = pkgs.dwm.override { package = pkgs.dwm.override {
@ -252,7 +251,7 @@ in
pulse.enable = true; pulse.enable = true;
}; };
greetd = mkIf (!container) { greetd = mkIf (!isContainer) {
enable = true; enable = true;
restart = false; restart = false;

2
tests/neovim.nix
View File

@ -14,8 +14,6 @@ self.inputs.nixpkgs.lib.nixos.runTest {
system system
]; ];
modules.desktop.container = true;
home-manager.sharedModules = with nix-config.homeModules; [ home-manager.sharedModules = with nix-config.homeModules; [
neovim neovim
]; ];