From 7f2241042722e00bc1d805b05116683d88668279 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Fri, 3 Dec 2021 23:14:35 -0500
Subject: [PATCH] fix(modules): fix various issues

---
 modules/devos/nix.nix                |  2 +-
 modules/modules/filesystems.nix      |  2 +-
 modules/modules/locale.nix           | 11 ++++++-----
 modules/modules/software/console.nix |  6 +++---
 users/infinidoge/default.nix         |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/modules/devos/nix.nix b/modules/devos/nix.nix
index 9822685..34544ff 100644
--- a/modules/devos/nix.nix
+++ b/modules/devos/nix.nix
@@ -1,4 +1,4 @@
-{ channel, inputs, pkgs, lib, ... }:
+{ config, channel, inputs, pkgs, lib, self, ... }:
 with lib;
 {
   nix = {
diff --git a/modules/modules/filesystems.nix b/modules/modules/filesystems.nix
index 836a150..60f7c37 100644
--- a/modules/modules/filesystems.nix
+++ b/modules/modules/filesystems.nix
@@ -29,7 +29,7 @@ in
     (mkIf cfg.btrfs.enable {
       environment.systemPackages = with pkgs; [ btrfs-progs ];
 
-      services.btrfs.autoScrub = mkAliasDefinitions opt.scrub;
+      services.btrfs.autoScrub = mkAliasDefinitions opt.btrfs.scrub;
     })
   ];
 }
diff --git a/modules/modules/locale.nix b/modules/modules/locale.nix
index e0d3cf4..852050d 100644
--- a/modules/modules/locale.nix
+++ b/modules/modules/locale.nix
@@ -3,6 +3,7 @@ with lib;
 with lib.hlissner;
 let
   cfg = config.modules.locale;
+  opt = options.modules.locale;
 in
 {
   options.modules.locale = with types; {
@@ -13,10 +14,10 @@ in
     fonts = {
       fonts = mkOpt (listOf package) [ ];
       defaults = {
-        serif = mkOpt (listOf str) "DejaVu Serif";
-        emoji = mkOpt (listOf str) "Noto Color Emoji";
-        monospace = mkOpt (listOf str) "DejaVu Sans Mono";
-        sansSerif = mkOpt (listOf str) "DejaVu Sans";
+        serif = mkOpt (listOf str) [ "DejaVu Serif" ];
+        emoji = mkOpt (listOf str) [ "Noto Color Emoji" ];
+        monospace = mkOpt (listOf str) [ "DejaVu Sans Mono" ];
+        sansSerif = mkOpt (listOf str) [ "DejaVu Sans" ];
       };
     };
   };
@@ -29,7 +30,7 @@ in
 
     time.timeZone = cfg.timezone;
 
-    fonts.fontconfig.defaultFonts = mkAliasDefinitions options.defaults;
+    fonts.fontconfig.defaultFonts = cfg.fonts.defaults;
 
     console.packages = cfg.fonts.fonts;
   };
diff --git a/modules/modules/software/console.nix b/modules/modules/software/console.nix
index cd1060b..3dce6e8 100644
--- a/modules/modules/software/console.nix
+++ b/modules/modules/software/console.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, options, lib, ... }:
 with lib;
 with lib.hlissner;
 let
@@ -28,9 +28,9 @@ in
       enable = true;
       hwRender = true;
       extraConfig = ''
-        font-size=${cfg.kmscon.font.size}
+        font-size=${toString cfg.kmscon.font.size}
         font-name=${cfg.kmscon.font.font}
-        ${opt.kmscon.extraConfig}
+        ${cfg.kmscon.extraConfig}
       '';
       extraOptions = mkAliasDefinitions opt.kmscon.extraOptions;
     };
diff --git a/users/infinidoge/default.nix b/users/infinidoge/default.nix
index 511c5cb..b9ded53 100644
--- a/users/infinidoge/default.nix
+++ b/users/infinidoge/default.nix
@@ -90,7 +90,7 @@ in
   modules = {
     locale.fonts = {
       fonts = with pkgs; [
-        (nerdfonts.override { fonts = modules.locale.fonts.defaults.monospace; })
+        (nerdfonts.override { fonts = config.modules.locale.fonts.defaults.monospace; })
         dejavu_fonts
       ];