flake.nix

@@ -38,6 +38,7 @@
       inherit flakes;
 
       system = "x86_64-linux";
+      doctrinePrefix = "local";
 
       paths = {
         localOverlay = "pkgs";

sys/modules/defaultDesktopPack.nix

@@ -27,14 +27,19 @@ in {
       };
     };
 
-    trivium = {
+    # trivionomicon
+    local = {
       sway.enable = true;
       trivionomiconMotd.enable = true;
     };
 
     networking = {
       networkmanager.enable = true;
+
+      #TODO
       useDHCP = false; # The global useDHCP flag is deprecated, therefore explicitly set to false here.
+      interfaces.enp7s0.useDHCP = true; # Per-interface useDHCP will be mandatory in the future, so this generated config
+      interfaces.wlp6s0.useDHCP = true; # replicates the default behaviour.
     };
   };
 }

sys/platforms/t14/default.nix

@@ -18,7 +18,8 @@
     bluetooth.enable = true;
   };
 
-  trivium = {
+  # trivionomicon
+  local = {
     laptop.enable = true;
     thinkpad.enable = true;
   };

sys/platforms/vps/default.nix

@@ -37,7 +37,8 @@ with lib; {
     };
   };
 
-  trivium.soju = {
+  # trivionomicon
+  local.soju = {
     enable = true;
     fullyQualifiedDomain = "soju.posixlycorrect.com";
   };

trivionomicon/modules/laptop/default.nix

@@ -7,5 +7,4 @@ doctrine.lib.mkModule {
   inherit config;
   name = "laptop";
   sys = ./sys.nix;
-  options = ./options.nix;
 }

trivionomicon/modules/laptop/options.nix

@@ -1,10 +0,0 @@
-{lib, ...}:
-with lib.types; {
-  sys = {
-    thinkpad = lib.mkOption {
-      type = boolean;
-      default = false;
-      description = "set to true if your laptop is a thinkpad";
-    };
-  };
-}

trivionomicon/modules/laptop/sys.nix

@@ -2,15 +2,10 @@
   config,
   lib,
   pkgs,
-  cfg,
   ...
 }: {
   services = {
     tlp.enable = lib.mkDefault true;
     upower.enable = lib.mkDefault true;
   };
-
-  imports = [
-    ./thinkpad.nix
-  ];
 }

trivionomicon/modules/laptop/thinkpad.nix

@@ -1,33 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  cfg,
-  ...
-}: {
-  config = lib.mkIf cfg.thinkpad {
-    # For suspending to RAM to work, set Config -> Power -> Sleep State to "Linux" in EFI.
-    # See https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Suspend_issues
-    # Fingerprint sensor requires a firmware-update to work.
-
-    boot = {
-      extraModulePackages = with config.boot.kernelPackages; [acpi_call];
-      extraModprobeConfig = "options iwlwifi 11n_disable=1 wd_disable=1";
-
-      # acpi_call makes tlp work for newer thinkpads
-      kernelModules = ["acpi_call"];
-
-      # Force use of the thinkpad_acpi driver for backlight control.
-      # This allows the backlight save/load systemd service to work.
-      kernelParams = ["acpi_backlight=native"];
-    };
-
-    hardware.firmware = [pkgs.sof-firmware];
-
-    services = {
-      fprintd.enable = lib.mkDefault true;
-      thinkfan.enable = lib.mkDefault true;
-      tp-auto-kbbl.enable = lib.mkDefault true;
-    };
-  };
-}

trivionomicon/modules/thinkpad/default.nix

@@ -0,0 +1,11 @@
+{
+  config,
+  doctrine,
+  ...
+}:
+doctrine.lib.mkModule {
+  inherit config;
+  name = "thinkpad";
+  sys = ./sys.nix;
+  requires = ["laptop"];
+}

trivionomicon/modules/thinkpad/sys.nix

@@ -0,0 +1,30 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  # For suspending to RAM to work, set Config -> Power -> Sleep State to "Linux" in EFI.
+  # See https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Suspend_issues
+  # Fingerprint sensor requires a firmware-update to work.
+
+  boot = {
+    extraModulePackages = with config.boot.kernelPackages; [acpi_call];
+    extraModprobeConfig = "options iwlwifi 11n_disable=1 wd_disable=1";
+
+    # acpi_call makes tlp work for newer thinkpads
+    kernelModules = ["acpi_call"];
+
+    # Force use of the thinkpad_acpi driver for backlight control.
+    # This allows the backlight save/load systemd service to work.
+    kernelParams = ["acpi_backlight=native"];
+  };
+
+  hardware.firmware = [pkgs.sof-firmware];
+
+  services = {
+    fprintd.enable = lib.mkDefault true;
+    thinkfan.enable = lib.mkDefault true;
+    tp-auto-kbbl.enable = lib.mkDefault true;
+  };
+}