all repos — nixfiles @ 4b40fa9ece26c606abe7b405b4cd56c897a14b21

System and user configuration, managed by nix and home-manager

finalise rename of host 'nano' -> 'r5'/'r6' I might end up running both, if I ever manage to get the r6c running again.

Alin
commit

4b40fa9ece26c606abe7b405b4cd56c897a14b21

parent

a9d779ba5393ea091fc1587bcbb8bf80506a28fb

9 files changed, 13 insertions(+), 30 deletions(-)

changed files
M flake.nix → flake.nix
@@ -129,8 +129,8 @@ modules = [
           agenix.nixosModules.default
           srvos.nixosModules.server
           nanopi.nixosModules.r5s
-          ./system/hosts/r5s.nix
-          ./system/hosts/r5s-hardware.nix
+          ./system/hosts/r5.nix
+          ./system/hosts/r5-hardware.nix
         ];
       };
       nixosConfigurations.linde = nixpkgs.lib.nixosSystem {

@@ -200,10 +200,10 @@ ./user/hosts/prefect.nix
           ./private/ssh.nix
         ];
       };
-      homeConfigurations."alan@nano" = mkHomeConfiguration {
+      homeConfigurations."alin@r5" = mkHomeConfiguration {
         system = "aarch64-linux";
         modules = [
-          ./user/hosts/nano.nix
+          ./user/hosts/r5.nix
         ];
       };
       homeConfigurations."alin@linde" = mkHomeConfiguration {
M secrets/secrets.nix → secrets/secrets.nix
@@ -7,13 +7,13 @@ };
 
   machines = {
     linde = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHHdh3J7dEmh9G+CVmzFEC8/ont35ZXpCFcpLUO863vC";
-    nano = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAw70HIEZEBQ751WB9aA/mbk0aSebUsAiPIquQp0NcJ5";
+    r5 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAw70HIEZEBQ751WB9aA/mbk0aSebUsAiPIquQp0NcJ5";
   };
 
   secrets = with machines; {
     acme = [
       linde
-      nano
+      r5
     ];
 
     redis-website = [ linde ];

@@ -31,8 +31,8 @@ readeck = [ linde ];
     open-webui = [ linde ];
     codeberg-runner = [ linde ];
 
-    dyndns = [ nano ];
-    syncthing = [ nano ];
+    dyndns = [ r5 ];
+    syncthing = [ r5 ];
   };
 in
 builtins.listToAttrs (
M system/hosts/linde.nix → system/hosts/linde.nix
@@ -500,8 +500,8 @@ openssh
     ];
     serviceConfig = {
       Type = "oneshot";
-      ExecStart = "${lib.getExe pkgs.rdiff-backup} --api-version 201 backup ${config.services.gitolite.dataDir} ${hostname}@nano.${ts-domain}::gitolite";
-      ExecStartPost = "-${lib.getExe pkgs.rdiff-backup} --api-version 201 remove increments --older-than 3M ${hostname}@nano.${ts-domain}::gitolite";
+      ExecStart = "${lib.getExe pkgs.rdiff-backup} --api-version 201 backup ${config.services.gitolite.dataDir} ${hostname}@r5.${ts-domain}::gitolite";
+      ExecStartPost = "-${lib.getExe pkgs.rdiff-backup} --api-version 201 remove increments --older-than 3M ${hostname}@r5.${ts-domain}::gitolite";
     };
   };
 

@@ -515,9 +515,9 @@ Type = "oneshot";
       WorkingDirectory = config.services.paperless.dataDir;
       ExecStart = [
         "systemd-run --machine=papers sudo -u paperless ./paperless-manage document_exporter --delete --use-filename-format --no-archive --no-thumbnail --no-progress-bar ./export  "
-        "${lib.getExe pkgs.rdiff-backup} --api-version 201 backup /srv/paperless/export ${hostname}@nano.${ts-domain}::paperless"
+        "${lib.getExe pkgs.rdiff-backup} --api-version 201 backup /srv/paperless/export ${hostname}@r5.${ts-domain}::paperless"
       ];
-      ExecStartPost = "-${lib.getExe pkgs.rdiff-backup} --api-version 201 remove increments --older-than 3M ${hostname}@nano.${ts-domain}::paperless";
+      ExecStartPost = "-${lib.getExe pkgs.rdiff-backup} --api-version 201 remove increments --older-than 3M ${hostname}@r5.${ts-domain}::paperless";
     };
   };
M system/hosts/nano.nix → system/hosts/r6.nix
@@ -9,7 +9,7 @@
 let
   wan = "wan0";
   lan = "lan0";
-  hostName = "nano";
+  hostName = "r6";
   domain = "home.arpa";
   tailnet = "hydra-pinecone.ts.net";
   dnsmasqEnable = true;
M system/hosts/prefect.nix → system/hosts/prefect.nix
@@ -183,23 +183,6 @@ -----END CERTIFICATE-----
     ''
   ];
 
-  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
-  nix.settings.trusted-users = [
-    "root"
-    "nixremote"
-  ];
-  services.displayManager.hiddenUsers = [ "nixremote" ];
-  users.users.nixremote = {
-    shell = "/bin/sh";
-    isNormalUser = true;
-    home = "/var/lib/nixremote";
-    createHome = true;
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBxa7lxDu0M4chats/VvpFzjT3ruexKa3J9UC6ASo3bN root@NanoPi.lan"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9of82WBHK8nr8L9RGeieLMfcAWaFCeCkmvYHM9LCuT nanopi"
-    ];
-  };
-
   users.users.root.openssh.authorizedKeys.keys = [
     "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHYUyDdw92TNXguAxcmcmZmn/7ECGdRp6ckjxU+5zCw3BCnsS5+xEvHBVnnFdJRoH2XpfMeJjE+fi67zFVhlbn4= root@secretive.marvin"
   ];