aboutsummaryrefslogtreecommitdiff
path: root/modules/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'modules/desktop')
-rw-r--r--modules/desktop/default.nix10
-rw-r--r--modules/desktop/fonts.nix33
2 files changed, 13 insertions, 30 deletions
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 3ee9fb5..f150066 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,15 +1,5 @@
{lib, config, pkgs, ...}:
-with lib;
-
{
- options.sys.graphics = {
- desktopProtocols = mkOption {
- type = with types; listOf (enum ["xorg" "wayland"]);
- default = [];
- description = "Desktop protocols you want to use for your desktop environment. If unset, no desktop is installed (headless host).";
- };
- };
-
imports = [
./fonts.nix
./sound.nix
diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix
index 367e42e..a840582 100644
--- a/modules/desktop/fonts.nix
+++ b/modules/desktop/fonts.nix
@@ -1,25 +1,18 @@
-{pkgs, config, lib, ... }:
-with lib;
+{ pkgs, config, lib, ... }:
-let
- xorg = (elem "xorg" config.sys.graphics.desktopProtocols);
- wayland = (elem "wayland" config.sys.graphics.desktopProtocols);
- desktopMode = xorg || wayland;
-in {
- config= mkIf desktopMode {
- fonts = {
- fontconfig.enable = true;
- fonts = with pkgs; [
- noto-fonts-emoji
- dejavu_fonts
- source-code-pro
- source-sans-pro
- source-serif-pro
- ];
+{
+ fonts = {
+ fontconfig.enable = true;
+ fonts = with pkgs; [
+ noto-fonts-emoji
+ dejavu_fonts
+ source-code-pro
+ source-sans-pro
+ source-serif-pro
+ ];
- fontconfig.defaultFonts = {
- monospace = [ "Source Code Pro" ];
- };
+ fontconfig.defaultFonts = {
+ monospace = [ "Source Code Pro" ];
};
};
}