diff --git a/flake.nix b/flake.nix index c186ffb7..a9e633af 100644 --- a/flake.nix +++ b/flake.nix @@ -44,6 +44,9 @@ (pkgs.writeShellScriptBin "deploy_h002" '' NIX_SSHOPTS="-i /run/agenix/nix2nix" nixos-rebuild --flake $(git rev-parse --show-toplevel)'/hosts/h002' --target-host root@10.12.14.183 --use-substitutes --no-reexec switch '') + (pkgs.writeShellScriptBin "deploy_juni" '' + NIX_SSHOPTS="-i /run/agenix/nix2nix" nixos-rebuild --flake $(git rev-parse --show-toplevel)'/hosts/juni' --target-host josh@10.12.14.172 --use-substitutes --no-reexec switch + '') ]; }; } diff --git a/hosts/juni/flake.lock b/hosts/juni/flake.lock index a4aaa437..23107290 100644 --- a/hosts/juni/flake.lock +++ b/hosts/juni/flake.lock @@ -31,11 +31,11 @@ }, "locked": { "dir": "flakes/beszel", - "lastModified": 1767048390, - "narHash": "sha256-JfSMqK2Q2FimYf+0p39q/NZ7RLKQ5FeMZa9qM0xZ4t8=", + "lastModified": 1767107690, + "narHash": "sha256-Y1VmRMaPXgEVusn2e9uOeVe40i5+uUdNMZTOnB7CQsU=", "ref": "refs/heads/master", - "rev": "a27c00c6ff082321526e3809a60ce3ead2abee95", - "revCount": 999, + "rev": "b51768f26b9e9fa7858f3f373f27fe5f87a24bfb", + "revCount": 1005, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -64,11 +64,11 @@ "common": { "locked": { "dir": "flakes/common", - "lastModified": 1767048390, - "narHash": "sha256-JfSMqK2Q2FimYf+0p39q/NZ7RLKQ5FeMZa9qM0xZ4t8=", + "lastModified": 1767107690, + "narHash": "sha256-Y1VmRMaPXgEVusn2e9uOeVe40i5+uUdNMZTOnB7CQsU=", "ref": "refs/heads/master", - "rev": "a27c00c6ff082321526e3809a60ce3ead2abee95", - "revCount": 999, + "rev": "b51768f26b9e9fa7858f3f373f27fe5f87a24bfb", + "revCount": 1005, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -123,11 +123,11 @@ }, "locked": { "dir": "flakes/de_plasma", - "lastModified": 1767048390, - "narHash": "sha256-JfSMqK2Q2FimYf+0p39q/NZ7RLKQ5FeMZa9qM0xZ4t8=", + "lastModified": 1767107690, + "narHash": "sha256-Y1VmRMaPXgEVusn2e9uOeVe40i5+uUdNMZTOnB7CQsU=", "ref": "refs/heads/master", - "rev": "a27c00c6ff082321526e3809a60ce3ead2abee95", - "revCount": 999, + "rev": "b51768f26b9e9fa7858f3f373f27fe5f87a24bfb", + "revCount": 1005, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -161,11 +161,11 @@ }, "locked": { "dir": "flakes/flatpaks", - "lastModified": 1767048390, - "narHash": "sha256-JfSMqK2Q2FimYf+0p39q/NZ7RLKQ5FeMZa9qM0xZ4t8=", + "lastModified": 1767107690, + "narHash": "sha256-Y1VmRMaPXgEVusn2e9uOeVe40i5+uUdNMZTOnB7CQsU=", "ref": "refs/heads/master", - "rev": "a27c00c6ff082321526e3809a60ce3ead2abee95", - "revCount": 999, + "rev": "b51768f26b9e9fa7858f3f373f27fe5f87a24bfb", + "revCount": 1005, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -272,11 +272,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1767068707, - "narHash": "sha256-+DDBd5UX7jTwiPdPfbcK0lM+qTxHsLY6z6tq9riiC7Y=", + "lastModified": 1767070591, + "narHash": "sha256-b0aM3221Pw6vbACFqZrVzZjMNqXVPi1dvgLr8QTbajc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7a9a613a3e457bfd3dcf16f1f9ea1a9b138b992d", + "rev": "9b3c38bf6c260d0e88154ef07fa833fa845bfd14", "type": "github" }, "original": { @@ -1268,11 +1268,11 @@ }, "locked": { "dir": "flakes/opencode", - "lastModified": 1767048390, - "narHash": "sha256-JfSMqK2Q2FimYf+0p39q/NZ7RLKQ5FeMZa9qM0xZ4t8=", + "lastModified": 1767107690, + "narHash": "sha256-Y1VmRMaPXgEVusn2e9uOeVe40i5+uUdNMZTOnB7CQsU=", "ref": "refs/heads/master", - "rev": "a27c00c6ff082321526e3809a60ce3ead2abee95", - "revCount": 999, + "rev": "b51768f26b9e9fa7858f3f373f27fe5f87a24bfb", + "revCount": 1005, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -1479,11 +1479,11 @@ }, "locked": { "dir": "flakes/secrets", - "lastModified": 1767048390, - "narHash": "sha256-JfSMqK2Q2FimYf+0p39q/NZ7RLKQ5FeMZa9qM0xZ4t8=", + "lastModified": 1767107690, + "narHash": "sha256-Y1VmRMaPXgEVusn2e9uOeVe40i5+uUdNMZTOnB7CQsU=", "ref": "refs/heads/master", - "rev": "a27c00c6ff082321526e3809a60ce3ead2abee95", - "revCount": 999, + "rev": "b51768f26b9e9fa7858f3f373f27fe5f87a24bfb", + "revCount": 1005, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, diff --git a/hosts/juni/flake.nix b/hosts/juni/flake.nix index 01393e51..a4981c9d 100644 --- a/hosts/juni/flake.nix +++ b/hosts/juni/flake.nix @@ -66,12 +66,12 @@ }) inputs.common.nixosModules.jetbrains_font - # secrets.nixosModules.default + inputs.secrets.nixosModules.default inputs.ros_neovim.nixosModules.default ({ ringofstorms-nvim.includeAllRuntimeDependencies = true; }) - # inputs.opencode.nixosModules.default + inputs.opencode.nixosModules.default inputs.flatpaks.nixosModules.default @@ -84,15 +84,15 @@ inputs.common.nixosModules.timezone_auto inputs.common.nixosModules.tty_caps_esc inputs.common.nixosModules.zsh - # inputs.common.nixosModules.tailnet + inputs.common.nixosModules.tailnet - # beszel.nixosModules.agent - # ({ - # beszelAgent = { - # token = "f8a54c41-486b-487a-a78d-a087385c317b"; - # }; - # } - # ) + inputs.beszel.nixosModules.agent + ({ + beszelAgent = { + token = "2fb5f0a0-24aa-4044-a893-6d0f916cd063"; + }; + } + ) ./hardware-configuration.nix ./hardware-mounts.nix @@ -122,7 +122,7 @@ inputs.common.homeManagerModules.starship inputs.common.homeManagerModules.zoxide inputs.common.homeManagerModules.zsh - # inputs.common.homeManagerModules.ssh + inputs.common.homeManagerModules.ssh ( { ... }: {