From a8c62c4f10e90e423eb64ed04cbb6db376e02cfc Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 22 Jan 2024 23:57:46 +0100 Subject: [PATCH] flake: remove deploy-rs --- flake.lock | 110 +++--------------------- flake.nix | 1 - modules/services/ssh-server/default.nix | 2 +- 3 files changed, 13 insertions(+), 100 deletions(-) diff --git a/flake.lock b/flake.lock index be4a90b..1e71144 100644 --- a/flake.lock +++ b/flake.lock @@ -1,25 +1,5 @@ { "nodes": { - "deploy-rs": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", - "utils": "utils" - }, - "locked": { - "lastModified": 1703087360, - "narHash": "sha256-0VUbWBW8VyiDRuimMuLsEO4elGuUw/nc2WDeuO1eN1M=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "b709d63debafce9f5645a5ba550c9e0983b3d1f7", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -41,22 +21,6 @@ } }, "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" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -72,7 +36,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -144,7 +108,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1685518550, @@ -215,9 +179,9 @@ }, "nix": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "libgit2": "libgit2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -236,7 +200,7 @@ }, "nixinate": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1688141737, @@ -305,16 +269,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702272962, - "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", + "lastModified": 1704018918, + "narHash": "sha256-erjg/HrpC9liEfm7oLqb8GXCqsxaFwIIPqCsknW5aFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", + "rev": "2c9c58e98243930f8cb70387934daa4bc8b00373", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-23.05-small", "repo": "nixpkgs", "type": "github" } @@ -437,22 +401,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1704018918, - "narHash": "sha256-erjg/HrpC9liEfm7oLqb8GXCqsxaFwIIPqCsknW5aFY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2c9c58e98243930f8cb70387934daa4bc8b00373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1653060744, "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=", @@ -468,7 +416,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1704420045, "narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=", @@ -506,7 +454,7 @@ }, "pre-commit-hooks-nix": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils", "gitignore": "gitignore", "nixpkgs": [ @@ -530,14 +478,13 @@ }, "root": { "inputs": { - "deploy-rs": "deploy-rs", "disko": "disko", "flake-parts": "flake-parts", "nix": "nix", "nixinate": "nixinate", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "passworts": "passworts", "pre-commit-hooks-nix": "pre-commit-hooks-nix", @@ -602,39 +549,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "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": 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 4e92ec8..4ce32b1 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,6 @@ nixos-hardware.url = "github:NixOS/nixos-hardware"; - deploy-rs.url = "github:serokell/deploy-rs"; nixinate.url = "github:matthewcroughan/nixinate"; sops-nix = { diff --git a/modules/services/ssh-server/default.nix b/modules/services/ssh-server/default.nix index b427261..c6dc9a8 100644 --- a/modules/services/ssh-server/default.nix +++ b/modules/services/ssh-server/default.nix @@ -22,7 +22,7 @@ in # WARNING: if you remove this, then you need to assign a password to your user, otherwise # `sudo` won't work. You can do that either by using `passwd` after the first rebuild or # by setting an hashed password in the `users.users.felix` block as `initialHashedPassword`. - # additionally needed by deploy-rs + # additionally needed for deployment security.sudo.wheelNeedsPassword = false; my.services.loki.rules = {