From 82ccb37f5ef016ab38f49a5eb0ab59a40f5a0fec Mon Sep 17 00:00:00 2001 From: Fern Garden Date: Fri, 4 Jul 2025 21:37:09 +0800 Subject: [PATCH] nixfmt --- configuration/common.nix | 4 +-- configuration/vm.nix | 2 +- flake.nix | 10 +++--- hardware-configuration/muskduck.nix | 44 ++++++++++++++++--------- hardware-configuration/vm-minecraft.nix | 38 ++++++++++++--------- 5 files changed, 59 insertions(+), 39 deletions(-) diff --git a/configuration/common.nix b/configuration/common.nix index 8c2a11b..f459b31 100644 --- a/configuration/common.nix +++ b/configuration/common.nix @@ -11,7 +11,7 @@ # Allow unfree packages. nixpkgs.config.allowUnfree = true; - + # Set time zone. time.timeZone = "Australia/Perth"; @@ -109,4 +109,4 @@ enable = true; nssmdns4 = true; }; -} \ No newline at end of file +} diff --git a/configuration/vm.nix b/configuration/vm.nix index 529fe9d..024193a 100755 --- a/configuration/vm.nix +++ b/configuration/vm.nix @@ -1,6 +1,6 @@ { # Configure the bootloader. - boot.loader.grub = { + boot.loader.grub = { enable = true; device = "/dev/sda"; }; diff --git a/flake.nix b/flake.nix index eb2e964..c75d2c8 100755 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; # Stable nixpkgs. lanzaboote.url = "github:nix-community/lanzaboote"; # Secure boot. nixos-hardware.url = "github:NixOS/nixos-hardware"; # Hardware specific config. - + # Updated packages. fluffychat2.url = "github:NixOS/nixpkgs?ref=pull/419632/head"; # FluffyChat 2.0.0 feishin0_16_0.url = "github:NixOS/nixpkgs?ref=pull/414929/head"; # Feishin 0.16.0 @@ -47,20 +47,20 @@ modules = [ { networking.hostName = "minecraft"; } - + ./configuration/common.nix ./configuration/vm.nix ./hardware-configuration/vm-minecraft.nix # Include the results of the hardware scan. ]; }; - + nixosConfigurations.lxc-technitium = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ (nixpkgs + "/nixos/modules/virtualisation/proxmox-lxc.nix") - { + { networking.hostName = "technitium"; services.technitium-dns-server = { @@ -79,7 +79,7 @@ modules = [ (nixpkgs + "/nixos/modules/virtualisation/proxmox-lxc.nix") - { + { networking.hostName = "firefox-syncserver"; services.mysql.package = nixpkgs.legacyPackages.${system}.mariadb; diff --git a/hardware-configuration/muskduck.nix b/hardware-configuration/muskduck.nix index d6505f9..5ca5cf0 100644 --- a/hardware-configuration/muskduck.nix +++ b/hardware-configuration/muskduck.nix @@ -1,27 +1,41 @@ -{ config, lib, modulesPath, ... }: +{ + config, + lib, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "nvme" + "usb_storage" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/63d79656-aa5b-466a-b369-be5eac3f51ab"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/63d79656-aa5b-466a-b369-be5eac3f51ab"; + fsType = "ext4"; + }; - boot.initrd.luks.devices."luks-93fa00bc-777f-4359-bad5-880c29faca0d".device = "/dev/disk/by-uuid/93fa00bc-777f-4359-bad5-880c29faca0d"; + boot.initrd.luks.devices."luks-93fa00bc-777f-4359-bad5-880c29faca0d".device = + "/dev/disk/by-uuid/93fa00bc-777f-4359-bad5-880c29faca0d"; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/EBD7-3E1C"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/EBD7-3E1C"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; swapDevices = [ ]; diff --git a/hardware-configuration/vm-minecraft.nix b/hardware-configuration/vm-minecraft.nix index fab0e57..94342a3 100644 --- a/hardware-configuration/vm-minecraft.nix +++ b/hardware-configuration/vm-minecraft.nix @@ -1,30 +1,36 @@ { lib, modulesPath, ... }: { - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ]; - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "ata_piix" + "uhci_hcd" + "virtio_pci" + "virtio_scsi" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/cbd70e61-fcdc-4b1f-af03-d3da8a2866ea"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/cbd70e61-fcdc-4b1f-af03-d3da8a2866ea"; + fsType = "ext4"; + }; - fileSystems."/home/docker/volumes" = - { device = "/dev/disk/by-uuid/3730e48a-8784-4c49-8692-473c9b4bc8c3"; - fsType = "ext4"; - }; + fileSystems."/home/docker/volumes" = { + device = "/dev/disk/by-uuid/3730e48a-8784-4c49-8692-473c9b4bc8c3"; + fsType = "ext4"; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/3123f58e-63a9-44fa-ac29-3e79dc520b8f"; } - ]; + swapDevices = [ + { device = "/dev/disk/by-uuid/3123f58e-63a9-44fa-ac29-3e79dc520b8f"; } + ]; networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} \ No newline at end of file +}