From 2e8996767eef27dd051657c25c0c60ef0b3abf40 Mon Sep 17 00:00:00 2001 From: Ciapa Date: Mon, 20 May 2024 15:54:44 +0200 Subject: [PATCH] Update flake.nix --- flake.lock | 24 ++++++++++++------------ flake.nix | 35 ++++++----------------------------- 2 files changed, 18 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index 476b695..045ea07 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1711973905, - "narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=", + "lastModified": 1715699772, + "narHash": "sha256-sKhqIgucN5sI/7UQgBwsonzR4fONjfMr9OcHK/vPits=", "owner": "serokell", "repo": "deploy-rs", - "rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b", + "rev": "b3ea6f333f9057b77efd9091119ba67089399ced", "type": "github" }, "original": { @@ -146,11 +146,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1712437997, - "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=", + "lastModified": 1716061101, + "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920", + "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", "type": "github" }, "original": { @@ -162,11 +162,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712608508, - "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", + "lastModified": 1716137900, + "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", + "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1712617241, - "narHash": "sha256-a4hbls4vlLRMciv62YrYT/Xs/3Cubce8WFHPUDWwzf8=", + "lastModified": 1716087663, + "narHash": "sha256-zuSAGlx8Qk0OILGCC2GUyZ58/SJ5R3GZdeUNQ6IS0fQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "538c114cfdf1f0458f507087b1dcf018ce1c0c4c", + "rev": "0bf1808e70ce80046b0cff821c019df2b19aabf5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8d3d058..bbcef69 100644 --- a/flake.nix +++ b/flake.nix @@ -51,16 +51,6 @@ ]; }; - "oosi.elmosco.lewd.wtf" = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit inputs self; }; - modules = [ - sops-nix.nixosModules.sops - ./default.nix - ./hosts/seedbox/oosi/configuration.nix - ]; - }; - "kinda.sus.lol" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs self; }; @@ -74,8 +64,8 @@ deploy.nodes = { "phoenix.lewd.wtf" = { - sshOpts = [ "-p" "22" "-o" "StrictHostKeyChecking=no" "-i" ".privkey" ]; - hostname = "phoenix.lewd.wtf"; + sshOpts = [ "-p" "222" "-o" "StrictHostKeyChecking=no" ]; + hostname = "192.168.0.42"; fastConnection = true; profiles.system = { @@ -87,7 +77,7 @@ }; "aztul.elmosco.lewd.wtf" = { - sshOpts = [ "-p" "22111" "-o" "StrictHostKeyChecking=no" "-i" ".privkey" ]; + sshOpts = [ "-p" "22111" "-o" "StrictHostKeyChecking=no" ]; hostname = "aztul.elmosco.lewd.wtf"; fastConnection = true; @@ -100,7 +90,7 @@ }; "rene.elmosco.lewd.wtf" = { - sshOpts = [ "-p" "22113" "-o" "StrictHostKeyChecking=no" "-i" ".privkey" ]; + sshOpts = [ "-p" "22113" "-o" "StrictHostKeyChecking=no" ]; hostname = "rene.elmosco.lewd.wtf"; fastConnection = true; @@ -113,7 +103,7 @@ }; "reject.elmosco.lewd.wtf" = { - sshOpts = [ "-p" "22104" "-o" "StrictHostKeyChecking=no" "-i" ".privkey" ]; + sshOpts = [ "-p" "22104" "-o" "StrictHostKeyChecking=no" ]; hostname = "reject.elmosco.lewd.wtf"; fastConnection = true; @@ -125,21 +115,8 @@ }; }; - "oosi.elmosco.lewd.wtf" = { - sshOpts = [ "-p" "22106" "-o" "StrictHostKeyChecking=no" "-i" ".privkey" ]; - hostname = "oosi.elmosco.lewd.wtf"; - fastConnection = true; - - profiles.system = { - sshUser = "root"; - path = - deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations."oosi.elmosco.lewd.wtf"; - user = "root"; - }; - }; - "kinda.sus.lol" = { - sshOpts = [ "-p" "22201" "-o" "StrictHostKeyChecking=no" "-i" ".privkey" ]; + sshOpts = [ "-p" "22201" "-o" "StrictHostKeyChecking=no" ]; hostname = "kinda.sus.lol"; fastConnection = true;