base: put common GUI programs behind option

This commit is contained in:
Antoine Martin 2022-01-07 17:20:57 +01:00
parent d362c10c1d
commit b9f088c656
6 changed files with 33 additions and 28 deletions

View file

@ -1,6 +1,7 @@
{ ... }: { ... }:
{ {
imports = [ imports = [
./gui-programs.nix
./networking.nix ./networking.nix
./nix.nix ./nix.nix
./programs.nix ./programs.nix

View file

@ -1,5 +1,8 @@
{ pkgs, ... }: { pkgs, lib, config, ... }:
{ {
options.my.gui.enable = lib.mkEnableOption "System has some kind of screen attached";
config = lib.mkIf config.my.gui.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
element-desktop element-desktop
feh feh
@ -28,4 +31,5 @@
# NOTE: needed for home emacs configuration # NOTE: needed for home emacs configuration
nixpkgs.config.input-fonts.acceptLicense = true; nixpkgs.config.input-fonts.acceptLicense = true;
};
} }

View file

@ -3,7 +3,6 @@
imports = [ imports = [
# Default configuration # Default configuration
./base ./base
./base/gui-programs.nix
# Module definitions # Module definitions
./modules ./modules

View file

@ -102,6 +102,7 @@ in
}; };
}; };
my.displayManager.sddm.enable = true; my.displayManager.sddm.enable = true;
my.gui.enable = true;
my.wakeonwlan.interfaces.phy0.methods = [ my.wakeonwlan.interfaces.phy0.methods = [
"magic-packet" "magic-packet"

View file

@ -62,6 +62,7 @@ in
fwupd.enable = true; fwupd.enable = true;
}; };
my.displayManager.sddm.enable = true; my.displayManager.sddm.enable = true;
my.gui.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
arandr arandr

View file

@ -3,7 +3,6 @@
imports = [ imports = [
# Default configuration # Default configuration
./base ./base
./base/gui-programs.nix
# Module definitions # Module definitions
./modules ./modules