diff --git a/container/adsb/default.nix b/container/adsb/default.nix
index 9fa2234..f2df3c9 100644
--- a/container/adsb/default.nix
+++ b/container/adsb/default.nix
@@ -32,7 +32,7 @@ in
 
     mlathub = {
       image = "ghcr.io/sdr-enthusiasts/docker-readsb-protobuf:latest";
-      dependsOn = [ "readsb" "piaware" ];
+      # dependsOn = [ "readsb" "piaware" ];
       environment = {
         "TZ" = "Europe/Berlin";
         "DISABLE_PERFORMANCE_GRAPHS" = "true";
@@ -53,7 +53,7 @@ in
 
     tar1090 = {
       image = "ghcr.io/sdr-enthusiasts/docker-tar1090:latest";
-      dependsOn = [ "readsb" "mlathub" ];
+      # dependsOn = [ "readsb" "mlathub" ];
       ports = [ "8081:80" ];
       environment = {
         "TZ" = "Europe/Berlin";
@@ -80,7 +80,7 @@ in
 
     fr24feed = {
       image = "ghcr.io/sdr-enthusiasts/docker-flightradar24:latest";
-      dependsOn = [ "readsb" ];
+      # dependsOn = [ "readsb" ];
       environment = {
         "TZ" = "Europe/Berlin";
         "BEASTHOST" = "readsb";
@@ -98,7 +98,7 @@ in
 
     piaware = {
       image = "ghcr.io/sdr-enthusiasts/docker-piaware:latest";
-      dependsOn = [ "readsb" ];
+      # dependsOn = [ "readsb" ];
       environment = {
         "TZ" = "Europe/Berlin";
         "RECEIVER_TYPE" = "relay";
diff --git a/flake.lock b/flake.lock
index d0cbe2e..a21214f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -152,11 +152,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1687598357,
-        "narHash": "sha256-70ciIe8415oQnQypawaqocEaLJcI1XtkqRNmle8vsrg=",
+        "lastModified": 1687747614,
+        "narHash": "sha256-KXspKgtdO2YRL12Jv0sUgkwOwHrAFwdIG/90pDx8Ydg=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "1e7098ee0448dc5d33df394d040f454cd42a809c",
+        "rev": "fef67a1ddc293b595d62a660f57deabbcb70ff95",
         "type": "github"
       },
       "original": {
@@ -202,11 +202,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1685662779,
-        "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
+        "lastModified": 1687762428,
+        "narHash": "sha256-DIf7mi45PKo+s8dOYF+UlXHzE0Wl/+k3tXUyAoAnoGE=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
+        "rev": "37dd7bb15791c86d55c5121740a1887ab55ee836",
         "type": "github"
       },
       "original": {
@@ -299,11 +299,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1687651961,
-        "narHash": "sha256-xop+7nyPZXbnXPCAW6iQSRB0ILgyBydKMqnhr4ZgVIY=",
+        "lastModified": 1687764346,
+        "narHash": "sha256-ugMazLtz8pbjMLJ386dTvWzFGkOwCn0xvy1fvk66XyY=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "e59cf3b3a9ee0f9e9b4d2e01059dbdf185eb5685",
+        "rev": "b697c0cd4fb2ebe3f021599cb77122374db7fd59",
         "type": "github"
       },
       "original": {
@@ -324,11 +324,11 @@
         "weewx-proxy-flake": "weewx-proxy-flake"
       },
       "locked": {
-        "lastModified": 1687681278,
-        "narHash": "sha256-VCOM3oAW9W0Awnu5dVEgklQGpCt3P9JocQtXBCgQNJg=",
+        "lastModified": 1687768057,
+        "narHash": "sha256-WYNflttAMgF4cqQAUp58SW9QEFvTVdSKKq3pCMERR/A=",
         "owner": "nifoc",
         "repo": "nix-overlay",
-        "rev": "0da1ca819bf1e1a936b01a3109048b71b7836e2a",
+        "rev": "f5e9530ad81f51904b534e6ee32916f6d42505cc",
         "type": "github"
       },
       "original": {
diff --git a/home/config/nvim/nifoc/keymap.fnl b/home/config/nvim/nifoc/keymap.fnl
index 6c187eb..baaa519 100644
--- a/home/config/nvim/nifoc/keymap.fnl
+++ b/home/config/nvim/nifoc/keymap.fnl
@@ -88,6 +88,8 @@
     (keymap.set :n :<leader>tw
                 #(telescope-builtin.lsp_dynamic_workspace_symbols telescope-dropdown)
                 {:buffer bufnr :desc "LSP Workspace Symbols"})
+    (keymap.set :n :<leader>th #(vim.lsp.buf.inlay_hint bufnr nil)
+                {:buffer bufnr :desc "Toggle Inlay Hints"})
     (keymap.set :n :<leader>lca
                 #(telescope-builtin.lsp_code_actions telescope-dropdown)
                 {:buffer bufnr :desc "LSP Code Action"})
diff --git a/home/config/nvim/nifoc/theme.fnl b/home/config/nvim/nifoc/theme.fnl
index 2800f8c..bac8ec7 100644
--- a/home/config/nvim/nifoc/theme.fnl
+++ b/home/config/nvim/nifoc/theme.fnl
@@ -14,6 +14,7 @@
     (colorscheme :dracula)
     ;; LSP
     (highlight-link :LspCodeLens :Comment)
+    (highlight-link :LspInlayHint :Comment)
     ;; Tabline
     (highlight :TabLine {:fg mod.colors.comment :bg mod.colors.black})
     (highlight :TabLineSel {:fg mod.colors.white :bg mod.colors.bg})
diff --git a/home/config/nvim/plugins/lsp.fnl b/home/config/nvim/plugins/lsp.fnl
index ef2fafe..19e2c53 100644
--- a/home/config/nvim/plugins/lsp.fnl
+++ b/home/config/nvim/plugins/lsp.fnl
@@ -5,6 +5,14 @@
       formatting (require :nifoc.formatting)
       augroup (vim.api.nvim_create_augroup :NifocLsp {:clear true})
       aucmd vim.api.nvim_create_autocmd]
+  (fn setup-inlay-hint-toggle [bufnr]
+    (aucmd :InsertEnter {:callback #(vim.lsp.buf.inlay_hint bufnr false)
+                         :buffer bufnr
+                         :group augroup})
+    (aucmd :InsertLeave {:callback #(vim.lsp.buf.inlay_hint bufnr true)
+                         :buffer bufnr
+                         :group augroup}))
+
   ;; Attach
   (aucmd :LspAttach {:callback (fn [args]
                                  (let [client (vim.lsp.get_client_by_id args.data.client_id)
@@ -12,7 +20,8 @@
                                    (when (client.supports_method :textDocument/documentSymbol)
                                      (navic.attach client bufnr))
                                    (when (client.supports_method :textDocument/inlayHint)
-                                     (vim.lsp.buf.inlay_hint bufnr true))
+                                     (vim.lsp.buf.inlay_hint bufnr true)
+                                     (setup-inlay-hint-toggle bufnr))
                                    (diagnostic.maybe-enable-lsp client bufnr)
                                    (formatting.maybe-enable-lsp client bufnr)))
                      :group augroup
@@ -40,11 +49,21 @@
                              (vim.tbl_extend :force default-config)))
     (lsp.nil_ls.setup (->> {:settings {:nil {:formatting {:command [:nixpkgs-fmt]}}}}
                            (vim.tbl_extend :force default-config)))
-    (lsp.tsserver.setup (->> {:cmd [:typescript-language-server
-                                    :--stdio
-                                    :--tsserver-path
-                                    :tsserver]}
-                             (vim.tbl_extend :force default-config)))
+    (let [inlay-hints {:includeInlayParameterNameHints :all
+                       :includeInlayParameterNameHintsWhenArgumentMatchesName false
+                       :includeInlayFunctionParameterTypeHints true
+                       :includeInlayVariableTypeHints true
+                       :includeInlayVariableTypeHintsWhenTypeMatchesName false
+                       :includeInlayPropertyDeclarationTypeHints true
+                       :includeInlayFunctionLikeReturnTypeHints true
+                       :includeInlayEnumMemberValueHints true}]
+      (lsp.tsserver.setup (->> {:cmd [:typescript-language-server
+                                      :--stdio
+                                      :--tsserver-path
+                                      :tsserver]
+                                :settings {:typescript {:inlayHints inlay-hints}
+                                           :javascript {:inlayHints inlay-hints}}}
+                               (vim.tbl_extend :force default-config))))
     (lsp.solargraph.setup (->> {:settings {:solargraph {:diagnostics true}}}
                                (vim.tbl_extend :force default-config)))
     (lsp.lua_ls.setup (->> {:cmd [:lua-language-server]
diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix
index 3045e07..964b4ec 100644
--- a/home/programs/nvim/plugins.nix
+++ b/home/programs/nvim/plugins.nix
@@ -85,12 +85,12 @@ in
   };
   leap-nvim = buildVimPluginFrom2Nix {
     pname = "leap.nvim";
-    version = "2023-06-24";
+    version = "2023-06-26";
     src = fetchFromGitHub {
       owner = "ggandor";
       repo = "leap.nvim";
-      rev = "3cc0e6a0b99dc18d4e5a88baa3cbe3c7b8b34566";
-      sha256 = "1d8kzcg8cnzqjn02cdsmhx0hx2hsncxg2kacnsyzlzwwrcix2kg9";
+      rev = "3004104180391328fca40339587f254d835a9527";
+      sha256 = "1slpbs7x72xijbzmbhmlzylhpq02a4y98rnnk3lnsk3n37pfmn82";
       fetchSubmodules = false;
     };
   };
@@ -107,12 +107,12 @@ in
   };
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2023-06-25";
+    version = "2023-06-26";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "b75f79bc5f68b552743d2136b80fe545871d5501";
-      sha256 = "0qlzsvks17i2zcrn8izjkg3qv6cb5sr04zyz12dabhx0prqggxff";
+      rev = "d49ba798c95398e62321b40041e8ac4654fea251";
+      sha256 = "065qr5wsrd4hrf3hag6ak2acdnk2lsc6n41pykwhkgxcxhlwvv7d";
       fetchSubmodules = false;
     };
   };
@@ -572,12 +572,12 @@ in
   };
   noice-nvim = buildVimPluginFrom2Nix {
     pname = "noice.nvim";
-    version = "2023-06-25";
+    version = "2023-06-26";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "noice.nvim";
-      rev = "0d672bd66dc0f77715a20cd149a3afe2ca1fed6d";
-      sha256 = "1yv1pqh0559hl9kl9vfkd7vwljnlnzk6xhwfl0vc3zhij4b62bjj";
+      rev = "4f4a1702a3b2677878e68111af95cc4e775322e1";
+      sha256 = "0pi6hnx92d8p2bc5vrbhxqigs5qlkiiz79wpb7k5z8n0hckyvcgi";
       fetchSubmodules = false;
     };
   };
diff --git a/home/programs/ssh/shared/builder.nix b/home/programs/ssh/shared/builder.nix
index f6e59f6..0d831b3 100644
--- a/home/programs/ssh/shared/builder.nix
+++ b/home/programs/ssh/shared/builder.nix
@@ -23,5 +23,21 @@
       identityFile = "~/.ssh/LAN.pub";
       identitiesOnly = true;
     };
+
+    "builder-adsb-antenna" = {
+      hostname = "adsb-antenna.laniot";
+      port = 22;
+      user = "root";
+      identityFile = "~/.ssh/LAN.pub";
+      identitiesOnly = true;
+    };
+
+    "builder-weather-sdr" = {
+      hostname = "weather-sdr.laniot";
+      port = 22;
+      user = "root";
+      identityFile = "~/.ssh/LAN.pub";
+      identitiesOnly = true;
+    };
   };
 }
diff --git a/home/programs/ssh/shared/private.nix b/home/programs/ssh/shared/private.nix
index 7c15b83..73f0a4c 100644
--- a/home/programs/ssh/shared/private.nix
+++ b/home/programs/ssh/shared/private.nix
@@ -51,15 +51,6 @@
       identitiesOnly = true;
     };
 
-    "sail" = {
-      hostname = "sail.ts.kempkens.network";
-      port = 22;
-      user = "daniel";
-      forwardAgent = true;
-      identityFile = "~/.ssh/Hetzner.pub";
-      identitiesOnly = true;
-    };
-
     "tanker" = {
       hostname = "tanker.ts.kempkens.network";
       port = 22;
@@ -69,15 +60,6 @@
       identitiesOnly = true;
     };
 
-    "attic" = {
-      hostname = "attic.ts.kempkens.network";
-      port = 22;
-      user = "daniel";
-      forwardAgent = true;
-      identityFile = "~/.ssh/Hetzner.pub";
-      identitiesOnly = true;
-    };
-
     "mediaserver" = {
       hostname = "mediaserver.ts.kempkens.network";
       port = 22;
diff --git a/system/hosts/Styx.nix b/system/hosts/Styx.nix
index 1afb5b3..3013bf6 100644
--- a/system/hosts/Styx.nix
+++ b/system/hosts/Styx.nix
@@ -55,6 +55,18 @@
         systems = [ "aarch64-linux" ];
         maxJobs = 2;
       }
+
+      {
+        hostName = "builder-adsb-antenna";
+        systems = [ "aarch64-linux" ];
+        maxJobs = 1;
+      }
+
+      {
+        hostName = "builder-weather-sdr";
+        systems = [ "aarch64-linux" ];
+        maxJobs = 1;
+      }
     ];
 
     gc = {