diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-05-24 13:58:00 +0200 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-05-24 13:58:00 +0200 |
| commit | 74897880c560409e0ed4b9d1ff891770c1432ab6 (patch) | |
| tree | 10a67452dd0eaaa084b023c53335db798859e4a2 /modules/system | |
| parent | fix(hosts/tiamat): Also use new services modules (diff) | |
| download | nixos-config-74897880c560409e0ed4b9d1ff891770c1432ab6.zip | |
fix(modules/system/{hardware,fonts}): Fix typesystem stuff
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/fonts/default.nix | 10 | ||||
| -rw-r--r-- | modules/system/hardware/default.nix | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/modules/system/fonts/default.nix b/modules/system/fonts/default.nix index fa99c1f3..abd5664b 100644 --- a/modules/system/fonts/default.nix +++ b/modules/system/fonts/default.nix @@ -10,7 +10,7 @@ in { enable = lib.mkEnableOption "fonts"; fonts = lib.mkOption { - type = lib.types.listOf lib.types.path; + type = lib.types.listOf lib.types.str; example = lib.literalExpression ''["SourceCodePro" "Overpass" "FiraCode"]''; default = [ "SourceCodePro" @@ -19,7 +19,7 @@ in { description = "The nerd-fonts to install"; }; - enableEmoji = lib.mkEnableOpiton "emoji font support"; + enableEmoji = lib.mkEnableOption "emoji font support"; }; config = lib.mkIf cfg.enable { @@ -42,9 +42,9 @@ in { localConf = lib.mkIf cfg.enableEmoji (builtins.readFile ./emoji_font.xml); defaultFonts = { - serif = lib.mkForce ["Liberation Serif"] ++ lib.optional cfg.enableEmoji "Noto Color Emoji"; - sansSerif = lib.mkForce ["Overpass Nerd Font Propo"] ++ lib.optional cfg.enableEmoji "Noto Color Emoji"; - monospace = lib.mkForce ["SauceCodePro Nerd Font Mono"] ++ lib.optional cfg.enableEmoji "Noto Color Emoji"; + serif = lib.mkForce (["Liberation Serif"] ++ lib.optional cfg.enableEmoji "Noto Color Emoji"); + sansSerif = lib.mkForce (["Overpass Nerd Font Propo"] ++ lib.optional cfg.enableEmoji "Noto Color Emoji"); + monospace = lib.mkForce (["SauceCodePro Nerd Font Mono"] ++ lib.optional cfg.enableEmoji "Noto Color Emoji"); emoji = lib.mkIf cfg.enableEmoji (lib.mkForce ["Noto Color Emoji"]); }; allowType1 = false; diff --git a/modules/system/hardware/default.nix b/modules/system/hardware/default.nix index acf9fb2e..af20ddcd 100644 --- a/modules/system/hardware/default.nix +++ b/modules/system/hardware/default.nix @@ -36,7 +36,7 @@ in { # TODO: Remove the support for the old keyboards <2024-05-16> services.udev.extraRules = - lib.mkIf cfg.moonlander.enableLiveTraining '' + lib.strings.optionalString cfg.moonlander.enableLiveTraining '' # Rules for Oryx web flashing and live training KERNEL=="hidraw*", ATTRS{idVendor}=="16c0", MODE="0664", GROUP="plugdev" KERNEL=="hidraw*", ATTRS{idVendor}=="3297", MODE="0664", GROUP="plugdev" @@ -51,7 +51,7 @@ in { # Rule for the Planck EZ SUBSYSTEM=="usb", ATTR{idVendor}=="feed", ATTR{idProduct}=="6060", GROUP="plugdev" '' - + lib.mkIf cfg.moonlander.enableFlashing + + lib.strings.optionalString cfg.moonlander.enableFlashing '' # Wally Flashing rules for the Ergodox EZ ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1" |