treewide: reformat nixfmt-rfc-style
Reformat repository using new nixfmt-rfc-style.
This commit is contained in:
parent
5df48c4255
commit
cba2f9ce95
1051 changed files with 37028 additions and 26594 deletions
|
|
@ -1,9 +1,13 @@
|
|||
{ config, lib, ... }: {
|
||||
{ config, lib, ... }:
|
||||
{
|
||||
config = {
|
||||
programs.ssh = { enable = true; };
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
home.file.assertions.text = builtins.toJSON
|
||||
(map (a: a.message) (lib.filter (a: !a.assertion) config.assertions));
|
||||
home.file.assertions.text = builtins.toJSON (
|
||||
map (a: a.message) (lib.filter (a: !a.assertion) config.assertions)
|
||||
);
|
||||
|
||||
nmt.script = ''
|
||||
assertFileExists home-files/.ssh/config
|
||||
|
|
|
|||
|
|
@ -4,16 +4,10 @@
|
|||
ssh-match-blocks = ./match-blocks-attrs.nix;
|
||||
ssh-match-blocks-match-and-hosts = ./match-blocks-match-and-hosts.nix;
|
||||
|
||||
ssh-forwards-dynamic-valid-bind-no-asserts =
|
||||
./forwards-dynamic-valid-bind-no-asserts.nix;
|
||||
ssh-forwards-dynamic-bind-path-with-port-asserts =
|
||||
./forwards-dynamic-bind-path-with-port-asserts.nix;
|
||||
ssh-forwards-local-bind-path-with-port-asserts =
|
||||
./forwards-local-bind-path-with-port-asserts.nix;
|
||||
ssh-forwards-local-host-path-with-port-asserts =
|
||||
./forwards-local-host-path-with-port-asserts.nix;
|
||||
ssh-forwards-remote-bind-path-with-port-asserts =
|
||||
./forwards-remote-bind-path-with-port-asserts.nix;
|
||||
ssh-forwards-remote-host-path-with-port-asserts =
|
||||
./forwards-remote-host-path-with-port-asserts.nix;
|
||||
ssh-forwards-dynamic-valid-bind-no-asserts = ./forwards-dynamic-valid-bind-no-asserts.nix;
|
||||
ssh-forwards-dynamic-bind-path-with-port-asserts = ./forwards-dynamic-bind-path-with-port-asserts.nix;
|
||||
ssh-forwards-local-bind-path-with-port-asserts = ./forwards-local-bind-path-with-port-asserts.nix;
|
||||
ssh-forwards-local-host-path-with-port-asserts = ./forwards-local-host-path-with-port-asserts.nix;
|
||||
ssh-forwards-remote-bind-path-with-port-asserts = ./forwards-remote-bind-path-with-port-asserts.nix;
|
||||
ssh-forwards-remote-host-path-with-port-asserts = ./forwards-remote-host-path-with-port-asserts.nix;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,13 @@
|
|||
enable = true;
|
||||
matchBlocks = {
|
||||
dynamicBindPathWithPort = {
|
||||
dynamicForwards = [{
|
||||
# Error:
|
||||
address = "/run/user/1000/gnupg/S.gpg-agent.extra";
|
||||
port = 3000;
|
||||
}];
|
||||
dynamicForwards = [
|
||||
{
|
||||
# Error:
|
||||
address = "/run/user/1000/gnupg/S.gpg-agent.extra";
|
||||
port = 3000;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,27 +1,33 @@
|
|||
{ config, lib, ... }: {
|
||||
{ config, lib, ... }:
|
||||
{
|
||||
config = {
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
matchBlocks = {
|
||||
dynamicBindPathNoPort = {
|
||||
dynamicForwards = [{
|
||||
# OK:
|
||||
address = "/run/user/1000/gnupg/S.gpg-agent.extra";
|
||||
}];
|
||||
dynamicForwards = [
|
||||
{
|
||||
# OK:
|
||||
address = "/run/user/1000/gnupg/S.gpg-agent.extra";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
dynamicBindAddressWithPort = {
|
||||
dynamicForwards = [{
|
||||
# OK:
|
||||
address = "127.0.0.1";
|
||||
port = 3000;
|
||||
}];
|
||||
dynamicForwards = [
|
||||
{
|
||||
# OK:
|
||||
address = "127.0.0.1";
|
||||
port = 3000;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.file.result.text = builtins.toJSON
|
||||
(map (a: a.message) (lib.filter (a: !a.assertion) config.assertions));
|
||||
home.file.result.text = builtins.toJSON (
|
||||
map (a: a.message) (lib.filter (a: !a.assertion) config.assertions)
|
||||
);
|
||||
|
||||
nmt.script = ''
|
||||
assertFileExists home-files/.ssh/config
|
||||
|
|
|
|||
|
|
@ -4,15 +4,17 @@
|
|||
enable = true;
|
||||
matchBlocks = {
|
||||
localBindPathWithPort = {
|
||||
localForwards = [{
|
||||
# OK:
|
||||
host.address = "127.0.0.1";
|
||||
host.port = 3000;
|
||||
localForwards = [
|
||||
{
|
||||
# OK:
|
||||
host.address = "127.0.0.1";
|
||||
host.port = 3000;
|
||||
|
||||
# Error:
|
||||
bind.address = "/run/user/1000/gnupg/S.gpg-agent.extra";
|
||||
bind.port = 3000;
|
||||
}];
|
||||
# Error:
|
||||
bind.address = "/run/user/1000/gnupg/S.gpg-agent.extra";
|
||||
bind.port = 3000;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,15 +4,17 @@
|
|||
enable = true;
|
||||
matchBlocks = {
|
||||
localHostPathWithPort = {
|
||||
localForwards = [{
|
||||
# OK:
|
||||
bind.address = "127.0.0.1";
|
||||
bind.port = 3000;
|
||||
localForwards = [
|
||||
{
|
||||
# OK:
|
||||
bind.address = "127.0.0.1";
|
||||
bind.port = 3000;
|
||||
|
||||
# Error:
|
||||
host.address = "/run/user/1000/gnupg/S.gpg-agent.extra";
|
||||
host.port = 3000;
|
||||
}];
|
||||
# Error:
|
||||
host.address = "/run/user/1000/gnupg/S.gpg-agent.extra";
|
||||
host.port = 3000;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,15 +4,17 @@
|
|||
enable = true;
|
||||
matchBlocks = {
|
||||
remoteBindPathWithPort = {
|
||||
remoteForwards = [{
|
||||
# OK:
|
||||
host.address = "127.0.0.1";
|
||||
host.port = 3000;
|
||||
remoteForwards = [
|
||||
{
|
||||
# OK:
|
||||
host.address = "127.0.0.1";
|
||||
host.port = 3000;
|
||||
|
||||
# Error:
|
||||
bind.address = "/run/user/1000/gnupg/S.gpg-agent.extra";
|
||||
bind.port = 3000;
|
||||
}];
|
||||
# Error:
|
||||
bind.address = "/run/user/1000/gnupg/S.gpg-agent.extra";
|
||||
bind.port = 3000;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,15 +4,17 @@
|
|||
enable = true;
|
||||
matchBlocks = {
|
||||
remoteHostPathWithPort = {
|
||||
remoteForwards = [{
|
||||
# OK:
|
||||
bind.address = "127.0.0.1";
|
||||
bind.port = 3000;
|
||||
remoteForwards = [
|
||||
{
|
||||
# OK:
|
||||
bind.address = "127.0.0.1";
|
||||
bind.port = 3000;
|
||||
|
||||
# Error:
|
||||
host.address = "/run/user/1000/gnupg/S.gpg-agent.extra";
|
||||
host.port = 3000;
|
||||
}];
|
||||
# Error:
|
||||
host.address = "/run/user/1000/gnupg/S.gpg-agent.extra";
|
||||
host.port = 3000;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,10 +1,18 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
config = {
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
includes = [ "config.d/*" "other/dir" ];
|
||||
includes = [
|
||||
"config.d/*"
|
||||
"other/dir"
|
||||
];
|
||||
};
|
||||
|
||||
nmt.script = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ config, lib, ... }: {
|
||||
{ config, lib, ... }:
|
||||
{
|
||||
config = {
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
|
|
@ -14,11 +15,13 @@
|
|||
identityFile = "file";
|
||||
serverAliveInterval = 60;
|
||||
serverAliveCountMax = 10;
|
||||
localForwards = [{
|
||||
bind.port = 8080;
|
||||
host.address = "10.0.0.1";
|
||||
host.port = 80;
|
||||
}];
|
||||
localForwards = [
|
||||
{
|
||||
bind.port = 8080;
|
||||
host.address = "10.0.0.1";
|
||||
host.port = 80;
|
||||
}
|
||||
];
|
||||
remoteForwards = [
|
||||
{
|
||||
bind.port = 8081;
|
||||
|
|
@ -30,7 +33,7 @@
|
|||
host.address = "/run/user/1000/gnupg/S.gpg-agent";
|
||||
}
|
||||
];
|
||||
dynamicForwards = [{ port = 2839; }];
|
||||
dynamicForwards = [ { port = 2839; } ];
|
||||
setEnv = {
|
||||
FOO = "foo12";
|
||||
BAR = "_bar_ 42";
|
||||
|
|
@ -38,14 +41,18 @@
|
|||
};
|
||||
|
||||
"* !github.com" = {
|
||||
identityFile = [ "file1" "file2" ];
|
||||
identityFile = [
|
||||
"file1"
|
||||
"file2"
|
||||
];
|
||||
port = 516;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.file.assertions.text = builtins.toJSON
|
||||
(map (a: a.message) (lib.filter (a: !a.assertion) config.assertions));
|
||||
home.file.assertions.text = builtins.toJSON (
|
||||
map (a: a.message) (lib.filter (a: !a.assertion) config.assertions)
|
||||
);
|
||||
|
||||
nmt.script = ''
|
||||
assertFileExists home-files/.ssh/config
|
||||
|
|
|
|||
|
|
@ -1,21 +1,27 @@
|
|||
{ config, lib, ... }: {
|
||||
{ config, lib, ... }:
|
||||
{
|
||||
config = {
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
matchBlocks = {
|
||||
abc = { port = 2222; };
|
||||
abc = {
|
||||
port = 2222;
|
||||
};
|
||||
|
||||
xyz = {
|
||||
match = "host xyz canonical";
|
||||
port = 2223;
|
||||
};
|
||||
|
||||
"* !github.com" = { port = 516; };
|
||||
"* !github.com" = {
|
||||
port = 516;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.file.assertions.text = builtins.toJSON
|
||||
(map (a: a.message) (lib.filter (a: !a.assertion) config.assertions));
|
||||
home.file.assertions.text = builtins.toJSON (
|
||||
map (a: a.message) (lib.filter (a: !a.assertion) config.assertions)
|
||||
);
|
||||
|
||||
nmt.script = ''
|
||||
assertFileExists home-files/.ssh/config
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue