erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Remove deploy-rs

Browse source
This commit is contained in:
Erwin Boskma 2023-01-31 16:58:29 +01:00
parent 9c71c7f57e
commit ae9d19ccfa
Signed by: erwin
SSH key fingerprint: SHA256:CyeNoWXd3kjX2Nwu6pDxxdS7OqmPVOy0NavA/KU/ntU
2 changed files with 3 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
flake.lock
View file

@ -1,29 +1,5 @@
{ {
"nodes": { "nodes": {
"deploy-rs": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"nixpkgs"
],
"utils": [
"flake-utils"
]
},
"locked": {
"lastModified": 1674127017,
"narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77",
"type": "github"
},
"original": {
"owner": "serokell",
"repo": "deploy-rs",
"type": "github"
}
},
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -68,22 +44,6 @@
} }
}, },
"flake-compat": { "flake-compat": {
"flake": false,
"locked": {
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1673956053,
@ -430,7 +390,7 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat",
"flake-utils": [ "flake-utils": [
"flake-utils" "flake-utils"
], ],
@ -456,7 +416,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"deploy-rs": "deploy-rs",
"disko": "disko", "disko": "disko",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",

60
flake.nix
View file

@ -19,12 +19,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
deploy-rs = {
url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "flake-utils";
};
nixinate = { nixinate = {
url = "github:MatthewCroughan/nixinate"; url = "github:MatthewCroughan/nixinate";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -107,7 +101,6 @@
, sops , sops
, ha-now-playing , ha-now-playing
, pamedia , pamedia
, deploy-rs
, nixinate , nixinate
, ... , ...
} @ inputs: } @ inputs:
@ -199,56 +192,8 @@
(builtins.attrNames machines)); (builtins.attrNames machines));
apps = nixinate.nixinate.x86_64-linux self; apps = nixinate.nixinate.x86_64-linux self;
deploy.nodes = {
drone = {
hostname = "10.0.0.202";
profiles = {
system = {
sshUser = "root";
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.drone;
user = "root";
};
};
};
gitea = {
hostname = "10.0.0.201";
profiles = {
system = {
sshUser = "root";
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.gitea;
user = "root";
};
};
};
proxy = {
hostname = "10.0.0.251";
profiles = {
system = {
sshUser = "root";
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.proxy;
user = "root";
};
};
};
minio = {
hostname = "10.0.0.204";
profiles = {
system = {
sshUser = "root";
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.minio;
user = "root";
};
};
};
};
} }
// (flake-utils.lib.eachSystem [ "aarch64-linux" "x86_64-linux" ]) // (flake-utils.lib.eachSystem [ "x86_64-linux" ])
( (
system: system:
let let
@ -291,7 +236,7 @@
}; };
}; };
}; # // deploy-rs.lib.${system}.deployChecks self.deploy; };
devShells.default = with pkgs; devShells.default = with pkgs;
mkShell { mkShell {
@ -312,7 +257,6 @@
nix-prefetch-github nix-prefetch-github
nix-prefetch-docker nix-prefetch-docker
nixos-install-tools nixos-install-tools
deploy-rs.packages.${system}.deploy-rs
terraform terraform
terraform-ls terraform-ls