From ecdabe25616086a47ac56d400df66e6a9efcf530 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Mon, 28 Feb 2022 20:50:25 +0100
Subject: [PATCH] rewrite vm config

---
 flake.nix                            |  6 +-----
 systems/minimal/default.nix          |  9 ---------
 systems/nixos-management/default.nix | 14 ++++++++++++++
 systems/proxmox-vm/default.nix       |  9 ++++++++-
 4 files changed, 23 insertions(+), 15 deletions(-)
 delete mode 100644 systems/minimal/default.nix
 create mode 100644 systems/nixos-management/default.nix

diff --git a/flake.nix b/flake.nix
index c0f4ec0..75dbe33 100644
--- a/flake.nix
+++ b/flake.nix
@@ -114,15 +114,11 @@
             ./modules/haproxy
           ];
         nixos-management = mkComputer
-          (mkVM
-            { hostname = "nixos-management"; ip = "10.7.89.150"; inherit custom inputs; })
+          ./systems/nixos-management
           ./home-manager/headless.nix
           [
             ./modules/code-server
             ./modules/docker
-            (import ./modules/restic-server-client {
-              inherit custom inputs; time = "21:30";
-            })
           ];
         heimdall = mkComputer
           (mkVM
diff --git a/systems/minimal/default.nix b/systems/minimal/default.nix
deleted file mode 100644
index 362972d..0000000
--- a/systems/minimal/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-{
-  # Inspired by
-  # https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/profiles/minimal.nix
-  environment.noXlibs = true;
-  documentation.enable = false;
-  documentation.nixos.enable = false;
-  programs.command-not-found.enable = false;
-}
diff --git a/systems/nixos-management/default.nix b/systems/nixos-management/default.nix
new file mode 100644
index 0000000..cd7ab5c
--- /dev/null
+++ b/systems/nixos-management/default.nix
@@ -0,0 +1,14 @@
+{ config, custom, inputs, pkgs, ... }:
+{
+  imports = [
+    (import "${inputs.self}/systems/proxmox-vm" {
+      hostname = "nixos-management";
+      ip = "10.7.89.150";
+      inherit inputs;
+    })
+
+    (import "${inputs.self}/modules/restic-server-client" {
+      time = "21:30"; inherit config custom inputs pkgs;
+    })
+  ];
+}
diff --git a/systems/proxmox-vm/default.nix b/systems/proxmox-vm/default.nix
index 890a518..8d43457 100644
--- a/systems/proxmox-vm/default.nix
+++ b/systems/proxmox-vm/default.nix
@@ -1,4 +1,4 @@
-{ inputs, custom, hostname, ip, ... }:
+{ inputs, hostname, ip, ... }:
 {
   imports = [
     (import "${inputs.self}/modules/mk-network" { inherit hostname ip; })
@@ -28,5 +28,12 @@
   swapDevices = [
     { device = "/dev/disk/by-label/swap"; }
   ];
+
+  # Inspired by
+  # https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/profiles/minimal.nix
+  environment.noXlibs = true;
+  documentation.enable = false;
+  documentation.nixos.enable = false;
+  programs.command-not-found.enable = false;
 }