Merge branch 'main' of ssh://git.duckland.org:2202/don/NixOS-Configs

hosts/smaug/hardware-configuration.nix

@@ -1,11 +1,15 @@
 # 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 =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
   boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc"];
@@ -13,13 +17,13 @@
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/c871ca4a-fb86-4631-b3bd-105931c5f373";
+    device = "/dev/disk/by-uuid/c871ca4a-fb86-4631-b3bd-105931c5f373";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/55CA-7FD8";
+    device = "/dev/disk/by-uuid/55CA-7FD8";
     fsType = "vfat";
     options = ["fmask=0022" "dmask=0022"];
   };

nixos-anywhere/configuration-vm.nix

@@ -1,4 +1,10 @@
-{ modulesPath, config, lib, pkgs, ... }: {
+{
+  modulesPath,
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
     (modulesPath + "/profiles/qemu-guest.nix")
@@ -9,9 +15,11 @@
     kernelParams = ["consoleblank=60"];
     loader = {
       timeout = 10;
-      /* systemd-boot = {
+      /*
+         systemd-boot = {
         enable = true;
-      }; */
+      };
+      */
       grub = {
         device = "nodev";
         efiSupport = true;

nixos-anywhere/configuration.nix

@@ -1,4 +1,10 @@
-{ modulesPath, config, lib, pkgs, ... }: {
+{
+  modulesPath,
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
     (modulesPath + "/profiles/qemu-guest.nix")

nixos-anywhere/disk-config-vm.nix

@@ -1,6 +1,5 @@
 # Example to create a bios compatible gpt partition
-{ lib, ... }:
+{lib, ...}: {
-{
   disko.devices = {
     disk.disk1 = {
       device = lib.mkDefault "/dev/vda";

nixos-anywhere/disk-config.nix

@@ -1,6 +1,5 @@
 # Example to create a bios compatible gpt partition
-{ lib, ... }:
+{lib, ...}: {
-{
   disko.devices = {
     disk.disk1 = {
       device = lib.mkDefault "/dev/sda";

nixos-anywhere/flake.nix

@@ -3,8 +3,11 @@
   inputs.disko.url = "github:nix-community/disko";
   inputs.disko.inputs.nixpkgs.follows = "nixpkgs";
 
-  outputs = { nixpkgs, disko, ... }:
+  outputs = {
-    {
+    nixpkgs,
+    disko,
+    ...
+  }: {
     nixosConfigurations.smaug = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [