refactor(treewide): enable modules based on host.type

system/modules/bootloader/systemd/default.nix

@@ -1,11 +1,12 @@
 { lib, config, ... }:
 
 let
-  cfg = config.systemModules.bootloader.systemd;
+  inherit (lib) mkIf;
+  host = config.systemModules.host;
 in
 
 {
-  config = lib.mkIf cfg.enable {
+  config = mkIf (host.type != "phone") {
     boot.loader = {
       systemd-boot = {
         enable = true;

system/modules/displayManager/default.nix

@@ -1,13 +1,5 @@
-{ lib, ... }:
-
 {
   imports = [
     ./tuigreet
   ];
-
-  options.systemModules.displayManager = {
-    tuigreet = {
-      enable = lib.mkEnableOption "Enable tuigreet display manager module";
-    };
-  };
 }

system/modules/displayManager/tuigreet/default.nix

@@ -1,15 +1,16 @@
 { pkgs, lib, config, ... }:
 let
+  inherit (lib) mkIf;
   tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet";
-  cfg = config.systemModules.displayManager.tuigreet;
+  host = config.systemModules.host;
 in
 {
-  config = lib.mkIf cfg.enable {
+  config = mkIf (host.type != "phone") {
     services.greetd = {
       enable = true;
       settings = {
         default_session = {
-          command = "${tuigreet} --time --remember --cmd Hyprland";
+          command = "${tuigreet} --time --remember --cmd Hyprland"; # TODO: dont hardcode this
           user = "greeter";
         };
       };

system/modules/locale/default.nix

@@ -1,20 +1,17 @@
-{ lib, config, ... }: 
+{ lib, ... }: 
 
 let
-  cfg = config.systemModules.locale;
+  inherit (lib) mkDefault;
-  inherit (lib) mkIf mkDefault;
 in
 
 {
-  config = mkIf cfg.enable {
+  i18n = {
-    i18n = {
+    defaultLocale = mkDefault "en_US.UTF-8";
-      defaultLocale = mkDefault "en_US.UTF-8";
+    supportedLocales = mkDefault [
-      supportedLocales = mkDefault [
+      "en_US.UTF-8/UTF-8"
-        "en_US.UTF-8/UTF-8"
+    ];
-      ];
-    };
-    time.timeZone = mkDefault "Pacific/Auckland";
-    location.provider = "geoclue2";
-    services.geoclue2.enable = true;
   };
+  time.timeZone = mkDefault "Pacific/Auckland";
+  location.provider = "geoclue2";
+  services.geoclue2.enable = true;
 }

system/modules/networking/default.nix

@@ -1,8 +1,8 @@
 { lib, config, ... }:
 
 let
-  cfg = config.systemModules.networking;
+  inherit (lib) mkIf;
-  inherit (lib) mkIf mkEnableOption;
+  host = config.systemModules.host;
 in
 
 {
@@ -15,9 +15,7 @@ in
     ./tailscale
   ];
 
-  options.systemModule.networking.enable = mkEnableOption "Enable networking system module";
+  config = mkIf (host.type != "phone") {
-
-  config = mkIf cfg.enable {
     networking.networkmanager = {
       enable = true;
       dns = "systemd-resolved";

system/modules/networking/firewall/default.nix

@@ -1,13 +1,12 @@
 { lib, config, ... }:
 
 let
-  cfg = config.systemModules.networking;
+  inherit (lib) mkIf;
-  inherit (lib) mkIf mkEnableOption;
+  host = config.systemModules.host;
 in
 
 {
-  options.systemModules.networking.firewall = mkEnableOption "Enable networking firewall system modules";
+  config = mkIf (host.type != "phone") {
-  config = mkIf cfg.firewall {
     networking.firewall = {
       enable = true;
       allowedTCPPorts = [

system/modules/networking/resolved/default.nix

@@ -1,14 +1,12 @@
 { lib, config, ... }:
 
 let
-  cfg = config.systemModules.networking;
+  inherit (lib) mkIf;
-  inherit (lib) mkIf mkEnableOption;
+  host = config.systemModules.host;
 in
 
 {
-  options.systemModules.networking.resolved = mkEnableOption "Enable systemd resolved daemon";
+  config = mkIf (host.type != "phone") {
-
-  config = mkIf cfg.resolved {
     services.resolved = {
       enable = true;
       fallbackDns = ["9.9.9.9"];

system/modules/networking/ssh/default.nix

@@ -1,20 +1,16 @@
 { lib, config, ... }:
 
 let
-  cfg = config.systemModules.networking;
+  inherit (lib) mkIf mkDefault;
   key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBn3ff3HaZHIyH4K13k8Mwqu/o7jIABJ8rANK+r2PfJk";
   phoneKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINredx07UAk2l1wUPujYnmJci1+XEmcUuSX0DIYg6Vzz";
-  inherit (lib) mkIf mkDefault mkEnableOption;
+  host = config.systemModules.host;
 in
 
 {
-  options.systemModules.networking.ssh = mkEnableOption "Enable ssh networking module";
+  config = mkIf (host.type != "phone") {
-
-  config = mkIf cfg.ssh {
     environment.sessionVariables.SSH_AUTH_SOCK = "~/.1password/agent.sock";
 
-    users.users.ooks.openssh.authorizedKeys.keys = [ key ];
-
     services.openssh = {
       enable = true;
       settings = {

system/modules/networking/tcp/default.nix

@@ -1,14 +1,13 @@
 { lib, config, ... }:
 
 let
-  cfg = config.systemModules.networking;
+  inherit (lib) mkIf;
-  inherit (lib) mkIf mkEnableOption;
+  host = config.systemModules.type;
 in
 
 {
-  options.systemModules.networking.hardenTcp = mkEnableOption "Harden TCP";
+  # nyx module
-
+  config = mkIf (host.type != "phone") {
-  config = mkIf cfg.hardenTcp {
     boot = {
       kernelModules = ["tls" "tcp_bbr"];
       kernel.sysctl = {

system/modules/networking/tools/default.nix

@@ -1,18 +1,9 @@
-{ lib, config, pkgs, ... }:
+{ pkgs, ... }:
-
-let
-  cfg = config.systemModules.networking;
-  inherit (lib) mkIf mkEnableOption;
-in
 
 {
-  options.systemModules.networking.tools = mkEnableOption "Enable networking tools";
+  environment.systemPackages = with pkgs; [
-
+    traceroute
-  config = mkIf cfg.tools {
+    mtr
-    environment.systemPackages = with pkgs; [
+    tcpdump
-      traceroute
+  ];
-      mtr
-      tcpdump
-    ];
-  };
 }