adsb: Rename some variables

container/adsb/default.nix

@@ -74,7 +74,7 @@ in
             "MLATPORT" = "30105";
             "LAT" = secret.container.adsb.readsb.lat;
             "LONG" = secret.container.adsb.readsb.lon;
-            "HEYWHATSTHAT_PANORAMA_ID" = secret.container.adsb.tar1090.heywhatsthat-id;
+            "HEYWHATSTHAT_PANORAMA_ID" = secret.container.adsb.tar1090.heywhatsthatId;
             "TAR1090_FLIGHTAWARELINKS" = "true";
             "TAR1090_DISPLAYUNITS" = "metric";
           };
@@ -142,7 +142,7 @@ in
             "MLAT_RESULTS" = "yes";
             "LAT" = secret.container.adsb.readsb.lat;
             "LONG" = secret.container.adsb.readsb.lon;
-            "FEEDER_ID" = secret.container.adsb.piaware.feeder-id;
+            "FEEDER_ID" = secret.container.adsb.piaware.feederId;
           };
           tmpfs = [
             "/run:exec,size=64M"

flake.lock

@@ -117,11 +117,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1659491236,
-        "narHash": "sha256-IlmxMp0nMYIZqW4CX5ZL/V6N6chOxHlcvd76NRTxEFU=",
+        "lastModified": 1659582349,
+        "narHash": "sha256-ew2vvIYsq+i8nc/BgZZEC9w3L4V7GIik5ZfcnJXFoTs=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "b8dcbcc732baf84fc48d6b272c3ade0bcb129b3b",
+        "rev": "27ce21ac852cb520740210ba68062e981657b6f4",
         "type": "github"
       },
       "original": {
@@ -140,11 +140,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1659514712,
-        "narHash": "sha256-o4Wk4C+AtmqzMtvRBq6amfExNTFrp9wEN57iFnbbeFw=",
+        "lastModified": 1659601221,
+        "narHash": "sha256-Owh8FpNExOma5A16OIrMioCIAOexAwY6o91UyL2YHUo=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "e44a918185e509f0df98b48e7238f5493f2d1ae0",
+        "rev": "dbb2ae51325626df40171615e87db0add16f8e80",
         "type": "github"
       },
       "original": {
@@ -175,11 +175,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1659494082,
-        "narHash": "sha256-XRwMisQY/BcvDMDRVkd4n3/CT89HOtlPgWIQUNPvWSc=",
+        "lastModified": 1659542688,
+        "narHash": "sha256-7Ye59iW/DUWb8PzptEqdyYPlv6y+IhqKecaoZl3q68A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8c7576622aeb4707351a17e83429667f42e7d910",
+        "rev": "81094ccd6a0aa13ed176c815a60c4e25b49f072d",
         "type": "github"
       },
       "original": {
@@ -223,11 +223,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1659487997,
-        "narHash": "sha256-t2mBR6uuTE3FRWgd2T4gnWNUnjo2vI2lPfbbfms3r7s=",
+        "lastModified": 1659574967,
+        "narHash": "sha256-OhE9jLC8W/mdpmw2kOOnIXb9VonkRz6Ap4vLV8m07lU=",
         "owner": "arqv",
         "repo": "zig-overlay",
-        "rev": "3b17b1f1a48a62f0b2bd6532c573c762dc636ded",
+        "rev": "2ed5bafecb0f82cb5492e98b5d8bd29bd158439a",
         "type": "github"
       },
       "original": {

home/programs/nvim/plugins.nix

@@ -164,12 +164,12 @@
   };
   project-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "project.nvim";
-    version = "2022-07-28";
+    version = "2022-08-03";
     src = pkgs.fetchFromGitHub {
       owner = "ahmedkhalf";
       repo = "project.nvim";
-      rev = "e449497c0bceb6e50947b840ec3658bf1108bf0b";
-      sha256 = "0kq464j8m67bmm2050pgzb284n6jfs8ivg9j2xns0czjkw9bm4nk";
+      rev = "090bb11ee7eb76ebb9d0be1c6060eac4f69a240f";
+      sha256 = "160cg0mhhb87sibdm05pqsa2p3vy110i6aw29dv7mbz4jaf6xhrl";
       fetchSubmodules = false;
     };
   };
@@ -212,8 +212,8 @@
     src = pkgs.fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "4bec857a983f732009ad96ba4936d389a93fdc98";
-      sha256 = "0xa62xbj4zp9cswmx1ikwq0jw3glkn97ydd282vhl1r5fhjm06vw";
+      rev = "47a521e621570da77e25c31988e2b74412db25e4";
+      sha256 = "0x9wpg2p54x1h609s7wls1cfc7prn04amdn7jw3sbvg940n18d25";
       fetchSubmodules = false;
     };
   };

home/programs/ssh.nix

@@ -6,6 +6,8 @@ let
 
   auth-socket = "${ssh-directory}/1password.sock";
   signers-directory = "${ssh-directory}/allowed_signers";
+
+  secret-sail = import ../../secret/hosts/sail.nix;
 in
 {
   home.packages = [ pkgs.openssh ];
@@ -81,14 +83,6 @@ in
         identitiesOnly = true;
       };
 
-      "haven" = {
-        hostname = "100.101.243.36";
-        port = 22;
-        user = "daniel";
-        identityFile = "~/.ssh/LAN.pub";
-        identitiesOnly = true;
-      };
-
       "piboat.lan" = {
         port = 22;
         user = "pi";
@@ -96,9 +90,19 @@ in
         identitiesOnly = true;
       };
 
-      "webboat" = {
-        hostname = "100.99.89.98";
-        port = 20022;
+      "sail" = {
+        hostname = secret-sail.publicIP;
+        port = 22;
+        user = "daniel";
+        identityFile = "~/.ssh/Hetzner.pub";
+        identitiesOnly = true;
+      };
+
+      # Builder
+
+      "builder-sail" = {
+        hostname = secret-sail.publicIP;
+        port = 22;
         user = "root";
         identityFile = "~/.ssh/Hetzner.pub";
         identitiesOnly = true;

system/hosts/Styx.nix

@@ -24,6 +24,14 @@
       keep-outputs = true
       auto-optimise-store = true
     '';
+
+    buildMachines = [
+      {
+        hostName = "builder-sail";
+        system = "x86_64-linux";
+        maxJobs = 1;
+      }
+    ];
   };
 
   users = {