From 49f82a343492cd5c47797f4f1b843bb5453a7c7b Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Thu, 18 Dec 2025 11:26:10 -0600 Subject: [PATCH] use --target-host for remote deploys --- flake.lock | 194 ++++--------- flake.nix | 55 +--- hosts/i001/flake.nix | 1 + hosts/linode/l001/flake.lock | 118 ++------ hosts/linode/l001/flake.nix | 1 + hosts/linode/l001/headscale.nix | 11 +- hosts/linode/l001/nginx.nix | 2 +- hosts/lio/web_access.nix | 4 + hosts/oracle/o001/flake.lock | 280 +++++++------------ hosts/oracle/o001/hardware-configuration.nix | 26 +- readme.md | 3 - utilities/nixos-installers/install_notes.md | 16 -- 12 files changed, 216 insertions(+), 495 deletions(-) create mode 100644 hosts/lio/web_access.nix diff --git a/flake.lock b/flake.lock index 054b4b13..04bc5862 100644 --- a/flake.lock +++ b/flake.lock @@ -10,7 +10,7 @@ "ragenix", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1736955230, @@ -173,45 +173,9 @@ "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" } }, - "deploy-rs": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", - "utils": "utils" - }, - "locked": { - "lastModified": 1762286984, - "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -252,7 +216,7 @@ }, "home-manager_2": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1765979862, @@ -271,7 +235,7 @@ }, "home-manager_3": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1764736872, @@ -290,7 +254,7 @@ }, "home-manager_4": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1764613336, @@ -337,7 +301,7 @@ "de_plasma": "de_plasma", "home-manager": "home-manager_2", "impermanence": "impermanence", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "ros_neovim": "ros_neovim" }, "locked": { @@ -369,7 +333,7 @@ "inputs": { "common": "common_2", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "path": "./hosts/linode/l001", @@ -383,37 +347,21 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743014863, - "narHash": "sha256-jAIUqsiN2r3hCuHji80U7NNEafpIMBXiwKlSrjWMlpg=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd3bac8bfb542dbde7ffffb6987a1a1f9d41699f", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_10": { - "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1764040936, "narHash": "sha256-d1NFBVGQZ/Xb0pMviuzenqrfXymJs0m/pKrEg1tDGsE=", @@ -428,7 +376,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -445,22 +393,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1765762245, "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", @@ -476,7 +408,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1765838191, "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", @@ -492,7 +424,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1764776358, "narHash": "sha256-MxXSCRiV7DI5U3Ra1UxVJTTUyKsONAE8+8QdSXsGIhA=", @@ -507,7 +439,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1764522689, "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", @@ -523,23 +455,23 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_7": { - "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1765779637, "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", @@ -555,7 +487,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1764406085, "narHash": "sha256-CYbMp8hwuOf4umokSNp+t1s4Hjd4vxXq4S5CD+xvgNs=", @@ -571,6 +503,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nvim_plugin-Almo7aya/openingh.nvim": { "flake": false, "locked": { @@ -2304,7 +2252,7 @@ "beszel": "beszel", "common": "common_3", "home-manager": "home-manager_4", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "ros_neovim": "ros_neovim_2", "secrets": "secrets" }, @@ -2321,7 +2269,7 @@ "plasma-manager": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1763909441, @@ -2342,7 +2290,7 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "rust-overlay": "rust-overlay_3" }, "locked": { @@ -2361,16 +2309,15 @@ }, "root": { "inputs": { - "deploy-rs": "deploy-rs", "i001": "i001", "l001": "l001", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "o001": "o001" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", @@ -2443,7 +2390,7 @@ }, "ros_neovim_2": { "inputs": { - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_10", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim_2", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim_2", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring_2", @@ -2630,39 +2577,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 20f0231e..e824caff 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,6 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - deploy-rs.url = "github:serokell/deploy-rs"; i001.url = "path:./hosts/i001"; l001.url = "path:./hosts/linode/l001"; @@ -10,7 +9,6 @@ outputs = { - deploy-rs, ... }@inputs: let @@ -30,52 +28,19 @@ { default = pkgs.mkShell { packages = [ - inputs.deploy-rs.packages.${system}.default + # Some aliases for building + deploying to some remote systems. + (pkgs.writeShellScriptBin "deploy_l001" '' + nixos-rebuild --flake $(git rev-parse --show-toplevel)'/hosts/linode/l001' --target-host l001 --use-substitutes --no-reexec switch + '') + (pkgs.writeShellScriptBin "deploy_o001" '' + nixos-rebuild --flake $(git rev-parse --show-toplevel)'/hosts/oracle/o001' --target-host o001 --use-substitutes --no-reexec switch + '') + (pkgs.writeShellScriptBin "deploy_i001" '' + NIX_SSHOPTS="-i /run/agenix/nix2nix" nixos-rebuild --flake $(git rev-parse --show-toplevel)'/hosts/i001' --target-host root@10.12.14.119 --use-substitutes --no-reexec switch + '') ]; }; } ); - - deploy = { - sshUser = "root"; - sshOpts = [ - "-i" - "/run/agenix/nix2nix" - ]; - - nodes = { - i001 = { - hostname = "10.12.14.119"; # NOTE not stable ip check... - profiles.system = { - user = "root"; - path = deploy-rs.lib.x86_64-linux.activate.nixos inputs.i001.nixosConfigurations.i001; - }; - }; - - l001 = { - sshOpts = [ - "-i" - "/run/agenix/nix2linode" - ]; - hostname = "172.236.111.33"; - profiles.system = { - user = "root"; - path = deploy-rs.lib.x86_64-linux.activate.nixos inputs.l001.nixosConfigurations.l001; - }; - }; - - o001 = { - sshOpts = [ - "-i" - "/run/agenix/nix2oracle" - ]; - hostname = "64.181.210.7"; - profiles.system = { - user = "root"; - path = deploy-rs.lib.aarch64-linux.activate.nixos inputs.o001.nixosConfigurations.o001; - }; - }; - }; - }; }; } diff --git a/hosts/i001/flake.nix b/hosts/i001/flake.nix index 71c08e65..5fe7533e 100644 --- a/hosts/i001/flake.nix +++ b/hosts/i001/flake.nix @@ -13,6 +13,7 @@ impermanence.url = "github:nix-community/impermanence"; }; + # NIX_SSHOPTS="-i /run/agenix/nix2nix" nixos-rebuild --flake ".#i001" --target-host luser@10.12.14.119 switch outputs = { ... diff --git a/hosts/linode/l001/flake.lock b/hosts/linode/l001/flake.lock index 270eacbc..1493a078 100644 --- a/hosts/linode/l001/flake.lock +++ b/hosts/linode/l001/flake.lock @@ -3,11 +3,11 @@ "common": { "locked": { "dir": "flakes/common", - "lastModified": 1764738806, - "narHash": "sha256-CRXCWZDrgy31TH+pnUZMIXS0wosRLI/wxaG0s3S01Ks=", + "lastModified": 1766036507, + "narHash": "sha256-ZFJjJVkWlefIhsJ2vHniBnqqnTCa9qGW3pQOXUU4X1I=", "ref": "refs/heads/master", - "rev": "0ba6c5ccecd24e04ff8f45c4ed144c4a8b6b4f7e", - "revCount": 836, + "rev": "fca1bd9d8f4d7e345b373f69c9d2b40d9fa33f59", + "revCount": 952, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -17,52 +17,16 @@ "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" } }, - "deploy-rs": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", - "utils": "utils" - }, - "locked": { - "lastModified": 1762286984, - "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764736872, - "narHash": "sha256-4mqLegNQeD54X7enm6EI9aNWl6CaIfyhl5PaYoGYwqk=", + "lastModified": 1765979862, + "narHash": "sha256-/r9/1KamvbHJx6I40H4HsSXnEcBAkj46ZwibhBx9kg0=", "owner": "rycee", "repo": "home-manager", - "rev": "3366918730bb6b699395a9d237397f1d710a94b3", + "rev": "d3135ab747fd9dac250ffb90b4a7e80634eacbe9", "type": "github" }, "original": { @@ -74,27 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743014863, - "narHash": "sha256-jAIUqsiN2r3hCuHji80U7NNEafpIMBXiwKlSrjWMlpg=", + "lastModified": 1765762245, + "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd3bac8bfb542dbde7ffffb6987a1a1f9d41699f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", "type": "github" }, "original": { @@ -104,13 +52,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "lastModified": 1765838191, + "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", "type": "github" }, "original": { @@ -123,42 +71,8 @@ "root": { "inputs": { "common": "common", - "deploy-rs": "deploy-rs", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_3" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" + "nixpkgs": "nixpkgs_2" } } }, diff --git a/hosts/linode/l001/flake.nix b/hosts/linode/l001/flake.nix index 04acb2e8..45e0c1a1 100644 --- a/hosts/linode/l001/flake.nix +++ b/hosts/linode/l001/flake.nix @@ -77,6 +77,7 @@ shell = pkgs.zsh; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJuo6L6V52AzdQIK6fWW9s0aX1yKUUTXbPd8v8IU9p2o nix2linode" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH2KFSRkViT+asBTjCgA7LNP3SHnfNCW+jHbV08VUuIi nix2nix" ]; }; }; diff --git a/hosts/linode/l001/headscale.nix b/hosts/linode/l001/headscale.nix index 0d4ac784..a279c073 100644 --- a/hosts/linode/l001/headscale.nix +++ b/hosts/linode/l001/headscale.nix @@ -16,6 +16,15 @@ dns = { magic_dns = true; base_domain = "net.joshuabell.xyz"; + override_local_dns = false; + # nameservers.global = [ + # "1.1.1.1" + # "1.0.0.1" + # "8.8.8.8" + # "8.8.4.4" + # "9.9.9.9" + # "9.9.9.10" + # ]; extra_records = let h001ARecord = name: { @@ -23,7 +32,7 @@ name = "${name}.joshuabell.xyz"; value = "100.64.0.13"; }; - + in [ (h001ARecord "jellyfin") diff --git a/hosts/linode/l001/nginx.nix b/hosts/linode/l001/nginx.nix index e0ef744d..45ae0af1 100644 --- a/hosts/linode/l001/nginx.nix +++ b/hosts/linode/l001/nginx.nix @@ -3,7 +3,7 @@ }: { security.acme.acceptTerms = true; - security.acme.default.email = "admin@joshuabell.xyz"; + security.acme.defaults.email = "admin@joshuabell.xyz"; services.nginx = { enable = true; recommendedGzipSettings = true; diff --git a/hosts/lio/web_access.nix b/hosts/lio/web_access.nix new file mode 100644 index 00000000..09dcdc03 --- /dev/null +++ b/hosts/lio/web_access.nix @@ -0,0 +1,4 @@ +{ + + +} diff --git a/hosts/oracle/o001/flake.lock b/hosts/oracle/o001/flake.lock index 88e6c8da..e51a36d2 100644 --- a/hosts/oracle/o001/flake.lock +++ b/hosts/oracle/o001/flake.lock @@ -9,14 +9,14 @@ "ragenix", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1761656077, + "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5", "type": "github" }, "original": { @@ -31,11 +31,11 @@ }, "locked": { "dir": "flakes/beszel", - "lastModified": 1764656426, - "narHash": "sha256-mQCosSOCXRFs2tOsPMAQRjDrbCaXCL3XlonCwlltyIc=", + "lastModified": 1766036507, + "narHash": "sha256-ZFJjJVkWlefIhsJ2vHniBnqqnTCa9qGW3pQOXUU4X1I=", "ref": "refs/heads/master", - "rev": "22b4c5755d1411a9cc40ee56e6fe5ee19da31967", - "revCount": 832, + "rev": "fca1bd9d8f4d7e345b373f69c9d2b40d9fa33f59", + "revCount": 952, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -47,11 +47,11 @@ }, "beszel-nixpkgs": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "type": "github" }, "original": { @@ -64,11 +64,11 @@ "common": { "locked": { "dir": "flakes/common", - "lastModified": 1764656426, - "narHash": "sha256-mQCosSOCXRFs2tOsPMAQRjDrbCaXCL3XlonCwlltyIc=", + "lastModified": 1766036507, + "narHash": "sha256-ZFJjJVkWlefIhsJ2vHniBnqqnTCa9qGW3pQOXUU4X1I=", "ref": "refs/heads/master", - "rev": "22b4c5755d1411a9cc40ee56e6fe5ee19da31967", - "revCount": 832, + "rev": "fca1bd9d8f4d7e345b373f69c9d2b40d9fa33f59", + "revCount": 952, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -80,11 +80,11 @@ }, "crane": { "locked": { - "lastModified": 1741481578, - "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", + "lastModified": 1760924934, + "narHash": "sha256-tuuqY5aU7cUkR71sO2TraVKK2boYrdW3gCSXUkF4i44=", "owner": "ipetkov", "repo": "crane", - "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", + "rev": "c6b4d5308293d0d04fcfeee92705017537cad02f", "type": "github" }, "original": { @@ -103,11 +103,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", "type": "github" }, "original": { @@ -117,45 +117,9 @@ "type": "github" } }, - "deploy-rs": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", - "utils": "utils" - }, - "locked": { - "lastModified": 1762286984, - "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -173,14 +137,14 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764613336, - "narHash": "sha256-L979az28t/+SXvYw9qhOno5HLlDwkZOpz6LzCLnjmRM=", + "lastModified": 1765979862, + "narHash": "sha256-/r9/1KamvbHJx6I40H4HsSXnEcBAkj46ZwibhBx9kg0=", "owner": "rycee", "repo": "home-manager", - "rev": "f3902b5d8767985680875ad86d028371100faeb3", + "rev": "d3135ab747fd9dac250ffb90b4a7e80634eacbe9", "type": "github" }, "original": { @@ -200,11 +164,11 @@ ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", "type": "github" }, "original": { @@ -215,31 +179,31 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743014863, - "narHash": "sha256-jAIUqsiN2r3hCuHji80U7NNEafpIMBXiwKlSrjWMlpg=", + "lastModified": 1765762245, + "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd3bac8bfb542dbde7ffffb6987a1a1f9d41699f", + "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1764406085, - "narHash": "sha256-CYbMp8hwuOf4umokSNp+t1s4Hjd4vxXq4S5CD+xvgNs=", - "owner": "NixOS", + "lastModified": 1765838191, + "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "9561691c9f450fad7c3526916e1c4f44be0d1192", + "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" @@ -247,42 +211,26 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "lastModified": 1764776358, + "narHash": "sha256-MxXSCRiV7DI5U3Ra1UxVJTTUyKsONAE8+8QdSXsGIhA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "rev": "0b8cec1eb2241336971009cdd4af641b930d0d97", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1764040936, - "narHash": "sha256-d1NFBVGQZ/Xb0pMviuzenqrfXymJs0m/pKrEg1tDGsE=", + "lastModified": 1761672384, + "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b9491974f02dadeb5acca22649ccbd89a6a81afb", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", + "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", "type": "github" }, "original": { @@ -359,11 +307,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1763430554, - "narHash": "sha256-0DwPuzqR+7R4lJFQ9f2xN26YhdQKg85Hw6+bPvloZoc=", + "lastModified": 1764732647, + "narHash": "sha256-jya61X22LbcT4hpeio3qE/oOI/lvqKpf09oGEHHvQdA=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "6e0e8902dac70fecbdd8ce557d142062a621ec38", + "rev": "b2b135347e299ffbf7f4123fb7811899b0c9f4b8", "type": "github" }, "original": { @@ -439,11 +387,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1763748041, - "narHash": "sha256-4KKj1zp+5Z2zbC31hpvw73BIuf4dW7rimepGOggmUp4=", + "lastModified": 1764655248, + "narHash": "sha256-9nUBzwbMkzLySMW/Y0EkFpvFgHeW5YDQ3J3moVQarjQ=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "aa25399c48236b77af71d4b64cdf157d2ba4e990", + "rev": "e9c00ea7813006dfa29f35c174f83f0184d45a93", "type": "github" }, "original": { @@ -455,11 +403,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1763995197, - "narHash": "sha256-i4WmQzSNWeR5rh61yonzR55yyklJ3xOL8D/XyEnDa+E=", + "lastModified": 1764084803, + "narHash": "sha256-ds+Rm9H00s++RC1dH4OQpCg1FXSm4HuwDGzr4ah0YBU=", "owner": "catppuccin", "repo": "nvim", - "rev": "180e0435707cf1fed09a98a9739e5807d92b69be", + "rev": "ce4a8e0d5267e67056f9f4dcf6cb1d0933c8ca00", "type": "github" }, "original": { @@ -471,11 +419,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1764013541, - "narHash": "sha256-Mzz1y7YYTYUWv9S/Yr26to7AuDCZ+9asHa3qzDz06D0=", + "lastModified": 1764104935, + "narHash": "sha256-mvs0uIoxidy3jfC6oymwhaZVRbJrW+/kuMcIpR8TI6M=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "6fb7d87a965e439cfb4e04a5c0e5038010fc015b", + "rev": "cd29cf40af7473530a8598245ba1d348fd5e1fa0", "type": "github" }, "original": { @@ -647,11 +595,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1763280728, - "narHash": "sha256-w2/osNJwbtmUxxQIXBsyqMYrvyNUaVzXrUNGYqGmzi4=", + "lastModified": 1764322768, + "narHash": "sha256-w3Q7nMFEbcjP6RmSTONg2Nw1dBXDEHnjQ69FuAPJRD8=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "cdafc320f03f2572c40ab93a4eecb733d4016d07", + "rev": "5813e4878748805f1518cee7abb50fd7205a3a48", "type": "github" }, "original": { @@ -743,11 +691,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1763539887, - "narHash": "sha256-aMyjQEEY6MlTBMMxjR6NxNhdbWmvRhOcfpgE1w712nE=", + "lastModified": 1764542305, + "narHash": "sha256-t7xAQ9sczLyA1zODmD+nEuWuLnhrfSOoPu/4G/YTGdU=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "6b7e0e18ad8fa0598bc038aef7bb6bba288adbad", + "rev": "6c3785d6a230bec63f70c98bf8e2842bed924245", "type": "github" }, "original": { @@ -759,11 +707,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1763880753, - "narHash": "sha256-huuWVUKo6CmxjXYRnGv8tUs+7bo85gNyL8vVnreiTAU=", + "lastModified": 1764477618, + "narHash": "sha256-IpVDEOr//Jy+r3Z5Qo8nxDa3fNO+BTBKzAmbqvxtCQE=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "30a2b191bccf541ce1797946324c9329e90ec448", + "rev": "effe4bf2e1afb881ea67291c648b68dd3dfc927a", "type": "github" }, "original": { @@ -871,11 +819,11 @@ "nvim_plugin-nvim-telescope/telescope.nvim": { "flake": false, "locked": { - "lastModified": 1763414201, - "narHash": "sha256-6hrylUCc6KlcbnMgcJNJhbX2Cgu0YHKoMPOqpaKRljE=", + "lastModified": 1764418954, + "narHash": "sha256-e6XSJRv4KB0z+nzGWmlV/YZNwWsyrrpQTloePRKWmw4=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "83a3a713d6b2d2a408491a1b959e55a7fa8678e8", + "rev": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2", "type": "github" }, "original": { @@ -887,11 +835,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1763712665, - "narHash": "sha256-YwaWMPQ3IC+z/utnkZ1Tfs5tZFex9Gdf/vS9sUaMDCA=", + "lastModified": 1764713359, + "narHash": "sha256-dSaO5esPKj1y4vNyLb3AK9egmFJsmWxkGOT+etJsbRA=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "3fb91e18a727ecc0385637895ec397dea90be42a", + "rev": "59088b96a32ea47caf4976e164dbd88b86447fb7", "type": "github" }, "original": { @@ -1031,11 +979,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1763939276, - "narHash": "sha256-2TLMJdbSbMbdGn6zhZwNSUZnxVGu+Y0ZYhTjinTc7Hs=", + "lastModified": 1764743081, + "narHash": "sha256-qCjrMt3fsRbLr/iM7nFHG7oKtyTTGcse4/cJbm3odJE=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "6208aefd675939cc7c8f1a57176135974dad269f", + "rev": "ffe26e8df8115c9665d24231f8a49fadb2d611ce", "type": "github" }, "original": { @@ -1143,11 +1091,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1763512274, - "narHash": "sha256-NMIXOb/20aEmXvPgSDPzVuRIV+OUnJyfXVaVEuVAaTM=", + "lastModified": 1764638966, + "narHash": "sha256-wQ6SfAunVMd5tNeM7RMvrfPC2ELRibyEQboVQlU/fBs=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "4383e05a47493d7ff77b058c0548129eb38ec7fb", + "rev": "881f99b827d65b41f522eecc21b112cf518028ac", "type": "github" }, "original": { @@ -1161,15 +1109,15 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1744897914, - "narHash": "sha256-GIVU92o2TZBnKQXTb76zpQbWR4zjU2rFqWKNIIpXnqA=", + "lastModified": 1761832913, + "narHash": "sha256-VCNVjjuRvrKPiYYwqhE3BAKIaReiKXGpxGp27lZ0MFM=", "owner": "yaxitech", "repo": "ragenix", - "rev": "40f2e17ecaeab4d78ec323e96a04548c0aaa5223", + "rev": "83bccfdea758241999f32869fb6b36f7ac72f1ac", "type": "github" }, "original": { @@ -1182,16 +1130,15 @@ "inputs": { "beszel": "beszel", "common": "common", - "deploy-rs": "deploy-rs", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "ros_neovim": "ros_neovim", "secrets": "secrets" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", @@ -1249,11 +1196,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1764112623, - "narHash": "sha256-IBjor1S6fq2nwmzi7sRwJg6mRFlO9qwA1OhJhyHvwlw=", + "lastModified": 1765641080, + "narHash": "sha256-AyPi7rZVfjTjQrhPHP+ugpVY8tcUzF3Lw1RjACuxAms=", "ref": "refs/heads/master", - "rev": "d85f1e831e400b2d1ea574fe6e40deba39d4d750", - "revCount": 323, + "rev": "224ad4e3ecd9421c7469c4f06ff5faf7f6e8bedb", + "revCount": 325, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1270,11 +1217,11 @@ ] }, "locked": { - "lastModified": 1764038373, - "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=", + "lastModified": 1764729618, + "narHash": "sha256-z4RA80HCWv2los1KD346c+PwNPzMl79qgl7bCVgz8X0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9", + "rev": "52764074a85145d5001bf0aa30cb71936e9ad5b8", "type": "github" }, "original": { @@ -1292,11 +1239,11 @@ ] }, "locked": { - "lastModified": 1741400194, - "narHash": "sha256-tEpgT+q5KlGjHSm8MnINgTPErEl8YDzX3Eps8PVc09g=", + "lastModified": 1761791894, + "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "16b6045a232fea0e9e4c69e55a6e269607dd8e3f", + "rev": "59c45eb69d9222a4362673141e00ff77842cd219", "type": "github" }, "original": { @@ -1311,11 +1258,11 @@ }, "locked": { "dir": "flakes/secrets", - "lastModified": 1764656426, - "narHash": "sha256-mQCosSOCXRFs2tOsPMAQRjDrbCaXCL3XlonCwlltyIc=", + "lastModified": 1766036507, + "narHash": "sha256-ZFJjJVkWlefIhsJ2vHniBnqqnTCa9qGW3pQOXUU4X1I=", "ref": "refs/heads/master", - "rev": "22b4c5755d1411a9cc40ee56e6fe5ee19da31967", - "revCount": 832, + "rev": "fca1bd9d8f4d7e345b373f69c9d2b40d9fa33f59", + "revCount": 952, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -1354,39 +1301,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/hosts/oracle/o001/hardware-configuration.nix b/hosts/oracle/o001/hardware-configuration.nix index ec56e90f..39a990e7 100644 --- a/hosts/oracle/o001/hardware-configuration.nix +++ b/hosts/oracle/o001/hardware-configuration.nix @@ -1,4 +1,9 @@ -{ modulesPath, ... }: +{ + lib, + pkgs, + modulesPath, + ... +}: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; boot.loader.grub = { @@ -7,9 +12,22 @@ efiInstallAsRemovable = true; device = "nodev"; }; - fileSystems."/boot" = { device = "/dev/disk/by-uuid/92B6-AAE1"; fsType = "vfat"; }; - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" ]; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/92B6-AAE1"; + fsType = "vfat"; + }; + boot.initrd.availableKernelModules = [ + "ata_piix" + "uhci_hcd" + "xen_blkfront" + ]; boot.initrd.kernelModules = [ "nvme" ]; - fileSystems."/" = { device = "/dev/sda3"; fsType = "xfs"; }; + fileSystems."/" = { + device = "/dev/sda3"; + fsType = "xfs"; + }; swapDevices = [ { device = "/dev/sda2"; } ]; + nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; + # My oracle machine is too tiny and boot partition too small to accept a new kernel, locking in at this version... + boot.kernelPackages = pkgs.linuxPackages_6_12; } diff --git a/readme.md b/readme.md index d9e2ede7..c7991007 100644 --- a/readme.md +++ b/readme.md @@ -80,8 +80,6 @@ efi /EFI/Microsoft/Boot/bootmgfw.efi # Nix Infrastructure & Automation Improvements -- [ ] **Replace deployment scripts with [`deploy-rs`](https://github.com/serokell/deploy-rs)** for declarative, hands-off host updates. - Remove manual `deploy_linode`/`deploy_oracle` scripts. Use `deploy-rs` to apply updates across one or all hosts, including remote builds. - [ ] **Add `isoImage` outputs for every host for instant USB/boot media creation.** Use: @@ -104,7 +102,6 @@ efi /EFI/Microsoft/Boot/bootmgfw.efi - [ ] **Remote build reliability:** - Parametrize/automate remote builder enable/disable. - Add quickstart SSH builder key setup instructions per-host in README. - - (Optional) Use deploy-rs's agent forwarding and improve errors if builder can't be reached at deploy time. - [ ] **Add [disko](https://github.com/nix-community/disko) to declaratively manage disk/partition creation for new installs and reinstalls.** - work on secrets pre ragenix, stormd pre install for all the above bootstrapping steps would be ideal diff --git a/utilities/nixos-installers/install_notes.md b/utilities/nixos-installers/install_notes.md index de5ce6f4..770b2048 100644 --- a/utilities/nixos-installers/install_notes.md +++ b/utilities/nixos-installers/install_notes.md @@ -234,21 +234,6 @@ efi /EFI/Microsoft/Boot/bootmgfw.efi # Nix Infrastructure & Automation Improvements -- [ ] **Replace deployment scripts with [`deploy-rs`](https://github.com/serokell/deploy-rs)** for declarative, hands-off host updates. - Remove manual `deploy_linode`/`deploy_oracle` scripts. Use `deploy-rs` to apply updates across one or all hosts, including remote builds. -- [ ] **Add `isoImage` outputs for every host for instant USB/boot media creation.** - Use: - - ``` - packages.x86_64-linux.install-iso = nixosConfigurations..config.system.build.isoImage; - ``` - - Then: - - ``` - nix build .#packages.x86_64-linux.install-iso - ``` - - [ ] **Document or automate new host bootstrap:** - Script or steps: boot custom ISO, git clone config, secrets onboarding (agenix), nixos-install with flake config. - Provide an example shell script or README note for a single-command initial setup. @@ -258,7 +243,6 @@ efi /EFI/Microsoft/Boot/bootmgfw.efi - [ ] **Remote build reliability:** - Parametrize/automate remote builder enable/disable. - Add quickstart SSH builder key setup instructions per-host in README. - - (Optional) Use deploy-rs's agent forwarding and improve errors if builder can't be reached at deploy time. - [ ] **Add [disko](https://github.com/nix-community/disko) to declaratively manage disk/partition creation for new installs and reinstalls.** - work on secrets pre ragenix, stormd pre install for all the above bootstrapping steps would be ideal