diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix
index fbe11f64..0ae31965 100644
--- a/provision/hosts/kestrel/configuration.nix
+++ b/provision/hosts/kestrel/configuration.nix
@@ -62,13 +62,6 @@
backup.enable = true;
ssh.enable = true;
terminal.enable = true;
- wireguard-client = {
- enable = true;
- privateKeyFile = "/run/agenix/wireguard/kestrel";
- address = [ "192.168.3.3/24" ];
- publicKey = "bd7bbZOngl/FTdBlnbIhgCLNf6yx5X8WjiRB7E1NEQQ=";
- endpoint = "66.218.43.87";
- };
};
};
}
diff --git a/provision/hosts/osprey/configuration.nix b/provision/hosts/osprey/configuration.nix
index c3b936c6..b8040668 100644
--- a/provision/hosts/osprey/configuration.nix
+++ b/provision/hosts/osprey/configuration.nix
@@ -8,13 +8,23 @@
# Set networking options
networking.hostName = "osprey";
- networking.firewall.checkReversePath = "loose";
+ networking.firewall.checkReversePath = false;
networking.firewall.enable = false;
# Enable docker
- virtualisation.docker.enable = true;
+ virtualisation.containers.enable = true;
+ virtualisation = {
+ podman = {
+ enable = true;
+ dockerCompat = true;
+ defaultNetwork.settings.dns_enabled = true;
+ };
+ };
environment.systemPackages = with pkgs; [
+ docker-compose
+ podman-tui
+ dive
];
# Modules
@@ -39,13 +49,6 @@
system = {
ssh.enable = true;
terminal.enable = true;
- #wireguard-client = {
- # enable = true;
- # privateKeyFile = "/run/agenix/wireguard/kestrel";
- # address = [ "192.168.3.3/24" ];
- # publicKey = "bd7bbZOngl/FTdBlnbIhgCLNf6yx5X8WjiRB7E1NEQQ=";
- # endpoint = "66.218.43.87";
- #};
};
};
}
diff --git a/provision/hosts/torus/wireguard-server.nix b/provision/hosts/torus/wireguard-server.nix
index c53df8d1..8d70ea87 100644
--- a/provision/hosts/torus/wireguard-server.nix
+++ b/provision/hosts/torus/wireguard-server.nix
@@ -57,6 +57,11 @@
publicKey = "CDoy/XI8FRQV/ySHigLWG2tpWVw8hgEZXRQCEE3qYHQ=";
allowedIPs = [ "192.168.3.4/32" ];
}
+ {
+ # Osprey
+ publicKey = "mhOhkQMF4IxvJbd2FweGlwo7HCNCXupMxlnt1QQFyHg=";
+ allowedIPs = [ "192.168.3.5/32" ];
+ }
# More peers can be added here.
];
};
diff --git a/provision/modules/system/default.nix b/provision/modules/system/default.nix
index 462c0f4d..b2e001a1 100644
--- a/provision/modules/system/default.nix
+++ b/provision/modules/system/default.nix
@@ -1,4 +1,4 @@
{ ... }:
{
- imports = [ ./backup.nix ./ssh.nix ./terminal.nix ./wireguard-client.nix ];
+ imports = [ ./backup.nix ./ssh.nix ./terminal.nix ];
}
diff --git a/provision/modules/system/wireguard-client.nix b/provision/modules/system/wireguard-client.nix
deleted file mode 100644
index 16e4042b..00000000
--- a/provision/modules/system/wireguard-client.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ config, lib, pkgs, user, ... }:
-
-let cfg = config.modules.system.wireguard-client;
-
-in {
- options.modules.system.wireguard-client = with lib; {
- enable = lib.mkEnableOption "wireguard-client";
- privateKeyFile = lib.mkOption { type = with types; str; };
- address = lib.mkOption { type = with types; listOf str; };
- publicKey = lib.mkOption { type = with types; str; };
- endpoint = lib.mkOption { type = with types; str; };
- autostart = lib.mkOption {
- type = with types; bool;
- default = false;
- };
- };
-
- config = lib.mkIf cfg.enable {
- # Create qr code for phones with:
- # qrencode -t ansiutf8 < myfile_here
- environment.systemPackages = with pkgs; [
- qrencode # Command-line utility for generating QR codes from text or data.
- ];
- networking.firewall = {
- allowedUDPPorts = [ 51820 ];
- };
- networking.wg-quick.interfaces = {
- wg0 = {
- address = cfg.address;
- listenPort = 51820;
- privateKeyFile = cfg.privateKeyFile;
- autostart = cfg.autostart;
- peers = [{
- publicKey = cfg.publicKey;
- allowedIPs = [ "0.0.0.0/0" "::/0" ];
- endpoint = "${cfg.endpoint}:51820";
- persistentKeepalive = 25;
- }];
- };
- };
- };
-}
diff --git a/provision/secrets/borg/rsync/id_rsa.age b/provision/secrets/borg/rsync/id_rsa.age
index b7ad3205..3d5cd442 100644
Binary files a/provision/secrets/borg/rsync/id_rsa.age and b/provision/secrets/borg/rsync/id_rsa.age differ
diff --git a/provision/secrets/borg/rsync/id_rsa.pub.age b/provision/secrets/borg/rsync/id_rsa.pub.age
index ea915d00..661b4530 100644
Binary files a/provision/secrets/borg/rsync/id_rsa.pub.age and b/provision/secrets/borg/rsync/id_rsa.pub.age differ
diff --git a/provision/secrets/borg/torus/password.age b/provision/secrets/borg/torus/password.age
index c10b54f0..56916499 100644
--- a/provision/secrets/borg/torus/password.age
+++ b/provision/secrets/borg/torus/password.age
@@ -1,11 +1,12 @@
age-encryption.org/v1
--> ssh-ed25519 6UNP1Q 6s8KZWviujiW5OuQpyOTC+cI5xf+70yqRihTs3w4TSQ
-CHKfAquKUQOvZ00wNgrA/F65406jpqGqcbbjXVlEz3Y
--> ssh-ed25519 Fz/sQw L7IS/yJc0K/gwLGdPN/KTSi3DQth7MPCqu4kGEkjhHk
-JlKbG6mkp+lqLxvrW/MTZ5cJpMijUurn/knLlCNC9lI
--> ssh-ed25519 47GzQA b0EozU39H/+85A2YA+mlIqV8W/Z38Qz3jzmQ2+4paAk
-3VOuwAthzHh8bf5M50qxt9mnlvnH1P8pgb6yA7PXnUw
--> ssh-ed25519 wcI7nQ xH7nDxAYCLwIOgkoTRrGazV6EU1HJDpB/c0AoQiSehA
-jIv44e1FWCz7d5vZodYktUYJgVEbIE472K1UEMquaKE
---- 0YRStYFEOyTVnAy+WpjGXxQSGYqAYT+QPUx2pJUBCX0
-~-=
ssh-ed25519 Fz/sQw BG3gSzOt4NnYg4tvUrpHyDN5YxAmhTqCQl9mg8VahQ8
+pT7jHwgWqED0EhSW4u/2IAk9sic7EsBH/kuLCMz2S/Q
+-> ssh-ed25519 47GzQA iX0HbkZepBtkECohQAdQUKmIr99gbqRjsR5sludsz28
+Dc2uPbvI5TEH/smYEhD9iKfV4d6m77YbI0KtCBDj4Tw
+-> ssh-ed25519 wcI7nQ 1v2XY19GWty042MUE7CqNeS1dfoHnyU29oXqk2OLBSU
+GV6pwIQNwBIh53jPzCvbj3JC9pm2iNJ7ffaL6IoqqTc
+-> ssh-ed25519 QjdSCg duJJHlktHXdvVPmJ8dnbcyfsF0zg8qtkfgS1zuEnBxg
+a4gkKxb0V3M0rR2dvI/bNAp3JdqYhwTfgcbsUMlafLY
+--- bCY9SZh/uILKWC+HIDGGvtRekgd/SrkDrjsqenlYy4Q
+Ptf>
+]g,ԛ3@:I!CL0˱UREm5(b
\ No newline at end of file
diff --git a/provision/secrets/emu/switch/prod.keys.age b/provision/secrets/emu/switch/prod.keys.age
index d6033d03..db2c952b 100644
Binary files a/provision/secrets/emu/switch/prod.keys.age and b/provision/secrets/emu/switch/prod.keys.age differ
diff --git a/provision/secrets/emu/switch/title.keys.age b/provision/secrets/emu/switch/title.keys.age
index e4e46362..1e4aed74 100644
Binary files a/provision/secrets/emu/switch/title.keys.age and b/provision/secrets/emu/switch/title.keys.age differ
diff --git a/provision/secrets/git/gitea-runner-1.age b/provision/secrets/git/gitea-runner-1.age
index b86815fd..12f6951d 100644
--- a/provision/secrets/git/gitea-runner-1.age
+++ b/provision/secrets/git/gitea-runner-1.age
@@ -1,10 +1,11 @@
age-encryption.org/v1
--> ssh-ed25519 Fz/sQw uRPe6lrPzIntOBzSYR+zM2xBihHCAsdOtix9L9221FI
-6i0DsOZhZdi0ZmKJAuG9xEX7dtK5+daGule506UNsRQ
--> ssh-ed25519 47GzQA etB0mmw8g4t0mfzBEv6Dr6V9IdoJegAjgbOY/t3M9ik
-FgN9DrAotYJ2rvvEh80+Wp5BxoEHe3W4LgCLld0G9v8
--> ssh-ed25519 wcI7nQ a3seigr8UNpEeUil+OSbf5RyjArSm03ygNw5AjtJYQ0
-Sc9J4LQI9kFUFDzFjLS8Zwo9Z/HTawBsrv4qRxftwMg
---- sGLvBOkszi11u/ukhK9iQ/FYHuqW52UXIY9kswVF7Tk
-Sa2M$7ִV2)|QC