diff --git a/flake.lock b/flake.lock index b07e465..dde5181 100644 --- a/flake.lock +++ b/flake.lock @@ -218,11 +218,11 @@ }, "crane": { "locked": { - "lastModified": 1787074141, - "narHash": "sha256-MWnmk87W8akPIKh+yd0bTfXvlyumKQVh5l/KTbgI95o=", + "lastModified": 1787275140, + "narHash": "sha256-PqFGJPOBHd+Nbz008oDcEiCB+kEkb+JSuG097qLvP2Q=", "owner": "ipetkov", "repo": "crane", - "rev": "6ed595a5527c0ec9563e0e06417f1b8fc88ccb66", + "rev": "a1a1116e8ec16f03bcc23e5c77db557a5fc9b4d6", "type": "github" }, "original": { @@ -282,11 +282,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1787122318, - "narHash": "sha256-37asD+JKFnedthzsuGP8mDgxCzjNePJVfMAVzYWIMfs=", + "lastModified": 1787208815, + "narHash": "sha256-SiyWmwDoDF2jCEpEW887qxaUazaQrVQs+QXq2bvgm+0=", "owner": "nix-community", "repo": "fenix", - "rev": "d57340fe40c2ee12f86c0e087d2239d682b54eb0", + "rev": "428f69c19e46334bed722164c5125b62d3722723", "type": "github" }, "original": { @@ -541,11 +541,11 @@ ] }, "locked": { - "lastModified": 1787063542, - "narHash": "sha256-Hx0uXTIziup9rxXisg8pN9XkQWKtj/osRmlLWJM9pYk=", + "lastModified": 1787234869, + "narHash": "sha256-m8KcjoF4g0/4aLSNvy4dnp9+qiHcy4K9g8MmI3xSois=", "owner": "StevenBlack", "repo": "hosts", - "rev": "d1ff8cc2e811cf1e61f9da84dc560c2c782f3552", + "rev": "4731c9c341b13b9a4c8282a02eb551ab76090811", "type": "github" }, "original": { @@ -999,11 +999,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1787070829, - "narHash": "sha256-vXNVDVtvfiQuXthP0NHPFdNvvMTkGpx0UP8oddIWbNk=", + "lastModified": 1787135253, + "narHash": "sha256-RD2kNWCG+Bjo6h+JVjWVNntZs2GtRoeY2xHjts/FNkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ae2bc1419c3f345984c2629e72e7a631820fa4d", + "rev": "ffb3c9b700e759be2ef13237c9d8f953b32a1e46", "type": "github" }, "original": { @@ -1026,11 +1026,11 @@ ] }, "locked": { - "lastModified": 1787151631, - "narHash": "sha256-EblMdrDFBFNNlUPm5zUQdh0j6gDx+OFQPv7LFE4B5AA=", + "lastModified": 1787270640, + "narHash": "sha256-L3ZXW7MSCPsOZz5powJZZqzZLxuPLh9QXHp5shwzqb8=", "owner": "nix-community", "repo": "nixvim", - "rev": "d0d62a2b5027da689b4e8d5ee43f1cf83f2e975d", + "rev": "bd46166bd8308861cd36984a52ed5d25522d0ba8", "type": "github" }, "original": { @@ -1208,11 +1208,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1787016763, - "narHash": "sha256-xLAVaKGTZ/fI/+dZnAukLbXOi/05fF755IJ1mK6h/Lc=", + "lastModified": 1787106123, + "narHash": "sha256-Usi0dFNYgdN5gXYDjLLGCYYkzW7Xl9uBhwGD5OkuWoM=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "0356f5bf5a88095cae07bbb57e44bb00a22a4711", + "rev": "32a3346dff5b26e16227affd5af933e15ebc598b", "type": "github" }, "original": { @@ -1246,11 +1246,11 @@ "selfhosted-icons": { "flake": false, "locked": { - "lastModified": 1786277132, - "narHash": "sha256-VqePIBlcdNUp3IxZRV+KJ0V2o7UJ8BbkV77Y+Jp9frY=", + "lastModified": 1787220187, + "narHash": "sha256-djw5NvfpSccAdthhOoWb9oEVSarE0xAEO2BLdsX7QdY=", "owner": "selfhst", "repo": "icons", - "rev": "147b972e62e7fb5cc8b990f73d47cbd56dd4dd43", + "rev": "948e3aa28d3110ee23957473a85431650e10e778", "type": "github" }, "original": { @@ -1390,11 +1390,11 @@ "tailwindcss-animated-src": "tailwindcss-animated-src" }, "locked": { - "lastModified": 1787132711, - "narHash": "sha256-NNTWHpg8BYnAlhkyNyBt0UqG2e7WFIT1iuEveAlByC8=", + "lastModified": 1787215704, + "narHash": "sha256-TXhdk/sSphoxsnsYUB6ACj/wKbR39Gkk4EgA2Rp/OGo=", "ref": "refs/heads/master", - "rev": "1adde466290bdc74e2a18f23592a03975be11a92", - "revCount": 3130, + "rev": "afc044753d21eb4a0bfe10f3249a114ad67862fe", + "revCount": 3131, "type": "git", "url": "https://tangled.org/@tangled.org/core" }, @@ -1474,11 +1474,11 @@ ] }, "locked": { - "lastModified": 1786900523, - "narHash": "sha256-ep8pe0xNCB/1kC8OvFpFrtMaubs71w1F/s+f2ALMgys=", + "lastModified": 1787214113, + "narHash": "sha256-a0SmdGpM4+1cD4Pk9BPK7OFAFJx0DeMh8t47qrhMXww=", "ref": "refs/heads/main", - "rev": "ed3d129594ff9d25f5258b6678752ad288eef393", - "revCount": 515, + "rev": "aa815931e050ef0347942547cba919a6a7a74ac5", + "revCount": 521, "type": "git", "url": "https://tangled.org/tranquil.farm/tranquil-pds" }, diff --git a/hosts/nfs-host/default.nix b/hosts/nfs-host/default.nix index bf91877..52498be 100644 --- a/hosts/nfs-host/default.nix +++ b/hosts/nfs-host/default.nix @@ -10,7 +10,7 @@ config = { deployment = { - targetHost = "192.168.36.5"; + targetHost = "nfs-host.internal"; targetUser = "user"; tags = [ "server" diff --git a/hosts/reverse-proxy-2/default.nix b/hosts/reverse-proxy-2/default.nix index 0fd90d4..44463f9 100644 --- a/hosts/reverse-proxy-2/default.nix +++ b/hosts/reverse-proxy-2/default.nix @@ -13,7 +13,7 @@ config = { deployment = { - targetHost = "192.168.36.22"; + targetHost = "reverse-proxy-2.internal"; targetUser = "user"; tags = [ "server" diff --git a/hosts/vps2/default.nix b/hosts/vps2/default.nix index 20faa65..b585468 100644 --- a/hosts/vps2/default.nix +++ b/hosts/vps2/default.nix @@ -14,7 +14,7 @@ ]; deployment = { - targetHost = "40.160.241.166"; + targetHost = "vps2.cow.computer"; targetUser = "user"; tags = [ "server" diff --git a/hosts/vps4/default.nix b/hosts/vps4/default.nix index 1f2fd3c..e387262 100644 --- a/hosts/vps4/default.nix +++ b/hosts/vps4/default.nix @@ -16,7 +16,7 @@ ]; deployment = { - targetHost = [ "15.204.56.154" ]; + targetHost = [ "vps4.cow.computer" ]; targetUser = "user"; tags = [ "server" diff --git a/profiles/base-server.nix b/profiles/base-server.nix index 25852fb..e147097 100644 --- a/profiles/base-server.nix +++ b/profiles/base-server.nix @@ -61,6 +61,7 @@ sops.secrets.system-password = { sopsFile = ../secrets/system-passwords/${config.networking.hostName}.yaml; key = "user"; + neededForUsers = true; }; users = {