refactors

clients/nova/ava.nix

@@ -2,14 +2,14 @@
 {
   users = {
     mutableUsers = lib.mkForce true;
-    users.flori = {
+    users.ava = {
       isNormalUser = true;
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcXzWUeVwJN7iPxMT/1lhJySY4t6Z2/fH/GHVuzQFr6 cardno:32_241_564"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINBnstd9HyyIjfXWfGymWDcRlK9nZuqgTIcueiqPUDaQ star@starforge"
       ];
       hashedPasswordFile = config.age.secrets."initialFloriPassword.age".path;
-      description = "Flori";
+      description = "Flori Ava Star";
       extraGroups = [ "wheel" ];
     };
   };

clients/nova/hardware-configuration.nix

@@ -1,7 +1,38 @@
+{ modulesPath, ... }:
 {
-  boot.kernelParams = [ "ip=dhcp" ];
+  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-  boot.initrd.availableKernelModules = [
+
-    "virtio_pci"
+  boot = {
-    "virtio_net"
+    initrd.luks.devices."luks-ef228969-52cc-4238-b90f-9d97d625bba6".device =
+      "/dev/disk/by-uuid/ef228969-52cc-4238-b90f-9d97d625bba6";
+    kernelParams = [ "ip=dhcp" ];
+    initrd.availableKernelModules = [
+      "sr_mod"
+      "ata_piix"
+      "uhci_hcd"
+      "virtio_pci"
+      "virtio_net"
+      "virtio_blk"
+    ];
+  };
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/3c343e41-ca80-413f-a48c-af513bb28f5c";
+      fsType = "btrfs";
+      options = [ "subvol=@" ];
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/9300-4D1C";
+      fsType = "vfat";
+      options = [
+        "fmask=0077"
+        "dmask=0077"
+      ];
+    };
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/c0c9de6f-9990-4346-b774-5f315b5ea115"; }
   ];
 }

clients/quadraticpc/hardware-configuration.nix

@@ -1,50 +1,26 @@
-# 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,
+  boot = {
-  lib,
+    kernelModules = [ "kvm-amd" ];
-  pkgs,
+    initrd.availableKernelModules = [
-  modulesPath,
+      "nvme"
-  ...
+      "xhci_pci"
-}:
+      "ahci"
-{
+      "usb_storage"
-  imports = [
+      "usbhid"
-    (modulesPath + "/installer/scan/not-detected.nix")
+      "sd_mod"
-  ];
+    ];
-
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "xhci_pci"
-    "ahci"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/7d01741d-d58f-49d4-b3a2-4d37d953873d";
-    fsType = "ext4";
   };
 
-  fileSystems."/boot" = {
+  fileSystems = {
-    device = "/dev/disk/by-uuid/E841-063C";
+    "/" = {
-    fsType = "vfat";
+      device = "/dev/disk/by-uuid/7d01741d-d58f-49d4-b3a2-4d37d953873d";
+      fsType = "ext4";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/E841-063C";
+      fsType = "vfat";
+    };
   };
 
-  swapDevices = [ ];
+  hardware.cpu.amd.updateMicrocode = true;
-
-  # 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
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp14s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp15s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

clients/quadtop/hardware-configuration.nix

@@ -1,18 +1,4 @@
-# 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")
-  ];
-
   boot = {
     initrd = {
       availableKernelModules = [
@@ -29,27 +15,17 @@
     extraModulePackages = [ ];
   };
 
-  fileSystems."/" = {
+  fileSystems = {
-    device = "/dev/disk/by-uuid/f4b1301b-c329-4c3c-9f3a-5584bc22d0c1";
+    "/" = {
-    fsType = "ext4";
+      device = "/dev/disk/by-uuid/f4b1301b-c329-4c3c-9f3a-5584bc22d0c1";
+      fsType = "ext4";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/3B50-5881";
+      fsType = "vfat";
+    };
   };
 
-  fileSystems."/boot" = {
+  powerManagement.cpuFreqGovernor = "powersave";
-    device = "/dev/disk/by-uuid/3B50-5881";
+  hardware.cpu.intel.updateMicrocode = true;
-    fsType = "vfat";
-  };
-
-  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
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

modules/common/not-detected.nix

@@ -0,0 +1,6 @@
+{ modulesPath, ... }:
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+}

modules/server/trusted.nix

@@ -1 +1 @@
-{ nix.settings.trusted-users = [ "quadradical" ]; }
+{ nix.settings.trusted-users = [ "@wheel" ]; }