cleanup names

systems/aarch64-linux/pi4/default.nix

@@ -3,7 +3,6 @@
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
 {
-  config,
   namespace,
   ...
 }:

systems/aarch64-linux/pi5/default.nix

@@ -3,7 +3,6 @@
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
 {
-  config,
   namespace,
   ...
 }:

systems/x86_64-linux/jallen-nas/default.nix

@@ -102,7 +102,7 @@
         enable = true;
         allowPing = true;
         trustedInterfaces = [ "tailscale0" ];
-        allowedTCPPorts =  [
+        allowedTCPPorts = [
           8008 # restic
           9000 # authentik
           2342 # grafana

systems/x86_64-linux/jallen-nas/sops.nix

@@ -76,7 +76,7 @@ in
         sopsFile = defaultSops;
         restartUnits = [ "authentik.service" ];
       };
-      
+
       # ------------------------------
       # attic
       # ------------------------------

systems/x86_64-linux/matt-nixos/default.nix

@@ -50,7 +50,7 @@
     };
 
     impermanence.enable = true;
-    
+
     network = {
       hostName = "matt-nixos";
       wifi = {

systems/x86_64-linux/matt-nixos/sops.nix

@@ -1,4 +1,9 @@
-{ config, lib, namespace, ... }:
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:
 let
   user = config.${namespace}.user.name;
   desktopSopsFile = (lib.snowfall.fs.get-file "secrets/desktop-secrets.yaml");

systems/x86_64-linux/nuc-nixos/hardware-configuration.nix

@@ -0,0 +1,79 @@
+# 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,
+  ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "nvme"
+    "ahci"
+    "usbhid"
+    "uas"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = lib.mkForce {
+    device = "none";
+    fsType = "tmpfs";
+    options = [ "mode=755" ];
+  };
+
+  fileSystems."/boot" = lib.mkForce {
+    device = "UUID=0FCB-EC63"; # "/dev/disk/by-partlabel/disk-main-ESP";
+    fsType = "vfat";
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
+
+  fileSystems."/var/log" = lib.mkForce {
+    device = "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root";
+    fsType = "bcachefs";
+    options = [ "X-mount.subdir=log" ];
+  };
+
+  fileSystems."/root" = lib.mkForce {
+    device = lib.mkDefault "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root";
+    fsType = "bcachefs";
+    options = [ "X-mount.subdir=root" ];
+  };
+
+  fileSystems."/etc" = lib.mkForce {
+    device = lib.mkDefault "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root";
+    fsType = "bcachefs";
+    options = [ "X-mount.subdir=etc" ];
+  };
+
+  fileSystems."/nix" = lib.mkForce {
+    device = lib.mkDefault "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root";
+    fsType = "bcachefs";
+    options = [
+      "X-mount.subdir=nix"
+      "verbose"
+    ];
+  };
+
+  fileSystems."/home" = lib.mkForce {
+    device = lib.mkDefault "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root";
+    fsType = "bcachefs";
+    options = [ "X-mount.subdir=home" ];
+  };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

systems/x86_64-linux/nuc-nixos/sops.nix

@@ -1,8 +1,4 @@
 { lib, ... }:
-let
-  defaultSops = (lib.snowfall.fs.get-file "secrets/nuc-secrets.yaml");
-  sharedSops = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
-in
 {
   # Permission modes are in octal representation (same as chmod),
   # the digits represent: user|group|others

systems/x86_64-linux/nuc/hardware-configuration.nix

@@ -1,63 +0,0 @@
-# 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 = [ "xhci_pci" "nvme" "ahci" "usbhid" "uas" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = lib.mkForce
-    { device = "none";
-      fsType = "tmpfs";
-      options = [ "mode=755" ];
-    };
-
-  fileSystems."/boot" = lib.mkForce
-    { device = "UUID=0FCB-EC63"; # "/dev/disk/by-partlabel/disk-main-ESP";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  fileSystems."/var/log" = lib.mkForce
-    { device = "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root";
-      fsType = "bcachefs";
-      options = [ "X-mount.subdir=log" ];
-    };
-
-  fileSystems."/root" = lib.mkForce
-    { device = lib.mkDefault "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root";
-      fsType = "bcachefs";
-      options = [ "X-mount.subdir=root" ];
-    };
-
-  fileSystems."/etc" = lib.mkForce
-    { device = lib.mkDefault "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root";
-      fsType = "bcachefs";
-      options = [ "X-mount.subdir=etc" ];
-    };
-
-  fileSystems."/nix" = lib.mkForce
-    { device = lib.mkDefault "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root";
-      fsType = "bcachefs";
-      options = [ "X-mount.subdir=nix" "verbose" ];
-    };
-
-  fileSystems."/home" = lib.mkForce
-    { device = lib.mkDefault "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root";
-      fsType = "bcachefs";
-      options = [ "X-mount.subdir=home" ];
-    };
-
-  swapDevices =
-    [ ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}