clan/backups.nix

@@ -1,41 +0,0 @@
-{ lib, self, ... }:
-{
-  clan.inventory.instances."borgbackup-storagebox" = {
-    module.input = "clan-core";
-    module.name = "borgbackup";
-
-    roles.client.machines = lib.genAttrs [ "crocus" "genepi" "renoir" "verbena" ] (
-      machine:
-      let
-        config = self.nixosConfigurations.${machine}.config;
-        user = "u422292";
-        host = "${user}.your-storagebox.de";
-      in
-      {
-        settings.destinations."storagebox-${config.networking.hostName}" = {
-          repo = "${user}@${host}:./borgbackup/${config.networking.hostName}";
-          rsh = "ssh -oPort=23 -i ${
-            config.clan.core.vars.generators.borgbackup.files."borgbackup.ssh".path
-          } -oStrictHostKeyChecking=accept-new";
-        };
-      }
-    );
-    roles.client.extraModules = [
-      {
-        programs.ssh.knownHosts =
-          let
-            user = "u422292";
-            host = "${user}.your-storagebox.de";
-          in
-          {
-            storagebox-ed25519 = {
-              hostNames = [ "[${host}]:23" ];
-              publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIICf9svRenC/PLKIL9nk6K/pxQgoiFC41wTNvoIncOxs";
-            };
-          };
-      }
-
-    ];
-    roles.server.machines = { };
-  };
-}

clan/flake-module.nix

@@ -1,7 +1,6 @@
 { self, lib, ... }:
 {
   imports = [
-    ./backups.nix
     ./machines.nix
     ./monitoring.nix
     ./network.nix
@@ -90,6 +89,32 @@
     roles.default.tags.all = { };
   };
 
+  clan.inventory.instances."borgbackup-storagebox" = {
+    module.input = "clan-core";
+    module.name = "borgbackup";
+
+    roles.client.machines = lib.genAttrs [ "crocus" "genepi" "verbena" ] (
+      machine:
+      let
+        config = self.nixosConfigurations.${machine}.config;
+        user = "u422292";
+        host = "${user}.your-storagebox.de";
+      in
+      {
+        settings.destinations."storagebox-${config.networking.hostName}" = {
+          repo = "${user}@${host}:./borgbackup/${config.networking.hostName}";
+          rsh = "ssh -oPort=23 -i ${
+            config.clan.core.vars.generators.borgbackup.files."borgbackup.ssh".path
+          } -oStrictHostKeyChecking=accept-new";
+        };
+      }
+    );
+    roles.client.extraModules = [
+      self.nixosModules.storagebox
+    ];
+    roles.server.machines = { };
+  };
+
   clan.inventory.instances.syncthing = {
     roles.peer.tags.syncthing = { };
     roles.peer.settings.folders = {

nixosModules/desktop.nix

@@ -52,8 +52,4 @@
   };
 
   programs.kdeconnect.enable = true;
-
-  networking.networkmanager = {
-    enable = true;
-  };
 }

nixosModules/storagebox.nix

@@ -0,0 +1,12 @@
+let
+  user = "u422292";
+  host = "${user}.your-storagebox.de";
+in
+{
+  programs.ssh.knownHosts = {
+    storagebox-ed25519 = {
+      hostNames = [ "[${host}]:23" ];
+      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIICf9svRenC/PLKIL9nk6K/pxQgoiFC41wTNvoIncOxs";
+    };
+  };
+}

nixosModules/user-rpqt.nix

@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ lib, pkgs, ... }:
 {
   users.users.rpqt = {
     isNormalUser = true;
@@ -19,10 +14,7 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGa8R8obgptefcp27Cdp9bc2fiyc9x0oTfMsTPFp2ktE rpqt@haze"
     ];
 
-    extraGroups = [
-      "wheel"
-    ]
-    ++ lib.mkIf config.networking.networkmanager.enabled [ "networkmanager" ];
+    extraGroups = [ "wheel" ];
   };
 
   programs.fish.enable = true;