From 08fa0a5c97d61244cea39a209213fb3f54247fdb Mon Sep 17 00:00:00 2001 From: Noah Pederson Date: Wed, 4 Jun 2025 12:09:15 -0500 Subject: [PATCH] AUTOFORMAT: Nix files --- flake.nix | 10 ++++- hardware-configuration.nix | 77 +++++++++++++++++++++++++++----------- home.nix | 13 +++++-- networking.nix | 14 ++++++- 4 files changed, 86 insertions(+), 28 deletions(-) diff --git a/flake.nix b/flake.nix index 5764fef..11c428a 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,15 @@ pre-commit-hooks.url = "github:cachix/git-hooks.nix"; }; - outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, pre-commit-hooks, ... }: + outputs = + { + self, + nixpkgs, + nixpkgs-unstable, + home-manager, + pre-commit-hooks, + ... + }: let system = "aarch64-darwin"; pkgs = nixpkgs.legacyPackages.${system}; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index c935577..390f332 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,18 +1,51 @@ # 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, pkgs, ... }: +{ + config, + lib, + modulesPath, + pkgs, + ... +}: { - imports = - [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; boot.kernelPackages = pkgs.linuxPackages_latest; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ "kvm-amd" "amdgpu" "nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ]; - boot.kernelModules = [ "kvm-amd" "amdgpu" "nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ]; + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "thunderbolt" + "usb_storage" + "usbhid" + "sd_mod" + "sdhci_pci" + ]; + boot.initrd.kernelModules = [ + "kvm-amd" + "amdgpu" + "nvme" + "xhci_pci" + "thunderbolt" + "usb_storage" + "usbhid" + "sd_mod" + "sdhci_pci" + ]; + boot.kernelModules = [ + "kvm-amd" + "amdgpu" + "nvme" + "xhci_pci" + "thunderbolt" + "usb_storage" + "usbhid" + "sd_mod" + "sdhci_pci" + ]; virtualisation.libvirtd = { enable = true; qemu = { @@ -27,22 +60,22 @@ hardware.enableRedistributableFirmware = true; - fileSystems."/" = - { - device = "/dev/disk/by-uuid/07019c69-2597-410d-a8a0-a8ffb0f58883"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/07019c69-2597-410d-a8a0-a8ffb0f58883"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { - device = "/dev/disk/by-uuid/4B85-C90A"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/4B85-C90A"; + fsType = "vfat"; + }; - swapDevices = [{ - device = "/swapfile"; - size = 32 * 1024; - }]; + swapDevices = [ + { + device = "/swapfile"; + size = 32 * 1024; + } + ]; # 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/home.nix b/home.nix index e1a5a15..9dff766 100644 --- a/home.nix +++ b/home.nix @@ -7,7 +7,10 @@ nix = { package = pkgs.nix; settings = { - experimental-features = [ "nix-command" "flakes" ]; + experimental-features = [ + "nix-command" + "flakes" + ]; #substituters = [ # "http://cache.misaki.local" #]; @@ -60,7 +63,6 @@ #unstable.tk #unstable.tclPackages.tclx - # Dev tools git unstable.ruff @@ -177,7 +179,12 @@ defaultEditor = true; withNodeJs = false; withPython3 = true; - extraPackages = with pkgs; [ fzf ripgrep luarocks tree-sitter ]; + extraPackages = with pkgs; [ + fzf + ripgrep + luarocks + tree-sitter + ]; }; programs.git = { enable = true; diff --git a/networking.nix b/networking.nix index 3fb4b46..27f77b6 100644 --- a/networking.nix +++ b/networking.nix @@ -54,12 +54,22 @@ "/srv/shokuhou" = { device = "192.168.1.3:/srv/shokuhou"; fsType = "nfs"; - options = [ "nfsvers=4" "user" "x-system.automount" "x-system.idle-timeout=600" ]; + options = [ + "nfsvers=4" + "user" + "x-system.automount" + "x-system.idle-timeout=600" + ]; }; "/srv/mentalout" = { device = "192.168.1.3:/srv/mentalout"; fsType = "nfs"; - options = [ "nfsvers=4" "user" "x-system.automount" "x-system.idle-timeout=600" ]; + options = [ + "nfsvers=4" + "user" + "x-system.automount" + "x-system.idle-timeout=600" + ]; }; }; } -- 2.51.2