feat: move MOMO to cloud.oracle.com
This commit is contained in:
parent
7dab99bd6d
commit
2ae9fa7b88
18 changed files with 52 additions and 68 deletions
12
flake.lock
generated
12
flake.lock
generated
|
|
@ -104,11 +104,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764522689,
|
"lastModified": 1764677808,
|
||||||
"narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
|
"narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
|
"rev": "1aab89277eb2d87823d5b69bae631a2496cff57a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -120,11 +120,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764517877,
|
"lastModified": 1764667669,
|
||||||
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
|
"narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
|
"rev": "418468ac9527e799809c900eda37cbff999199b6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,10 @@
|
||||||
{ system.stateVersion = state; }
|
{ system.stateVersion = state; }
|
||||||
agenix.nixosModules.default
|
agenix.nixosModules.default
|
||||||
disko.nixosModules.disko
|
disko.nixosModules.disko
|
||||||
{ environment.systemPackages = [ agenix.packages.${sys}.default ]; }
|
{
|
||||||
|
nixpkgs.hostPlatform = nixpkgs.lib.mkDefault sys;
|
||||||
|
environment.systemPackages = [ agenix.packages.${sys}.default ];
|
||||||
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -40,7 +43,7 @@
|
||||||
nixosConfigurations = nixpkgs.lib.mergeAttrsList (
|
nixosConfigurations = nixpkgs.lib.mergeAttrsList (
|
||||||
nixpkgs.lib.forEach [
|
nixpkgs.lib.forEach [
|
||||||
[ "APPA" "x86_64-linux" "23.05" ]
|
[ "APPA" "x86_64-linux" "23.05" ]
|
||||||
[ "MOMO" "x86_64-linux" "23.05" ]
|
[ "MOMO" "aarch64-linux" "25.11" ]
|
||||||
[ "PABU" "x86_64-linux" "24.05" ]
|
[ "PABU" "x86_64-linux" "24.05" ]
|
||||||
] (uncurry mkSystem)
|
] (uncurry mkSystem)
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -70,12 +70,7 @@
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
domain = "momo.dryb.org";
|
domain = "momo.dryb.org";
|
||||||
answer = "188.245.216.128";
|
answer = "144.24.175.22";
|
||||||
enabled = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
domain = "momo.dryb.org";
|
|
||||||
answer = "2a01:4f8:1c1e:8abc::1";
|
|
||||||
enabled = true;
|
enabled = true;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,8 @@
|
||||||
|
|
||||||
services.logind.settings.Login.HandleLidSwitch = "ignore";
|
services.logind.settings.Login.HandleLidSwitch = "ignore";
|
||||||
|
|
||||||
|
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||||
|
|
||||||
users.groups.media = { };
|
users.groups.media = { };
|
||||||
systemd.tmpfiles.rules = [ "d /var/lib/media 2770 root media" ];
|
systemd.tmpfiles.rules = [ "d /var/lib/media 2770 root media" ];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,13 +7,6 @@
|
||||||
../../modules
|
../../modules
|
||||||
];
|
];
|
||||||
|
|
||||||
bchmnn = {
|
|
||||||
network = {
|
|
||||||
resolved.enable = true;
|
|
||||||
networkd.enable = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
settings = {
|
settings = {
|
||||||
PasswordAuthentication = false;
|
PasswordAuthentication = false;
|
||||||
|
|
|
||||||
|
|
@ -44,25 +44,15 @@
|
||||||
};
|
};
|
||||||
root = {
|
root = {
|
||||||
name = "ROOT";
|
name = "ROOT";
|
||||||
end = "-8G";
|
size = "100%";
|
||||||
content = {
|
content = {
|
||||||
type = "filesystem";
|
type = "filesystem";
|
||||||
format = "ext4";
|
format = "ext4";
|
||||||
mountpoint = "/";
|
mountpoint = "/";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plainSwap = {
|
|
||||||
size = "100%";
|
|
||||||
content = {
|
|
||||||
type = "swap";
|
|
||||||
discardPolicy = "both";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.useDHCP = lib.mkDefault true;
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,27 @@
|
||||||
{ ... }:
|
{ lib, ... }:
|
||||||
{
|
{
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "MOMO";
|
hostName = "MOMO";
|
||||||
interfaces.enp1s0 = {
|
defaultGateway = "10.0.0.1";
|
||||||
ipv6.addresses = [
|
nameservers = [
|
||||||
|
"9.9.9.9"
|
||||||
|
"149.112.112.112"
|
||||||
|
"2620:fe::fe"
|
||||||
|
"2620:fe::9"
|
||||||
|
];
|
||||||
|
interfaces.enp0s6 = {
|
||||||
|
ipv4.addresses = [
|
||||||
{
|
{
|
||||||
address = "2a01:4f8:1c1e:8abc::1";
|
address = "10.0.0.183";
|
||||||
prefixLength = 64;
|
prefixLength = 24;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
defaultGateway6 = {
|
defaultGateway6 = {
|
||||||
address = "fe80::1";
|
address = "fe80::1";
|
||||||
interface = "enp1s0";
|
interface = "enp0s6";
|
||||||
};
|
};
|
||||||
nameservers = [
|
|
||||||
"2a01:4ff:ff00::add:1"
|
|
||||||
"2a01:4ff:ff00::add:2"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
networking.useDHCP = lib.mkDefault true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,6 @@
|
||||||
# stuff
|
# stuff
|
||||||
nixd
|
nixd
|
||||||
nixfmt-rfc-style
|
nixfmt-rfc-style
|
||||||
inputs.agenix.packages.x86_64-linux.default
|
|
||||||
nix-output-monitor
|
nix-output-monitor
|
||||||
nvd
|
nvd
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -10,12 +10,6 @@
|
||||||
nm = {
|
nm = {
|
||||||
enable = lib.mkEnableOption "nm";
|
enable = lib.mkEnableOption "nm";
|
||||||
};
|
};
|
||||||
resolved = {
|
|
||||||
enable = lib.mkEnableOption "resolved";
|
|
||||||
};
|
|
||||||
networkd = {
|
|
||||||
enable = lib.mkEnableOption "networkd";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
config = {
|
config = {
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,11 +1,11 @@
|
||||||
age-encryption.org/v1
|
age-encryption.org/v1
|
||||||
-> ssh-ed25519 lfMVeg ejjgNEnMOnPNlvp6kHNN4+FTaURnw/khEyk71q4pmX4
|
-> ssh-ed25519 lfMVeg sKw7P77Yj9ihIeOHoc02ZBEWJf79TK6DnrgB/486J0E
|
||||||
GO80ST5fOV2OggwXXnRxahancZJnSOE6XhKIzanf6xM
|
YtZ7tkjnWH23rHN1XoWVvXIkCh9X5fTNXZq2sveiWCI
|
||||||
-> ssh-ed25519 ueRyzQ 4Wl+WB42XSsp6vplm22uAEeWP9TqxMcdmjlFGr7dCAo
|
-> ssh-ed25519 ueRyzQ dVvsSHh6jrphQUAu3Rz74JoW0+I/ta4lEy1c4kxYywo
|
||||||
/IO0WGVrMQOaFq61E+xp9Lxdv2qRhvrabNV0UUqZ5QI
|
5bJw1bOwbxtdC63g74ey+4WDEXr55itKBhGF3jqxEyM
|
||||||
-> ssh-ed25519 IYnDOQ UM+pMKLlneDup00dYXRz3vIWY5LTbFRhpKE2KkT5RFM
|
-> ssh-ed25519 IYnDOQ R4qlE6Tr56MrRz8LJlmsUyyMtOGnWK2n+UNpdiHr9Ac
|
||||||
2/c1gonJkrk5Cwngks/Ib+IVNOWSuJmX4YymwvYv4x8
|
kgCdfY+LRb7SGnx6trr7bE9oxku3XJoeVKnXpNMK5JY
|
||||||
--- fUKSKeqg8Y9qCdKg0lZpL1OPZDkRgnmsHo16owGX1nM
|
-> ssh-ed25519 HDF3Lg s+ztnMwn83F4Fj4sTT7ejYxfKnjg5dPTMgoKLFOMHh8
|
||||||
ïsÒÍn–
|
bPbOkHMseBCzExS7FURgVzQEp2iTT/is/FL9V2bw8nE
|
||||||
š3dì„k²G4ÿóÊÉ@QñHá6?,4Td"P ˆÿ ß`º|
;`ÖRŸgt¯
|
--- tDGtEh6zW4CoInvkAd5YPzGnv+erMiSyZcpkA9/H+6Q
|
||||||
]?‰M7Ó·úàÐþ<C390>Æ@•¢KäPÑt¶
|
·TÔŒ+üGZ@Ö“äx¾>5jjÊ•s?·šRè•ÙDmò¯µRVhx‰áIò9‰Í›¸–ûøüTOE:Å/©xÕËÄXcJ‚TŽ1c
|
||||||
Binary file not shown.
|
|
@ -1,9 +1,12 @@
|
||||||
age-encryption.org/v1
|
age-encryption.org/v1
|
||||||
-> ssh-ed25519 lfMVeg cuYTx24l4NmkI6j3/LXlK/7AoSmGn91bVwsALwyEeg8
|
-> ssh-ed25519 lfMVeg THPNrpb41SFy4x4+D3ZrMf8AuoRL8MQpn6DbCcEGgH4
|
||||||
u8kIquf9+b1D3pL2MWKk/uInbI+0IcNK7Cpe2fzmtFk
|
Qbo7PCCPwGhaMyEa2gRjmaN6t3us6NfG78r5h98rpZo
|
||||||
-> ssh-ed25519 ueRyzQ Ee63Opci8c5srBzPKRLK3AF5SGwC6MqGcKbHS1hlwX4
|
-> ssh-ed25519 ueRyzQ jnoSbBMvEZAH/oHNqVr3T6ytyQ7/UQ/YCGzNy7a2YHI
|
||||||
2Sg/l9fADn6uFV2eRtV9cwluCGtateXR/fDF1n8+BLs
|
9wBXCDaemGH0qUnNYqoqU6BCsBLBzqEEFsICvrIqYLk
|
||||||
-> ssh-ed25519 IYnDOQ Fg5g+CIqJu08ApVV5zdPqXPvQ4PaC1MiYG2ANNEVMnE
|
-> ssh-ed25519 IYnDOQ TQN80BmcNxz6vD6adPftf4oGkB1oQXU7HuWkKfGFpgs
|
||||||
8DjMqxmcutUDD455tQDtcA76dedfqicO0CoBpjaWssI
|
P9FUyS+0muH8LUUDe2wqGY8gcIKyom6iuO9EqCGT1YM
|
||||||
--- H/6V7b1UEtCW0BbLpEwSm3T2M9kvYC/83wIKsDwZve8
|
-> ssh-ed25519 HDF3Lg V47k+SMUvuCCnsLXbhgicyFZERGXhRfJPFw0bHqZFHk
|
||||||
ù¶VÔxÌnËüfL´!÷ÁÛ€:àb›¡Ã`ö罋‹,Ky“¡¼-hI¨O6<0F>êVD2XŒÍ&Vq@“?
|
MkrS7g7R5NhoWvdXbJ4mx6ZgCq2ABUgsyq+KMLnLRd4
|
||||||
|
--- N3GpbRoA+uqRkbnLAIaihurobQRgiEWGAQSPCHH3V8M
|
||||||
|
Ü…ºÈi
|
||||||
|
,±˜ùïÑœií¹®ŸkÃâé>‡o$ïƒñcÕ$mò~¼Ù¨z€Rø69³ÈkèþPoŒH8ßSf
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
let
|
let
|
||||||
APPA = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGvQbYHiB17BfsvHBgPYJN50Th+da+rtbsTIjOSaT+1Y root@APPA";
|
APPA = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGvQbYHiB17BfsvHBgPYJN50Th+da+rtbsTIjOSaT+1Y root@APPA";
|
||||||
MOMO = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQ8YOOaQj3NnMlTjlFX9iWDIpPMrO2W4EkL65GJP+y4 root@MOMO";
|
MOMO = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMHuXl/Llex0+xBmDJmJkwp4kT3mWRTfRPeyJDHgAJzM root@MOMO";
|
||||||
|
|
||||||
gandalf = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAOG8Sja2i6nepkEkuxYdu86XbT9vS5uniBmZifSMZ0t jacob.bachmann@posteo.de";
|
gandalf = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAOG8Sja2i6nepkEkuxYdu86XbT9vS5uniBmZifSMZ0t jacob.bachmann@posteo.de";
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue