punkfairie/marleyos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Preparing to deploy on marley{centre,net}

Browse source
This commit is contained in:
punkfairie 2025-03-08 20:20:53 -08:00
parent 48d0b83539
commit 82d6747d8b
Signed by: punkfairie
GPG key ID: B3C5488E9A1A7CA6
5 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/home/programs/cli/ssh/default.nix
View file

@ -15,12 +15,12 @@ in {
# %d - local user's home directory # %d - local user's home directory
# %r - remote username # %r - remote username
matchBlocks = { matchBlocks = {
"tty.marleycentre" = { "marleycentre" = {
hostname = "10.10.10.69"; hostname = "10.10.10.69";
identityFile = "%d/.ssh/%r@marleycentre"; identityFile = "%d/.ssh/%r@marleycentre";
}; };
"tty.marleynet" = { "marleynet" = {
hostname = "10.69.69.2"; hostname = "10.69.69.2";
port = 222; port = 222;
identityFile = "%d/.ssh/%r@marleynet"; identityFile = "%d/.ssh/%r@marleynet";

1
modules/nixos/bundles/server/default.nix
View file

@ -23,7 +23,6 @@ in {
}; };
services = { services = {
ddclient = enabled;
docker = enabled; docker = enabled;
openssh = enabled; openssh = enabled;
}; };

2
modules/nixos/services/openssh/default.nix
View file

@ -11,7 +11,7 @@ in {
services.openssh = { services.openssh = {
enable = true; enable = true;
settings = { settings = {
PermitRootLogin = "no"; PermitRootLogin = "prohibit-password";
}; };
}; };
}; };

16
systems/x86_64-linux/marleycentre/default.nix
View file

@ -9,12 +9,18 @@ in {
bundles.server = enabled; bundles.server = enabled;
}; };
users.users.marley.openssh.authorizedKeys.keys = [ users.users = {
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAHOJsPkSBBw03QEFRtxnIdLF3OxNdU6T9LuklnkYfVw marley@nyx" marley.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAHOJsPkSBBw03QEFRtxnIdLF3OxNdU6T9LuklnkYfVw marley@nyx"
# iphone # iphone
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+hMOzQBPmi6Rjw7fYvwn43w1Dgk+GEooGPnQz2RTcK Generated By Termius" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+hMOzQBPmi6Rjw7fYvwn43w1Dgk+GEooGPnQz2RTcK Generated By Termius"
]; ];
root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBvLgGqr22sT1e+pvda5VDA92uCbVHbd61AjIQOA7pXZ marley@nyx"
];
};
networking.firewall = { networking.firewall = {
allowedTCPPorts = [6881]; allowedTCPPorts = [6881];

15
systems/x86_64-linux/marleynet/default.nix
View file

@ -7,14 +7,19 @@ in {
marleyos = { marleyos = {
bundles.server = enabled; bundles.server = enabled;
services.ddclient = enabled;
}; };
users.users.marley.openssh.authorizedKeys.keys = [ users.users = {
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDcKsDGK8C5W6eRsJQSdAOTFVZnkKRWjnyn4iDR8zMi7 marley@nyx" marley.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDcKsDGK8C5W6eRsJQSdAOTFVZnkKRWjnyn4iDR8zMi7 marley@nyx"
# iphone # iphone
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+hMOzQBPmi6Rjw7fYvwn43w1Dgk+GEooGPnQz2RTcK Generated By Termius" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+hMOzQBPmi6Rjw7fYvwn43w1Dgk+GEooGPnQz2RTcK Generated By Termius"
]; ];
root.openssh.authorizedKeys.keys = [];
};
system.stateVersion = "24.05"; system.stateVersion = "24.05";
} }