refactor(modules): make sure nothing is added without setting enable

modules/base/locale/default.nix

@@ -7,8 +7,8 @@
   inherit (lib) mkIf;
 
   cfg = config.roles.base;
-in
-  mkIf cfg.enable {
+in {
+  config = mkIf cfg.enable {
     fonts = {
       fontconfig = {
         enable = true;
@@ -45,4 +45,8 @@ in
     # Select internationalisation properties.
     i18n.defaultLocale = "en_CA.UTF-8";
     console.useXkbConfig = true;
-  }
+  };
+
+  # For accurate stack trace
+  _file = ./default.nix;
+}

modules/base/locate/default.nix

@@ -23,8 +23,8 @@
     ${updatedb} -o ${database} --prunefs "${pruneFS}" \
       --prunepaths "${prunePaths}" --prunenames "${pruneNames}"
   '';
-in
-  mkIf (baseCfg.enable) {
+in {
+  config = mkIf baseCfg.enable {
     users.users.${baseCfg.user}.extraGroups = [
       locateGroup
     ];
@@ -79,4 +79,8 @@ in
         ".svn"
       ];
     };
-  }
+  };
+
+  # For accurate stack trace
+  _file = ./default.nix;
+}

modules/base/packages/default.nix

@@ -8,7 +8,7 @@ self: {
 
   cfg = config.roles.base;
 in {
-  config = mkIf (cfg.enable) {
+  config = mkIf cfg.enable {
     nixpkgs.overlays =
       (map (i: self.inputs.${i}.overlays.default) [
         "discord-overlay"

modules/base/substituters/default.nix

@@ -14,8 +14,8 @@
       then unique (a ++ b)
       else b)) {}
     list;
-in
-  mkIf cfg.enable {
+in {
+  config = mkIf cfg.enable {
     environment.systemPackages = [
       (pkgs.writeShellApplication {
         name = "rebuild-no-cache";
@@ -50,4 +50,8 @@ in
             (mkSubstituterConf 10 "https://cache-apt.nelim.org" "cache-apt.nelim.org:NLAsWxa2Qbm4b+hHimjCpZfm48a4oN4O/GPZY9qpjNw=")
           ]);
     };
-  }
+  };
+
+  # For accurate stack trace
+  _file = ./default.nix;
+}