diff --git a/flake.lock b/flake.lock index 0a2d5d8..cf7eef4 100644 --- a/flake.lock +++ b/flake.lock @@ -42,6 +42,26 @@ "type": "github" } }, + "deploy-rs": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs_2", + "utils": "utils" + }, + "locked": { + "lastModified": 1702460489, + "narHash": "sha256-H6s6oVLvx7PCjUcvfkB89Bb+kbaiJxTAgWfMjiQTjA0=", + "owner": "serokell", + "repo": "deploy-rs", + "rev": "915327515f5fd1b7719c06e2f1eb304ee0bdd803", + "type": "github" + }, + "original": { + "owner": "serokell", + "repo": "deploy-rs", + "type": "github" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -58,6 +78,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -132,6 +168,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1702272962, + "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1702645756, "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", @@ -149,10 +201,11 @@ "root": { "inputs": { "agenix": "agenix", + "deploy-rs": "deploy-rs", "firefox-gnome-theme": "firefox-gnome-theme", "home-manager": "home-manager_2", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "secrets": "secrets", "thunderbird-gnome-theme": "thunderbird-gnome-theme" } @@ -173,6 +226,21 @@ "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "thunderbird-gnome-theme": { "flake": false, "locked": { @@ -188,6 +256,24 @@ "repo": "thunderbird-gnome-theme", "type": "github" } + }, + "utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 35baae4..4ede44b 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-23.11"; agenix.url = "github:ryantm/agenix"; + deploy-rs.url = "github:serokell/deploy-rs"; home-manager = { url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; @@ -23,7 +24,7 @@ }; }; - outputs = inputs @ { self, nixpkgs, agenix, home-manager, nixos-hardware, secrets, ... }: + outputs = inputs @ { self, nixpkgs, agenix, deploy-rs, home-manager, nixos-hardware, secrets, ... }: let nixpkgsForSystem = system: inputs.nixpkgs; overlays = [ @@ -68,6 +69,18 @@ odyssey = nixosSystem { system = "x86_64-linux"; name = "odyssey"; }; pi = nixosSystem { system = "aarch64-linux"; name = "pi"; extraModules = [ nixos-hardware.nixosModules.raspberry-pi-4 ]; }; }; + + deploy.nodes.pi = { + hostname = "10.0.1.191"; + sshUser = "root"; + + profiles.system = { + user = "root"; + path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.pi; + }; + }; + + # checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; }; } diff --git a/hosts/pi/default.nix b/hosts/pi/default.nix index afc9a59..fe410e3 100644 --- a/hosts/pi/default.nix +++ b/hosts/pi/default.nix @@ -12,8 +12,8 @@ raspberry-pi."4" = { apply-overlays-dtmerge.enable = true; audio.enable = false; - fkms-3d.enable = true; - xhci.enable = true; + fkms-3d.enable = false; + xhci.enable = false; }; deviceTree = { enable = true; @@ -28,7 +28,6 @@ }; sound.enable = true; - console.enable = false; age.secrets."passwords/networks.age" = { file = "${inputs.secrets}/passwords/networks.age"; @@ -54,12 +53,6 @@ systemWide = true; }; - services.shairport-sync = { - enable = true; - group = "pipewire"; - openFirewall = true; - }; - services.zigbee2mqtt = { enable = true; settings = {