From 81b49aa9237d4155681c56dca8479d204922b089 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 22 Mar 2025 20:57:04 -0400 Subject: [PATCH] fmt, no random mac for server --- .../hardware-configuration.nix | 41 ++++++++++--------- modules/common-desktop/mac.nix | 3 ++ modules/common-desktop/vscodium.nix | 2 +- modules/common/network-manager.nix | 5 +-- 4 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 modules/common-desktop/mac.nix diff --git a/clients/quadraticserver/hardware-configuration.nix b/clients/quadraticserver/hardware-configuration.nix index a1be8bc..e117011 100644 --- a/clients/quadraticserver/hardware-configuration.nix +++ b/clients/quadraticserver/hardware-configuration.nix @@ -1,30 +1,33 @@ # 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, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "ehci_pci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "ehci_pci" "usbhid" "usb_storage" "sd_mod" "sr_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/f54eef44-4680-4537-9040-3a148ed61fab"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/f54eef44-4680-4537-9040-3a148ed61fab"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/ECDF-096A"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/ECDF-096A"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; - swapDevices = [ ]; + swapDevices = []; # 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/common-desktop/mac.nix b/modules/common-desktop/mac.nix new file mode 100644 index 0000000..fa89906 --- /dev/null +++ b/modules/common-desktop/mac.nix @@ -0,0 +1,3 @@ +{ + networking.networkmanager.wifi.macAddress = "random"; +} diff --git a/modules/common-desktop/vscodium.nix b/modules/common-desktop/vscodium.nix index 2e4cf00..9a3d724 100644 --- a/modules/common-desktop/vscodium.nix +++ b/modules/common-desktop/vscodium.nix @@ -38,7 +38,7 @@ systemd.tmpfiles.settings.vscodium = { # "/home/quadradical/.config/VSCodium/User"."d".user = "quadradical"; "/home/quadradical/.config/VSCodium/User/settings.json"."f+".argument = builtins.toJSON { - "arb-editor.suppressedWarnings"= ["missing_metadata_for_key"]; + "arb-editor.suppressedWarnings" = ["missing_metadata_for_key"]; "dart.debugExternalPackageLibraries" = true; "dart.debugSdkLibraries" = true; "redhat.telemetry.enabled" = false; diff --git a/modules/common/network-manager.nix b/modules/common/network-manager.nix index 72c095b..f29d881 100644 --- a/modules/common/network-manager.nix +++ b/modules/common/network-manager.nix @@ -1,6 +1,3 @@ { - networking.networkmanager = { - enable = true; - wifi.macAddress = "random"; - }; + networking.networkmanager.enable = true; }