diff --git a/flake.lock b/flake.lock index 4dee719..34faab0 100644 --- a/flake.lock +++ b/flake.lock @@ -417,6 +417,22 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1754243818, + "narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c460617dfb709a67d18bb31e15e455390ee4ee1c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1739214665, "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", @@ -505,6 +521,7 @@ "nixpkgs-unstable": "nixpkgs-unstable", "nvix": "nvix", "sops-nix": "sops-nix", + "srvos": "srvos", "the-nest": "the-nest" } }, @@ -551,6 +568,24 @@ "type": "github" } }, + "srvos": { + "inputs": { + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1754273897, + "narHash": "sha256-l7epHqAcg8Qktu8vO2ZfjSH1wcai01XQOKQA9ADHIk4=", + "owner": "nix-community", + "repo": "srvos", + "rev": "8e7d3c690975ee6790926bdfd1258016c967d163", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "srvos", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -584,7 +619,7 @@ "the-nest": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1745340936, diff --git a/flake.nix b/flake.nix index 9b83d18..eacfccd 100644 --- a/flake.nix +++ b/flake.nix @@ -97,6 +97,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + srvos.url = "github:nix-community/srvos"; + # 3rd party inputs disko = { # Declarative partitioning diff --git a/hosts/nixos/Michishirube/default.nix b/hosts/nixos/Michishirube/default.nix index 78554a5..6f07144 100644 --- a/hosts/nixos/Michishirube/default.nix +++ b/hosts/nixos/Michishirube/default.nix @@ -8,7 +8,9 @@ lib, pkgs, ... -}: { +}: let + srvos = inputs.srvos.nixosModules; +in { imports = lib.flatten [ # Disks inputs.disko.nixosModules.disko @@ -21,10 +23,12 @@ } # Misc + srvos.server + srvos.hardware-hetzner-cloud + (map lib.custom.relativeToRoot [ # Required configs "hosts/common/core" - # Optional configs ]) ];