Passing checks

modules/nixos/common.nix

@@ -14,7 +14,7 @@
   imports =
     [
       (modulesPath + "/installer/scan/not-detected.nix")
-      # inputs.sops-nix.nixosModules.sops
+      inputs.sops-nix.nixosModules.sops
       inputs.disko.nixosModules.disko
       inputs.home-manager.nixosModules.home-manager
     ]

nixos/beefcake.nix

@@ -8,16 +8,16 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x01 0x00
 sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
 */
 {
-  # inputs,
+  inputs,
   outputs,
-  modulesPath,
   config,
   pkgs,
+  system,
   ...
 }: {
   imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
     outputs.nixosModules.intel
+    inputs.api-lyte-dev.nixosModules.${system}.api-lyte-dev
     # inputs.nix-minecraft.nixosModules.minecraft-servers
   ];
 
@@ -67,7 +67,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
   systemd.services.api-lyte-dev.environment.LOG_LEVEL = "debug";
 
   sops = {
-    defaultSopsFile = ../../secrets/beefcake/secrets.yml;
+    defaultSopsFile = ../secrets/beefcake/secrets.yml;
     age = {
       sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
       keyFile = "/var/lib/sops-nix/key.txt";

nixos/foxtrot.nix

@@ -11,8 +11,8 @@
 
   imports =
     [
-      inputs.disko.nixosModules.disko
       flake.diskoConfigurations.standard
+      inputs.hardware.nixosModules.framework-13-7040-amd
     ]
     ++ (with outputs.nixosModules; [
       desktop-usage
@@ -20,10 +20,7 @@
       postgres
       wifi
       # hyprland
-    ])
+    ]);
-    ++ [
-      inputs.hardware.nixosModules.framework-13-7040-amd
-    ];
 
   # use updated ppd for framework 13:
   # source: https://community.frame.work/t/tracking-ppd-v-tlp-for-amd-ryzen-7040/39423/137?u=lytedev

nixos/musicbox.nix

@@ -1,6 +1,5 @@
 {
   flake,
-  inputs,
   outputs,
   # lib,
   # config,
@@ -11,7 +10,6 @@
 
   imports =
     [
-      inputs.disko.nixosModules.disko
       flake.diskoConfigurations.unencrypted
     ]
     ++ (with outputs.nixosModules; [

nixos/router.nix

@@ -36,7 +36,6 @@ in {
   networking.useDHCP = false;
 
   imports = [
-    inputs.disko.nixosModules.disko
     flake.diskoConfigurations.unencrypted
   ];
 

nixos/thinker.nix

@@ -32,20 +32,16 @@
 
   imports =
     [
-      inputs.disko.nixosModules.disko
       flake.diskoConfigurations.thinker
+      inputs.hardware.nixosModules.lenovo-thinkpad-t480
+      inputs.hardware.nixosModules.common-pc-laptop-ssd
     ]
     ++ (with outputs.nixosModules; [
       desktop-usage
       podman
       postgres
       wifi
-    ])
+    ]);
-    ++ [
-      inputs.hardware.nixosModules.lenovo-thinkpad-t480
-      inputs.hardware.nixosModules.common-pc-laptop-ssd
-      # ./relative-module.nix
-    ];
 
   boot = {
     loader = {