From b322d26cdaf56a8928c0ce8366820601223de641 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Thu, 4 Aug 2022 20:11:40 +0200 Subject: [PATCH] adsb: Rename some variables --- container/adsb/default.nix | 4 ++-- flake.lock | 24 ++++++++++++------------ home/programs/nvim/plugins.nix | 10 +++++----- home/programs/ssh.nix | 26 +++++++++++++++----------- secret/container/adsb/default.nix | Bin 444 -> 442 bytes secret/hosts/sail.nix | Bin 396 -> 427 bytes system/hosts/Styx.nix | 8 ++++++++ 7 files changed, 42 insertions(+), 30 deletions(-) diff --git a/container/adsb/default.nix b/container/adsb/default.nix index 2ebbbab..93916e4 100644 --- a/container/adsb/default.nix +++ b/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" diff --git a/flake.lock b/flake.lock index 81ee858..e344c24 100644 --- a/flake.lock +++ b/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": { diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index ef25bf1..7301803 100644 --- a/home/programs/nvim/plugins.nix +++ b/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; }; }; diff --git a/home/programs/ssh.nix b/home/programs/ssh.nix index ceafb76..a35485c 100644 --- a/home/programs/ssh.nix +++ b/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; diff --git a/secret/container/adsb/default.nix b/secret/container/adsb/default.nix index 99bb50e0077cd64f08a4b00293cef845e7999b20..c76e99e705f2a9ada873aa099abd4d39c4891de2 100644 GIT binary patch literal 442 zcmV;r0Y&}*M@dveQdv+`01_h=5M^!~s3#iY2;YxDVwEFNxG+fOq~`;w(J}c{)L59^ zUb5_EEt47@`DwHJ)42lp_F1U`w?|?KivODTtjkZ_XT9Zc{M#MieR9^_wI{DkhKKiq*dAM4Z(c; zWU2VwGJ@}b1{zQ#a5ltM%M}Yet<3FTVrceGDy?7q)V7d`Yd&g#x&oAs({2zd|KBuc zh3F4P%7L(WdO|z*^&PWDUvB|%gHVU(yEKdo{xPZ3dB@!g=T41=Ed}fbX3M!BkfXCA zLrp>jLuWP&E(u$B#q3qok-D8qCT!>j=gDAJY;ZHnxOr4h7z6N*$6N!Potu3U)4FLR zqGbie@LY=N-5y;DfO^pHVLW&zsj*xtnAGO|Q~jv#xCe{uST0B5PG z^%2ME?7PdNn0fE)0K##y6#fx!2i6(zE1cokVvfWALiROnHZ<*TO>z=#d3j6=lDA>| k)>eudQEd($2*^Aonuc>&^c^UN+Q2>E0-9zj=!dV^tpET3 literal 444 zcmV;t0Ym-(M@dveQdv+`0Q8}XU{9+|F<-+fmeOEiJoDkhX%m?+lyeBYnw;$bN7Bzg zw~cTlw}Qn&dZrx&cSYj}nQ$=RV-r)Hwp|B$(=|khH@vF(0l*0`@oNx55o$a;NX`2W zWU5XJDon!4gus%4r}WS1IHB3$aE69crT2VTFLhVfbVP>)c~W4|aeRDF-m~Gw$(H-z z6TXcZks*%`Ug5!zs)`~CURQlW%iKje{K=KS^~3Y4_Usr^3a6t^;u6swD*{)6u3T$~dk zz&$d>Ft8K3AG1S2--nqY;~hcT0!O*4qb2Kr3qWb-=it{lEdyWciPxqG(u#Lf&)^ mr!)ew*;2Qw8#2Ik1OtN2M;|bDxy*EAPi%O)2^Nv;$DP{(p4E;3 diff --git a/secret/hosts/sail.nix b/secret/hosts/sail.nix index a61b649c7288db502aac83156f387109637b2ea9..87eb0186298eb31c202cdac46749dec891ae0a33 100644 GIT binary patch literal 427 zcmV;c0aX3~M@dveQdv+`09!KO4pC*6j@5r7`(x`<@?%SOdSCSEm{Ys?X2rJ}E8cm^ zPk8QZVtbKBejQRf%8c&#TcK{w?jc0ARv}b`p z?m(|M|)p6&1-JpD9y9RU*xf3iC}m2 zGNdQU&8ul~{%I9Z=*YM!fvplD8f5kia8+|Ze&LB7%LOP_&z*hlLGuaICf?~(qg+k5 zTvx@_)lFt47t@Qk0v@3}8KH9=sHxwpCPX_SDVZ`I%1Bzx*OmOV7vCGC{~an0bW8G1 zG$(I^yV0FS$aGfyl0qkL22XtU)j4Bdtn-_-)5U-u*&OetMfn(CCNoB;b7{+RK zN|`7LG?(5EMme8%|3IinS<~JU-Q=c2Se$ff`)X65=3ORI6coPl2bgF# VnE)uI2Z8*IzX-ns6gj^dgWlFm(5Ci-xq>1a!)ba=gSRjKPnNrm5mw zPD{1ENf=+DC8dmT){uGcV;_sygM`_UUO8F{Cur^fUe-Clvm*g^qy+u5&QF=EtJn8- zL7W1wmUZ+>94}?#2wUZd5T@)GJGf#sGSc24w%At0c}Zuv4My%r*uVAeQX_0zSzEPc zjjyv7sj#~QKc`SzlAIfu;AeK&3hQNBBm*c$CEeyeqbT8U9%3r^#n-Rk`?lTM7zH6+ zC&$0A`~&LfVOznzb&Z=Tb_W&#T6YX{|NX!mak2Bj2!}>w1!qoZk4Z205L~D2g3wyv zYOs(?IrG{rVP{?)zOwJT8qfcBb%c7=B8i^cm7AjhsK