diff --git a/deploy.nix b/deploy.nix index 400b0ea..4f7d268 100644 --- a/deploy.nix +++ b/deploy.nix @@ -1,19 +1,24 @@ { inputs, ... }@flakeContext: +let + user = "${inputs.zeroq-vars.devices.username}"; + server = "${inputs.zeroq-vars.devices.server.hostname}"; + vds = "${inputs.zeroq-vars.devices.vds.hostname}"; +in { deploy = { - sshUser = "oqyude"; + sshUser = "${user}"; user = "root"; nodes = { - sapphira = { - hostname = "sapphira"; + "${server}" = { + hostname = "${server}"; profiles.system = { path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.sapphira; }; }; - otreca = { - hostname = "otreca"; + "${vds}" = { + hostname = "${vds}"; profiles.system = { - path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.otreca; + path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations."${vds}"; }; }; }; diff --git a/flake.nix b/flake.nix index b9ab5bc..8ee609a 100755 --- a/flake.nix +++ b/flake.nix @@ -3,18 +3,18 @@ inputs = { # My zeroq-credentials.url = "git+ssh://git@github.com/oqyude/zeroq-credentials.git"; # flake of creds + zeroq-vars = { + url = ./vars.nix; + isFlake = false; + }; zapret.url = "github:oqyude/zapret-easyflake"; # stupid flake of zapret # nixpkgs nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs-last-unstable.url = "github:NixOS/nixpkgs/6b4955211758ba47fac850c040a27f23b9b4008f"; - # nixpkgs-calibre.url = "github:NixOS/nixpkgs/35f590344ff791e6b1d6d6b8f3523467c9217caf"; - #nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - # nixpkgs-immich.url = "github:NixOS/nixpkgs/007307973c7183cc2d529b83b1a1e81e14b85ebe"; - nixpkgs-master.url = "github:NixOS/nixpkgs/master"; # e63467437ce61d8d9a36e09254e8d07b472da0c6 # 72353fc1fa61189fb76133d50c519e871c858c39 # 5b38c7435fb1112a8b36b1652286996a7998c5b5 + nixpkgs-master.url = "github:NixOS/nixpkgs/master"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; #nixpkgs-fingerprint.url = "github:NixOS/nixpkgs/nixos-24.11"; - #nixos.url = "github:NixOS/nixpkgs/nixos-unstable"; # nix-community nixos-wsl = { diff --git a/vars.nix b/vars.nix new file mode 100644 index 0000000..4263c8a --- /dev/null +++ b/vars.nix @@ -0,0 +1,12 @@ +{ + description = "zeroq vars"; + outputs = + { self }: + { + devices = { + username = "oqyude"; + server.hostname = "sapphira"; + vds.hostname = "otreca"; + }; + }; +}