From cb089368e5009298603b1d03c7d271ab3c3d02a4 Mon Sep 17 00:00:00 2001 From: cubernetes Date: Sun, 24 May 2026 21:57:36 +0200 Subject: [PATCH] Run nixfmt --- flake.nix | 33 +++++++++--------- hosts/fw/configuration.nix | 32 +++++++++++------ hosts/fw/hardware-configuration.nix | 53 +++++++++++++++++++---------- 3 files changed, 74 insertions(+), 44 deletions(-) diff --git a/flake.nix b/flake.nix index 00e0fd2..42b0695 100644 --- a/flake.nix +++ b/flake.nix @@ -15,22 +15,23 @@ }; }; - outputs = { - self, - nixpkgs, - home-manager, - nix-index-database, - ... - }@inputs: - { + outputs = + { + self, + nixpkgs, + home-manager, + nix-index-database, + ... + }@inputs: + { - nixosConfigurations.fw = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs; }; - modules = [ - ./hosts/fw/configuration.nix - home-manager.nixosModules.home-manager - nix-index-database.nixosModules.default - ]; + nixosConfigurations.fw = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs; }; + modules = [ + ./hosts/fw/configuration.nix + home-manager.nixosModules.home-manager + nix-index-database.nixosModules.default + ]; + }; }; - }; } diff --git a/hosts/fw/configuration.nix b/hosts/fw/configuration.nix index 50d684d..9bf32ad 100644 --- a/hosts/fw/configuration.nix +++ b/hosts/fw/configuration.nix @@ -2,19 +2,25 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, inputs, ... }: +{ + config, + pkgs, + inputs, + ... +}: { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.initrd.luks.devices."luks-1dfcf980-6806-4f69-bd86-ee87c904c04b".device = "/dev/disk/by-uuid/1dfcf980-6806-4f69-bd86-ee87c904c04b"; + boot.initrd.luks.devices."luks-1dfcf980-6806-4f69-bd86-ee87c904c04b".device = + "/dev/disk/by-uuid/1dfcf980-6806-4f69-bd86-ee87c904c04b"; networking.hostName = "fw"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. @@ -83,8 +89,11 @@ users.users.tsi = { isNormalUser = true; description = "tsi"; - extraGroups = [ "networkmanager" "wheel" ]; - packages = with pkgs; []; + extraGroups = [ + "networkmanager" + "wheel" + ]; + packages = with pkgs; [ ]; }; # Install firefox. @@ -95,7 +104,7 @@ # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; [vim]; + environment.systemPackages = with pkgs; [ vim ]; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. @@ -124,7 +133,10 @@ # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "25.11"; # Did you read the comment? - nix.settings.experimental-features = ["nix-command" "flakes"]; + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; programs.nix-index-database.comma.enable = true; diff --git a/hosts/fw/hardware-configuration.nix b/hosts/fw/hardware-configuration.nix index 5a64eb1..3e3763d 100644 --- a/hosts/fw/hardware-configuration.nix +++ b/hosts/fw/hardware-configuration.nix @@ -1,34 +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, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "thunderbolt" + "usbhid" + "usb_storage" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/mapper/luks-9b0c979a-d40b-490c-9eff-616f1c9b7c5d"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/mapper/luks-9b0c979a-d40b-490c-9eff-616f1c9b7c5d"; + fsType = "ext4"; + }; - boot.initrd.luks.devices."luks-9b0c979a-d40b-490c-9eff-616f1c9b7c5d".device = "/dev/disk/by-uuid/9b0c979a-d40b-490c-9eff-616f1c9b7c5d"; + boot.initrd.luks.devices."luks-9b0c979a-d40b-490c-9eff-616f1c9b7c5d".device = + "/dev/disk/by-uuid/9b0c979a-d40b-490c-9eff-616f1c9b7c5d"; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/A7E8-C6F3"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/mapper/luks-1dfcf980-6806-4f69-bd86-ee87c904c04b"; } + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/A7E8-C6F3"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" ]; + }; + + swapDevices = [ + { device = "/dev/mapper/luks-1dfcf980-6806-4f69-bd86-ee87c904c04b"; } + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;