From 5515e4f5a521b4ebe704278bec3273c8bd639d72 Mon Sep 17 00:00:00 2001
From: Christoph Cullmann <cullmann@kde.org>
Date: Sun, 17 Sep 2023 15:57:39 +0200
Subject: update config, use NetworkManager

---
 common.nix                      | 5 ++++-
 mini/configuration.nix          | 9 ---------
 mini/hardware-configuration.nix | 7 +------
 neko/configuration.nix          | 9 ---------
 neko/hardware-configuration.nix | 7 +------
 5 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/common.nix b/common.nix
index 50c3a90..5b822e2 100644
--- a/common.nix
+++ b/common.nix
@@ -58,13 +58,16 @@ in
   # ensure we scrub the btrfs sometimes
   services.btrfs.autoScrub = {
     enable = true;
-    fileSystems = [ "/data" ];
     interval = "weekly";
   };
 
   # allow all firmware
   hardware.enableAllFirmware = true;
 
+  # use NetworkManager
+  networking.useDHCP = false;
+  networking.networkmanager.enable = true;
+
   # ensure firewall is up, allow ssh and http in
   networking.firewall.enable = true;
   networking.firewall.allowedTCPPorts = [ 22 ];
diff --git a/mini/configuration.nix b/mini/configuration.nix
index a930f87..36ec173 100644
--- a/mini/configuration.nix
+++ b/mini/configuration.nix
@@ -17,15 +17,6 @@
   # host name
   networking.hostName = "mini";
 
-  # main network interface via systemd-networkd
-  networking.useDHCP = false;
-  systemd.network.enable = true;
-  systemd.network.networks."10-lan" = {
-    matchConfig.Name = "eno1";
-    networkConfig.DHCP = "yes";
-    linkConfig.RequiredForOnline = "routable";
-  };
-
   # amd graphics
   hardware.opengl.extraPackages = with pkgs; [ amdvlk rocm-opencl-icd rocm-opencl-runtime ];
   hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ amdvlk ];
diff --git a/mini/hardware-configuration.nix b/mini/hardware-configuration.nix
index 2949b75..ae24554 100644
--- a/mini/hardware-configuration.nix
+++ b/mini/hardware-configuration.nix
@@ -4,14 +4,11 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ "amdgpu" ];
   boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
 
   fileSystems."/" =
     { device = "none";
@@ -68,8 +65,6 @@
       options = [ "noatime" "nodiratime" ];
     };
 
-  swapDevices = [ ];
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/neko/configuration.nix b/neko/configuration.nix
index 6f0ac1f..e5ae4b0 100644
--- a/neko/configuration.nix
+++ b/neko/configuration.nix
@@ -17,15 +17,6 @@
   # host name
   networking.hostName = "neko";
 
-  # main network interface via systemd-networkd
-  networking.useDHCP = false;
-  systemd.network.enable = true;
-  systemd.network.networks."10-lan" = {
-    matchConfig.Name = "enp10s0";
-    networkConfig.DHCP = "yes";
-    linkConfig.RequiredForOnline = "routable";
-  };
-
   # intel graphics
   hardware.opengl.extraPackages = with pkgs; [ intel-media-driver intel-compute-runtime ];
   hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ intel-media-driver ];
diff --git a/neko/hardware-configuration.nix b/neko/hardware-configuration.nix
index 7b59d38..b441981 100644
--- a/neko/hardware-configuration.nix
+++ b/neko/hardware-configuration.nix
@@ -4,14 +4,11 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ];
   boot.initrd.kernelModules = [ "i915" ];
   boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
 
   fileSystems."/" =
     { device = "none";
@@ -85,8 +82,6 @@
       options = [ "noatime" "nodiratime" ];
     };
 
-  swapDevices = [ ];
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
-- 
cgit v1.2.3