merge things idk

2 files changed, 44 insertions, 25 deletions

diff --git a/modules/hosts/tiamat/hardware.nix b/modules/hosts/tiamat/hardware.nix
index eadfd00..e9f84f4 100644
--- a/modules/hosts/tiamat/hardware.nix
+++ b/modules/hosts/tiamat/hardware.nix
@@ -1,28 +1,38 @@
-{ self, inputs, ... }: {
-  flake.nixosModules.tiamatHardware = { config, lib, pkgs, modulesPath, ... }: {
-    imports =
-      [ (modulesPath + "/installer/scan/not-detected.nix")
-      ];
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.tiamatHardware = {
+    config,
+    lib,
+    pkgs,
+    modulesPath,
+    ...
+  }: {
+    imports = [
+      (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-    boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "uas" "sd_mod" ];
-    boot.initrd.kernelModules = [ ];
-    boot.kernelModules = [ "kvm-amd" ];
-    boot.extraModulePackages = [ ];
+    boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "uas" "sd_mod"];
+    boot.initrd.kernelModules = [];
+    boot.kernelModules = ["kvm-amd"];
+    boot.extraModulePackages = [];
 
-    fileSystems."/" =
-      { device = "/dev/disk/by-uuid/0983bf69-0f71-4c49-885b-0b5c09a19429";
-        fsType = "ext4";
-      };
+    fileSystems."/" = {
+      device = "/dev/disk/by-uuid/0983bf69-0f71-4c49-885b-0b5c09a19429";
+      fsType = "ext4";
+    };
 
-    fileSystems."/boot" =
-      { device = "/dev/disk/by-uuid/756C-8B9B";
-        fsType = "vfat";
-        options = [ "fmask=0077" "dmask=0077" ];
-      };
+    fileSystems."/boot" = {
+      device = "/dev/disk/by-uuid/756C-8B9B";
+      fsType = "vfat";
+      options = ["fmask=0077" "dmask=0077"];
+    };
 
-    swapDevices =
-      [ { device = "/dev/disk/by-uuid/50dd07e0-bf93-450c-a91b-aa73a18a8224"; }
-      ];
+    swapDevices = [
+      {device = "/dev/disk/by-uuid/50dd07e0-bf93-450c-a91b-aa73a18a8224";}
+    ];
 
     # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
     # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/modules/hosts/tiamat/tiamat.nix b/modules/hosts/tiamat/tiamat.nix
index 317df61..d41ce40 100644
--- a/modules/hosts/tiamat/tiamat.nix
+++ b/modules/hosts/tiamat/tiamat.nix
@@ -1,6 +1,8 @@
-{ inputs, self, ... }:
-
 {
+  inputs,
+  self,
+  ...
+}: {
   imports = [
     inputs.home-manager.flakeModules.home-manager
   ];
@@ -16,22 +18,29 @@
 
       self.nixosModules.tiamatNiri
       self.nixosModules.desktop
+      self.nixosModules.nasClient
     ];
   };
 
-  flake.nixosModules.tiamat = { pkgs, ... }: {
+  flake.nixosModules.tiamat = {pkgs, ...}: {
     hostOptions = {
       host.name = "tiamat";
       user.name = "jck";
       user.email = "jckrinsky@gmail.com";
     };
 
+    boot.kernelParams = ["quiet"];
+
     hardware.graphics = {
       enable = true;
       enable32Bit = true;
     };
 
-    networking.nameservers = [ "1.1.1.1" "9.9.9.9" ];
+    boot.initrd.kernelModules = ["amdgpu"];
+
+    hardware.cpu.amd.updateMicrocode = true;
+
+    networking.nameservers = ["1.1.1.1" "9.9.9.9"];
 
     services.automatic-timezoned.enable = true;