Fix susano-minimal build, switch to unstable nixpkgs

flake.nix

@@ -119,11 +119,11 @@
       ###
       # Proxmox Homelab Machine
       ###
-      susano-minimal = mkComputer
+      susano-minimal = mkUnstableComputer
         ./machines/susano/minimal
         []
         "susano";
-      susano = mkComputer
+      susano = mkUnstableComputer
         ./machines/susano/main
         [
           sops-nix.nixosModules.sops
@@ -250,6 +250,7 @@
       "x86_64-linux" = {
         default = upkgs.mkShell {
           buildInputs = with upkgs; [
+            opencode
           ];
 
           shellHook = ''

machines/amaterasu/minimal/default.nix

@@ -1,11 +1,18 @@
-
+{
-{ config, pkgs, extraHomeModules, inputs, lib, username, ... }:
+  config,
+  pkgs,
+  extraHomeModules,
+  inputs,
+  lib,
+  username,
+  ...
+}:
 
 let
   flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
-in {
+in
-  imports =
+{
-    [
+  imports = [
     ../../minimal.nix
 
     ../hardware-configuration.nix
@@ -33,13 +40,16 @@ in {
       nix-path = config.nix.nixPath;
 
       # Allow user to reubild nixos without sudo
-      trusted-users = [ "root" username ];
+      trusted-users = [
+        "root"
+        username
+      ];
     };
     # Opinionated: disable channels
     channel.enable = false;
 
     # Opinionated: make flake registry and nix path match flake inputs
-    registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs;
+    registry = lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs;
     nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
   };
 
@@ -74,7 +84,10 @@ in {
     isNormalUser = true;
     description = "NixOS Proxmox Builder";
     hashedPassword = "$6$00vM.zXgahhw6KQO$BpCilKSdUNDlIaOlGrWJAdzh7KCIYoW3uoC1VV9I0eaJyui7J0Yv6BCajGwrn0JwrgWmvOfEMPeyGs4/wWD9q.";
-    extraGroups = [ "networkmanager" "wheel" ];
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+    ];
     packages = with pkgs; [
     ];
     openssh.authorizedKeys.keys = [
@@ -112,12 +125,13 @@ in {
     useGlobalPkgs = true;
     useUserPackages = true;
     backupFileExtension = "backup";
-    extraSpecialArgs = { inherit inputs; };
+    extraSpecialArgs = { inherit inputs username; };
 
     users."${username}" = {
       imports = [
         ./home.nix
-      ] ++ extraHomeModules;
+      ]
+      ++ extraHomeModules;
     };
   };
 

machines/susano/main/default.nix

@@ -1,10 +1,18 @@
-{ config, pkgs, extraHomeModules, inputs, lib, username, ... }:
+{
+  config,
+  pkgs,
+  extraHomeModules,
+  inputs,
+  lib,
+  username,
+  ...
+}:
 
 let
   flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
-in {
+in
-  imports =
+{
-    [
+  imports = [
     ../../minimal.nix
 
     ../hardware-configuration.nix
@@ -42,13 +50,16 @@ in {
       nix-path = config.nix.nixPath;
 
       # Allow user to reubild nixos without sudo
-      trusted-users = [ "root" username ];
+      trusted-users = [
+        "root"
+        username
+      ];
     };
     # Opinionated: disable channels
     channel.enable = false;
 
     # Opinionated: make flake registry and nix path match flake inputs
-    registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs;
+    registry = lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs;
     nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
   };
 
@@ -83,7 +94,10 @@ in {
     isNormalUser = true;
     description = "NixOS Proxmox Homelab";
     hashedPassword = "$6$7LSgOtcEozV0gkN9$pCltKL683UqJ3M7C4ZIgZsytAGtQS375g64ckuJQPFtUjxiGCxehJtkP91Pba.rIZNe3eZqnJfIQNwnJWmyVJ0";
-    extraGroups = [ "networkmanager" "wheel" ];
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+    ];
     packages = with pkgs; [
     ];
     openssh.authorizedKeys.keys = [
@@ -119,12 +133,13 @@ in {
     useGlobalPkgs = true;
     useUserPackages = true;
     backupFileExtension = "backup";
-    extraSpecialArgs = { inherit inputs; };
+    extraSpecialArgs = { inherit inputs username; };
 
     users."${username}" = {
       imports = [
         ./home.nix
-      ] ++ extraHomeModules;
+      ]
+      ++ extraHomeModules;
     };
   };
 

machines/susano/minimal/default.nix

@@ -1,10 +1,18 @@
-{ config, pkgs, extraHomeModules, inputs, lib, username, ... }:
+{
+  config,
+  pkgs,
+  extraHomeModules,
+  inputs,
+  lib,
+  username,
+  ...
+}:
 
 let
   flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
-in {
+in
-  imports =
+{
-    [
+  imports = [
     ../../minimal.nix
 
     ../hardware-configuration.nix
@@ -41,13 +49,16 @@ in {
       nix-path = config.nix.nixPath;
 
       # Allow user to reubild nixos without sudo
-      trusted-users = [ "root" username ];
+      trusted-users = [
+        "root"
+        username
+      ];
     };
     # Opinionated: disable channels
     channel.enable = false;
 
     # Opinionated: make flake registry and nix path match flake inputs
-    registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs;
+    registry = lib.mkForce (lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs);
     nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
   };
 
@@ -82,7 +93,10 @@ in {
     isNormalUser = true;
     description = "NixOS Proxmox Homelab";
     hashedPassword = "$6$7LSgOtcEozV0gkN9$pCltKL683UqJ3M7C4ZIgZsytAGtQS375g64ckuJQPFtUjxiGCxehJtkP91Pba.rIZNe3eZqnJfIQNwnJWmyVJ0";
-    extraGroups = [ "networkmanager" "wheel" ];
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+    ];
     packages = with pkgs; [
     ];
     openssh.authorizedKeys.keys = [
@@ -118,12 +132,13 @@ in {
     useGlobalPkgs = true;
     useUserPackages = true;
     backupFileExtension = "backup";
-    extraSpecialArgs = { inherit inputs; };
+    extraSpecialArgs = { inherit inputs username; };
 
     users."${username}" = {
       imports = [
         ./home.nix
-      ] ++ extraHomeModules;
+      ]
+      ++ extraHomeModules;
     };
   };