daniel/dotfiles
1
0
Fork 0
Code Activity Actions 1

adsb: Rename some variables

Browse source
This commit is contained in:
Daniel Kempkens 2022-08-04 20:11:40 +02:00
parent 7c4712928d
commit b322d26cda
7 changed files with 42 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
container/adsb/default.nix
View file

@ -74,7 +74,7 @@ in
"MLATPORT" = "30105"; "MLATPORT" = "30105";
"LAT" = secret.container.adsb.readsb.lat; "LAT" = secret.container.adsb.readsb.lat;
"LONG" = secret.container.adsb.readsb.lon; "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_FLIGHTAWARELINKS" = "true";
"TAR1090_DISPLAYUNITS" = "metric"; "TAR1090_DISPLAYUNITS" = "metric";
}; };
@ -142,7 +142,7 @@ in
"MLAT_RESULTS" = "yes"; "MLAT_RESULTS" = "yes";
"LAT" = secret.container.adsb.readsb.lat; "LAT" = secret.container.adsb.readsb.lat;
"LONG" = secret.container.adsb.readsb.lon; "LONG" = secret.container.adsb.readsb.lon;
"FEEDER_ID" = secret.container.adsb.piaware.feeder-id; "FEEDER_ID" = secret.container.adsb.piaware.feederId;
}; };
tmpfs = [ tmpfs = [
"/run:exec,size=64M" "/run:exec,size=64M"

24
flake.lock
View file

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

10
home/programs/nvim/plugins.nix
View file

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

26
home/programs/ssh.nix
View file

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

BIN
secret/container/adsb/default.nix
View file

Binary file not shown.

BIN
secret/hosts/sail.nix
View file

Binary file not shown.

8
system/hosts/Styx.nix
View file

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