From 6be480f3100e8dbda1d795d16bd6de712bf396b8 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Thu, 21 Jan 2021 23:19:07 +0300
Subject: [PATCH] Move stuff back to AMD-Workstation

---
 machines/AMD-Workstation/default.nix | 13 ++++++++++++-
 machines/RasPi-Server/default.nix    | 13 ++++++-------
 modules/boot.nix                     | 19 +++++++------------
 modules/servers/mailserver.nix       |  3 ---
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/machines/AMD-Workstation/default.nix b/machines/AMD-Workstation/default.nix
index 158c6fb..4024d74 100644
--- a/machines/AMD-Workstation/default.nix
+++ b/machines/AMD-Workstation/default.nix
@@ -1,5 +1,16 @@
 { inputs, ... }: {
-  imports = [ ./hardware-configuration.nix inputs.self.nixosProfiles.desktop ];
+  imports = with inputs.self.nixosModules; [
+    ./hardware-configuration.nix
+    inputs.self.nixosProfiles.desktop
+    gitea
+    jitsi
+    mailserver
+    matrix-synapse
+    minidlna
+    nextcloud
+    nginx
+    vsftpd
+  ];
   deviceSpecific.devInfo = {
     cpu = {
       vendor = "amd";
diff --git a/machines/RasPi-Server/default.nix b/machines/RasPi-Server/default.nix
index a60c0dc..4f7050c 100644
--- a/machines/RasPi-Server/default.nix
+++ b/machines/RasPi-Server/default.nix
@@ -2,15 +2,14 @@
   imports = with inputs.self.nixosModules; [
     ./hardware-configuration.nix
     inputs.self.nixosProfiles.server
-    gitea
-    jitsi
     mailserver
-    matrix-synapse
-    minidlna
-    nextcloud
-    nginx
-    vsftpd
   ];
+
+  loader.raspberryPi = {
+    enable = true;
+    version = 3;
+  };
+
   deviceSpecific.devInfo = {
     cpu = {
       vendor = "broadcom";
diff --git a/modules/boot.nix b/modules/boot.nix
index 530aa4a..36682c1 100644
--- a/modules/boot.nix
+++ b/modules/boot.nix
@@ -4,20 +4,15 @@
 
     loader.systemd-boot.enable = lib.mkIf (pkgs.system == "x86_64-linux") true;
 
-    # loader.raspberryPi = lib.mkIf (pkgs.system == "aarch64-linux") {
-    #   enable = true;
-    #   version = 4;
-    # };
-
     loader.grub.enable = false;
 
-    # kernelParams = [ "quiet" "scsi_mod.use_blk_mq=1" "modeset" "nofb" ]
-    #   ++ lib.optional (pkgs.system == "x86_64-linux") [
-    #     "rd.systemd.show_status=auto"
-    #     "rd.udev.log_priority=3"
-    #     "pti=off"
-    #     "spectre_v2=off"
-    #   ];
+    kernelParams = [ "quiet" "scsi_mod.use_blk_mq=1" "modeset" "nofb" ]
+      ++ lib.optional (pkgs.system == "x86_64-linux") [
+        "rd.systemd.show_status=auto"
+        "rd.udev.log_priority=3"
+        "pti=off"
+        "spectre_v2=off"
+      ];
 
     kernelPackages = pkgs.linuxPackages_latest;
 
diff --git a/modules/servers/mailserver.nix b/modules/servers/mailserver.nix
index 6eae842..e6a41a7 100644
--- a/modules/servers/mailserver.nix
+++ b/modules/servers/mailserver.nix
@@ -65,9 +65,6 @@ in {
     ];
     dnsBlacklistOverrides = ''
       balsoft.ru OK
-      ${
-        builtins.concatStringsSep " OK \n" (builtins.attrNames config.devices)
-      } OK
       192.168.0.0/16 OK
     '';
   };