Infinidoge/universe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(modules): fix various issues

Browse source
This commit is contained in:
Infinidoge 2021-12-03 23:14:35 -05:00
parent f02c9f0e1b
commit 7f22410427
5 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/devos/nix.nix
View file

@ -1,4 +1,4 @@
{ channel, inputs, pkgs, lib, ... }: { config, channel, inputs, pkgs, lib, self, ... }:
with lib; with lib;
{ {
nix = { nix = {

2
modules/modules/filesystems.nix
View file

@ -29,7 +29,7 @@ in
(mkIf cfg.btrfs.enable { (mkIf cfg.btrfs.enable {
environment.systemPackages = with pkgs; [ btrfs-progs ]; environment.systemPackages = with pkgs; [ btrfs-progs ];
services.btrfs.autoScrub = mkAliasDefinitions opt.scrub; services.btrfs.autoScrub = mkAliasDefinitions opt.btrfs.scrub;
}) })
]; ];
} }

11
modules/modules/locale.nix
View file

@ -3,6 +3,7 @@ with lib;
with lib.hlissner; with lib.hlissner;
let let
cfg = config.modules.locale; cfg = config.modules.locale;
opt = options.modules.locale;
in in
{ {
options.modules.locale = with types; { options.modules.locale = with types; {
@ -13,10 +14,10 @@ in
fonts = { fonts = {
fonts = mkOpt (listOf package) [ ]; fonts = mkOpt (listOf package) [ ];
defaults = { defaults = {
serif = mkOpt (listOf str) "DejaVu Serif"; serif = mkOpt (listOf str) [ "DejaVu Serif" ];
emoji = mkOpt (listOf str) "Noto Color Emoji"; emoji = mkOpt (listOf str) [ "Noto Color Emoji" ];
monospace = mkOpt (listOf str) "DejaVu Sans Mono"; monospace = mkOpt (listOf str) [ "DejaVu Sans Mono" ];
sansSerif = mkOpt (listOf str) "DejaVu Sans"; sansSerif = mkOpt (listOf str) [ "DejaVu Sans" ];
}; };
}; };
}; };
@ -29,7 +30,7 @@ in
time.timeZone = cfg.timezone; time.timeZone = cfg.timezone;
fonts.fontconfig.defaultFonts = mkAliasDefinitions options.defaults; fonts.fontconfig.defaultFonts = cfg.fonts.defaults;
console.packages = cfg.fonts.fonts; console.packages = cfg.fonts.fonts;
}; };

6
modules/modules/software/console.nix
View file

@ -1,4 +1,4 @@
{ config, lib, ... }: { config, options, lib, ... }:
with lib; with lib;
with lib.hlissner; with lib.hlissner;
let let
@ -28,9 +28,9 @@ in
enable = true; enable = true;
hwRender = true; hwRender = true;
extraConfig = '' extraConfig = ''
font-size=${cfg.kmscon.font.size} font-size=${toString cfg.kmscon.font.size}
font-name=${cfg.kmscon.font.font} font-name=${cfg.kmscon.font.font}
${opt.kmscon.extraConfig} ${cfg.kmscon.extraConfig}
''; '';
extraOptions = mkAliasDefinitions opt.kmscon.extraOptions; extraOptions = mkAliasDefinitions opt.kmscon.extraOptions;
}; };

2
users/infinidoge/default.nix
View file

@ -90,7 +90,7 @@ in
modules = { modules = {
locale.fonts = { locale.fonts = {
fonts = with pkgs; [ fonts = with pkgs; [
(nerdfonts.override { fonts = modules.locale.fonts.defaults.monospace; }) (nerdfonts.override { fonts = config.modules.locale.fonts.defaults.monospace; })
dejavu_fonts dejavu_fonts
]; ];