commit 8a5aee31b2fd0bc76896c2df651d3f9f28a2c36d parent 06ebaff63c5ce11dff908c6db461faddd1e5e254 Author: Toni Brown <me@tb148.net> Date: Fri, 1 May 2026 21:18:07 +0800 refactor remote config Diffstat:
19 files changed, 56 insertions(+), 44 deletions(-)
diff --git a/remote/btrbk/default.nix b/remote/btrbk/default.nix @@ -1,12 +0,0 @@ -{pkgs, ...}: { - services.btrbk.sshAccess = [ - { - key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL18Wkgat+pFy2FFrta8ryH57X36uCCSGv1P7gYFn0Jp btrbk@nixosion"; - roles = ["source" "info" "delete"]; - } - ]; - systemd.tmpfiles.rules = [ - "d /var/lib/btrbk/snapshots 0750 btrbk btrbk" - ]; - environment.systemPackages = [pkgs.zstd]; -} diff --git a/remote/default.nix b/remote/default.nix @@ -1,18 +1,7 @@ {...}: { imports = [ - ./boot/. - ./btrbk/. - ./caddy/. - ./filesystem/. - ./localization/. - ./matrix-continuwuity/. - ./networking/. - ./nix/. - ./openssh/. - ./security/. - ./timesyncd/. - ./user/. - ./vaultwarden/. + ./service/. + ./system/. ./hardware-configuration.nix ]; diff --git a/remote/filesystem/default.nix b/remote/filesystem/default.nix @@ -1,12 +0,0 @@ -{...}: { - fileSystems."/".options = ["compress=zstd"]; - fileSystems."/nix".options = ["compress=zstd" "noatime"]; - fileSystems."/var/lib".options = ["compress=zstd"]; - fileSystems."/swap".options = ["noatime"]; - swapDevices = [ - { - device = "/swap/swapfile"; - size = 4 * 1024; - } - ]; -} diff --git a/remote/localization/default.nix b/remote/localization/default.nix @@ -1,3 +0,0 @@ -{...}: { - i18n.defaultLocale = "en_US.UTF-8"; -} diff --git a/remote/security/default.nix b/remote/security/default.nix @@ -1,4 +0,0 @@ -{...}: { - security.sudo.enable = false; - security.sudo-rs.enable = true; -} diff --git a/remote/caddy/default.nix b/remote/service/caddy/default.nix diff --git a/remote/service/default.nix b/remote/service/default.nix @@ -0,0 +1,9 @@ +{...}: { + imports = [ + ./caddy/. + ./matrix-continuwuity/. + ./openssh/. + ./timesyncd/. + ./vaultwarden/. + ]; +} diff --git a/remote/matrix-continuwuity/default.nix b/remote/service/matrix-continuwuity/default.nix diff --git a/remote/openssh/default.nix b/remote/service/openssh/default.nix diff --git a/remote/timesyncd/default.nix b/remote/service/timesyncd/default.nix diff --git a/remote/vaultwarden/default.nix b/remote/service/vaultwarden/default.nix diff --git a/remote/boot/default.nix b/remote/system/boot/default.nix diff --git a/remote/system/btrbk/default.nix b/remote/system/btrbk/default.nix @@ -0,0 +1,9 @@ +{pkgs, ...}: { + services.btrbk.sshAccess = [ + { + key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL18Wkgat+pFy2FFrta8ryH57X36uCCSGv1P7gYFn0Jp btrbk@nixosion"; + roles = ["source" "info" "delete"]; + } + ]; + environment.systemPackages = [pkgs.zstd]; +} diff --git a/remote/system/default.nix b/remote/system/default.nix @@ -0,0 +1,15 @@ +{...}: { + imports = [ + ./boot/. + ./btrbk/. + ./filesystem/. + ./networking/. + ./nix/. + ./user/. + ]; + + i18n.defaultLocale = "en_US.UTF-8"; + + security.sudo.enable = false; + security.sudo-rs.enable = true; +} diff --git a/remote/system/filesystem/default.nix b/remote/system/filesystem/default.nix @@ -0,0 +1,21 @@ +{...}: { + fileSystems."/".options = [ + "compress=zstd" + ]; + fileSystems."/nix".options = [ + "compress=zstd" + "noatime" + ]; + fileSystems."/var/lib".options = [ + "compress=zstd" + ]; + fileSystems."/swap".options = [ + "compress=zstd" + ]; + swapDevices = [ + { + device = "/swap/swapfile"; + size = 4 * 1024; + } + ]; +} diff --git a/remote/networking/default.nix b/remote/system/networking/default.nix diff --git a/remote/networking/networkd/default.nix b/remote/system/networking/networkd/default.nix diff --git a/remote/nix/default.nix b/remote/system/nix/default.nix diff --git a/remote/user/default.nix b/remote/system/user/default.nix