diff --git a/flake.lock b/flake.lock index 6bddb39..2905055 100644 --- a/flake.lock +++ b/flake.lock @@ -491,6 +491,21 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1729742320, + "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1728888510, @@ -619,6 +634,7 @@ "impermanence": "impermanence", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nur": "nur", "rose-pine-hyprcursor": "rose-pine-hyprcursor", diff --git a/flake.nix b/flake.nix index 77bd0fa..540babc 100644 --- a/flake.nix +++ b/flake.nix @@ -74,6 +74,8 @@ # url = "github:nix-community/raspberry-pi-nix"; # inputs.nixpkgs.follows = "nixpkgs"; # }; + + nixos-hardware.url = "github:NixOS/nixos-hardware"; }; outputs = { self, ... }@inputs: { @@ -118,6 +120,7 @@ system = "aarch64-linux"; modules = [ ./machines/nixypi + inputs.nixos-hardware.nixosModules.raspberry-pi-4 ]; specialArgs = { inherit inputs; }; }; @@ -125,10 +128,11 @@ nixosConfigurations.stashy = inputs.nixpkgs.lib.nixosSystem rec { system = "aarch64-linux"; modules = [ - # Use this flake input, for some reason haves the kernel compile from source + # Using this flake input, for some reason haves the kernel compile from source # which takes a loong time and isn't practical. # inputs.raspberry-pi-nix.nixosModules.raspberry-pi { raspberry-pi-nix.board = "bcm2711"; } ./machines/stashy + inputs.nixos-hardware.nixosModules.raspberry-pi-4 ]; specialArgs = { inherit inputs; }; }; @@ -143,11 +147,11 @@ sshUser = "root"; }; - deploy.nodes.nixypi = { - hostname = "nixypi.lion-zebra.ts.net"; + deploy.nodes.stashy = { + hostname = "stashy.lion-zebra.ts.net"; profiles.system = { user = "root"; - path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.nixypi; + path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.stashy; }; sshUser = "root"; }; @@ -206,7 +210,7 @@ nixypi-sd-installer = inputs.nixos-generators.nixosGenerate { system = "aarch64-linux"; - modules = [ ./machines/nixypi ]; + modules = [ ./machines/nixypi inputs.nixos-hardware.nixosModules.raspberry-pi-4 ]; specialArgs = { inherit inputs; }; format = "sd-aarch64-installer"; }; @@ -220,7 +224,7 @@ stashy-sd-installer = inputs.nixos-generators.nixosGenerate { system = "aarch64-linux"; - modules = [ ./machines/stashy ]; + modules = [ ./machines/stashy inputs.nixos-hardware.nixosModules.raspberry-pi-4 ]; specialArgs = { inherit inputs; }; format = "sd-aarch64-installer"; };