fix(mother): fix mother config

misumisumi · Sep 29, 2024 · c75778d · c75778d
1 parent c492cce
commit c75778d
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 27 deletions.
diff --git a/machines/mother/gpu.nix b/machines/mother/gpu.nix
@@ -1,11 +1,5 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 {
-  # boot.extraModprobeConfig = lib.mkAfter ''
-  #   softdep snd_hda_intel pre: vfio-pci
-  #   softdep nouveau pre: vfio-pci
-  #   softdep nvidia pre: vfio-pci
-  #   softdep xhci_hcd pre: vfio-pci
-  # '';
   services = {
     xserver = {
       videoDrivers = [

diff --git a/machines/mother/hardware-configuration.nix b/machines/mother/hardware-configuration.nix
@@ -1,17 +1,26 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config
-, lib
-, modulesPath
-, ...
-}: {
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}:
+{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
   boot = {
     initrd = {
-      availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "uas" "sd_mod" ];
+      availableKernelModules = [
+        "nvme"
+        "xhci_pci"
+        "usbhid"
+        "usb_storage"
+        "uas"
+        "sd_mod"
+      ];
     };
   };
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

diff --git a/machines/mother/home.nix b/machines/mother/home.nix
@@ -3,9 +3,9 @@
   xresources = {
     extraConfig = "Xft.dpi:125";
   };
-  # home.pointerCursor = {
-  #   size = 32;
-  # };
+  home.pointerCursor = {
+    size = 32;
+  };
   sops.secrets = {
     "desktops" = {
       path = "${config.home.homeDirectory}/.ssh/conf.d/hosts/desktops";

diff --git a/machines/mother/network.nix b/machines/mother/network.nix
@@ -1,4 +1,5 @@
-{ hostname, ... }: {
+{ hostname, ... }:
+{
   services = {
     nscd = {
       enable = true;
@@ -99,7 +100,11 @@
       networks = {
         "10-wired" = {
           name = "enp5s0";
-          vlan = [ "devnode" "devk8s" "devnfs" ];
+          vlan = [
+            "devnode"
+            "devk8s"
+            "devnfs"
+          ];
           bridge = [ "br0" ];
         };
         "20-br0" = {

diff --git a/machines/mother/sops.nix b/machines/mother/sops.nix
@@ -1,4 +1,3 @@
-{ config, ... }:
 {
   sops = {
     age = {

diff --git a/machines/mother/system.nix b/machines/mother/system.nix
@@ -1,8 +1,5 @@
-{ config
-, pkgs
-, user
-, ...
-}: {
+{ config, ... }:
+{
   boot = {
     loader.timeout = 10;
     extraModulePackages = with config.boot.kernelPackages; [
@@ -17,8 +14,10 @@
       tmpfsSize = "50%";
     };
   };
-  services.xserver.xp-pentablet.enable = true;
-  services.xserver.displayManager.lightdm.greeters.slick.cursorTheme.size = 32;
+  services.xserver = {
+    xp-pentablet.enable = true;
+    displayManager.lightdm.greeters.slick.cursorTheme.size = 32;
+  };
   nix = {
     settings = {
       cores = 6;

diff --git a/machines/mother/virtualisation.nix b/machines/mother/virtualisation.nix
@@ -10,7 +10,10 @@
     vfio = {
       enable = true;
       IOMMUType = "amd";
-      devices = [ "10de:2504" "10de:228e" ];
+      devices = [
+        "10de:2504"
+        "10de:228e"
+      ];
       # deviceDomains = [ "0000:09:00.0" "0000:09:00.1" ];
       blacklistNvidia = false;
       disableEFIfb = false;