pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move SSH configs into specific collections

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-05-05 13:20:32 +01:00
parent 00dfa03827
commit 5002cf9d48
3 changed files with 41 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
home/collections/personal/default.nix
View file

@ -4,6 +4,19 @@
../common/desktop.nix ../common/desktop.nix
../../git/personal.nix ../../git/personal.nix
]; ];
programs.ssh.matchBlocks = {
"legion xenia xenia.me.uk" = {
user = "xenia";
hostname = "xenia.me.uk";
port = 30;
forwardAgent = true;
};
"vanguard" = {
user = "xenia";
hostname = "192.168.1.166";
forwardAgent = true;
};
};
home.packages = with pkgs; [ home.packages = with pkgs; [
discord discord
element-desktop element-desktop

27
home/collections/work/default.nix
View file

@ -1,9 +1,34 @@
{ pkgs, ... }: { pkgs, lib, ... }:
{ {
imports = [ imports = [
../common/desktop.nix ../common/desktop.nix
../../git/work.nix ../../git/work.nix
]; ];
programs.ssh.matchBlocks = {
"batch" = {
user = "cxsbatch";
hostname = "heimdall115.jetdata.eu";
};
"jupyter" = {
hostname = "freia022.hpc.l";
localForwards = [
{
bind.port = 6702;
host.address = "localhost";
host.port = 6702;
}
];
};
"freia" = {
hostname = "freia022.hpc.l";
};
"freia???" = lib.hm.dag.entryAfter [ "freia" ] {
hostname = "%h.hpc.l";
};
"freia* jupyter" = lib.hm.dag.entryAfter [ "freia" "freia???" "jupyter" ] {
user = "elitherl";
};
};
home.packages = with pkgs; [ home.packages = with pkgs; [
libreoffice-fresh libreoffice-fresh
neovide neovide

37
home/env/ssh.nix vendored
View file

@ -1,4 +1,4 @@
{ pkgs, lib, ... }: { pkgs, ... }:
{ {
programs.ssh = { programs.ssh = {
enable = true; enable = true;
@ -7,40 +7,7 @@
serverAliveCountMax = 3; serverAliveCountMax = 3;
controlMaster = "auto"; controlMaster = "auto";
controlPersist = "1s"; controlPersist = "1s";
matchBlocks = { matchBlocks."git.*".user = "git";
"legion xenia xenia.me.uk" = {
user = "xenia";
hostname = "xenia.me.uk";
port = 30;
forwardAgent = true;
};
"vanguard" = {
user = "xenia";
hostname = "192.168.1.166";
forwardAgent = true;
};
"git.ccfe.ac.uk".user = "git";
"batch" = {
user = "cxsbatch";
hostname = "heimdall115.jetdata.eu";
};
"freia" = {
hostname = "freia022.hpc.l";
remoteForwards = [
{
bind.port = 6702;
host.address = "localhost";
host.port = 6702;
}
];
};
"freia???" = lib.hm.dag.entryAfter ["freia"] {
hostname = "%h.hpc.l";
};
"freia*" = lib.hm.dag.entryAfter ["freia???"] {
user = "elitherl";
};
};
}; };
home.packages = with pkgs; [ sshfs ]; home.packages = with pkgs; [ sshfs ];
} }