treewide format

home/crow/Datto.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   imports = [
     common/core
   ];

home/crow/HandlerOne.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   imports = [
     common/core
   ];

home/crow/common/core/helix.nix

@@ -11,12 +11,17 @@
     languages = {
       language-server.phpactor = with pkgs; {
         command = "${phpactor}/bin/phpactor";
-        args = ["language-server"];
+        args = [ "language-server" ];
       };
-      language = [{
+      language = [
-        name = "php";
+        {
-        language-servers = ["intelephense" "phpactor"];
+          name = "php";
-      }];
+          language-servers = [
+            "intelephense"
+            "phpactor"
+          ];
+        }
+      ];
     };
   };
 }

home/crow/common/core/xdg.nix

@@ -3,7 +3,8 @@
   lib,
   hostSpec,
   ...
-}: {
+}:
+{
   home = {
     preferXdgDirectories = true;
   };

home/crow/common/optional/desktops/awww/default.nix

@@ -1,5 +1,6 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
-  services.swww= {
+{
+  services.swww = {
     enable = true;
     package = pkgs.awww;
   };

hosts/common/core/avahi.nix

@@ -1,4 +1,5 @@
-{lib, ...}: {
+{ lib, ... }:
+{
   services.avahi = lib.mkDefault {
     enable = true;
     nssmdns4 = true;

hosts/common/core/darwin.nix

@@ -1 +1 @@
-{}
+{ }

hosts/common/core/dns.nix

@@ -1,9 +1,13 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   environment.systemPackages = [
     pkgs.nextdns
   ];
   services.nextdns = {
     enable = true;
-    arguments = ["-config" "cc2b9b"];
+    arguments = [
+      "-config"
+      "cc2b9b"
+    ];
   };
 }

hosts/common/core/sops.nix

@@ -5,9 +5,11 @@
   inputs,
   config,
   ...
-}: let
+}:
+let
   sopsFolder = builtins.toString inputs.nix-secrets + "/sops";
-in {
+in
+{
   #the import for inputs.sops-nix.nixosModules.sops is handled in hosts/common/core/default.nix so that it can be dynamically input according to the platform
 
   sops = {
@@ -16,7 +18,7 @@ in {
     validateSopsFiles = false;
     age = {
       # automatically import host SSH keys as age keys
-      sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
+      sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
     };
     # secrets will be output to /run/secrets
     # e.g. /run/secrets/msmtp-password
@@ -49,13 +51,14 @@ in {
   # The containing folders are created as root and if this is the first ~/.config/ entry,
   # the ownership is busted and home-manager can't target because it can't write into .config...
   # FIXME(sops): We might not need this depending on how https://github.com/Mic92/sops-nix/issues/381 is fixed
-  system.activationScripts.sopsSetAgeKeyOwnership = let
+  system.activationScripts.sopsSetAgeKeyOwnership =
-    ageFolder = "${config.hostSpec.home}/.config/sops/age";
+    let
-    user = config.users.users.${config.hostSpec.username}.name;
+      ageFolder = "${config.hostSpec.home}/.config/sops/age";
-    group = config.users.users.${config.hostSpec.username}.group;
+      user = config.users.users.${config.hostSpec.username}.name;
-  in ''
+      group = config.users.users.${config.hostSpec.username}.group;
-    mkdir -p ${ageFolder} || true
+    in
-    chown -R ${user}:${group} ${config.hostSpec.home}/.config
+    ''
-  '';
+      mkdir -p ${ageFolder} || true
+      chown -R ${user}:${group} ${config.hostSpec.home}/.config
+    '';
 }
-

hosts/common/core/ssh.nix

@@ -34,7 +34,8 @@
 
   services.fail2ban = {
     enable = lib.mkDefault true;
-    ignoreIP = [ # Expected internal IP ranges
+    ignoreIP = [
+      # Expected internal IP ranges
       "172.16.0.0/12"
       "192.168.0.0/16"
     ];

hosts/common/disks/btrfs-disk.nix

@@ -5,7 +5,8 @@
   withSwap ? false,
   swapSize,
   ...
-}: {
+}:
+{
   disko.devices = {
     disk = {
       disk0 = {
@@ -24,14 +25,14 @@
                 type = "filesystem";
                 format = "vfat";
                 mountpoint = "/boot";
-                mountOptions = ["defaults"];
+                mountOptions = [ "defaults" ];
               };
             };
             root = {
               size = "100%";
               content = {
                 type = "btrfs";
-                extraArgs = ["-f"]; # Override existing partition
+                extraArgs = [ "-f" ]; # Override existing partition
                 # Subvolumes must set a mountpoint in order to be mounted,
                 # unless their parent is mounted
                 subvolumes = {

hosts/common/disks/btrfs-impermanence-disk.nix

@@ -5,7 +5,8 @@
   swapSize,
   config,
   ...
-}: {
+}:
+{
   fileSystems."/persist".neededForBoot = true;
   disko.devices = {
     disk = {
@@ -25,14 +26,14 @@
                 type = "filesystem";
                 format = "vfat";
                 mountpoint = "/boot";
-                mountOptions = ["defaults"];
+                mountOptions = [ "defaults" ];
               };
             };
             root = {
               size = "100%";
               content = {
                 type = "btrfs";
-                extraArgs = ["-f"]; # Override existing partition
+                extraArgs = [ "-f" ]; # Override existing partition
                 # Subvolumes must set a mountpoint in order to be mounted,
                 # unless their parent is mounted
                 subvolumes = {

hosts/common/disks/btrfs-over-mbr-disk.nix

@@ -5,7 +5,8 @@
   withSwap ? false,
   swapSize,
   ...
-}: {
+}:
+{
   disko.devices = {
     disk = {
       disk0 = {
@@ -26,14 +27,14 @@
                 type = "filesystem";
                 format = "vfat";
                 mountpoint = "/boot";
-                mountOptions = ["umask=0077"];
+                mountOptions = [ "umask=0077" ];
               };
             };
             root = {
               size = "100%";
               content = {
                 type = "btrfs";
-                extraArgs = ["-f"]; # Override existing partition
+                extraArgs = [ "-f" ]; # Override existing partition
                 # Subvolumes must set a mountpoint in order to be mounted,
                 # unless their parent is mounted
                 subvolumes = {

hosts/common/optional/keyd.nix

@@ -2,7 +2,7 @@
   services.keyd = {
     enable = true;
     keyboards.default = {
-      ids = ["*"];
+      ids = [ "*" ];
       settings = {
         main = {
           capslock = "layer(standardL2)";

hosts/common/optional/mysql.nix

@@ -1,6 +1,6 @@
 {
-	services.mysql = {
+  services.mysql = {
-		enable = true;
+    enable = true;
-		package = pkgs.mariadb_118;
+    package = pkgs.mariadb_118;
-	};
+  };
 }

hosts/common/optional/printing.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   services.printing = {
     enable = true;
     drivers = with pkgs; [

hosts/common/optional/services/glances.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}: {
+}:
+{
   services.glances = {
     enable = true;
   };
 }
-

hosts/nixos/HandlerOne/database.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   environment.systemPackages = with pkgs; [
     mycli
   ];
@@ -6,7 +7,7 @@
   networking.firewall.allowedTCPPorts = [
     3306
   ];
-  
+
   services.mysql = {
     enable = true;
     package = pkgs.mariadb_118;

hosts/nixos/HandlerOne/hardware-configuration.nix

@@ -7,15 +7,23 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}:
+{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
+  boot.initrd.availableKernelModules = [
-  boot.initrd.kernelModules = [];
+    "nvme"
-  boot.kernelModules = [];
+    "xhci_pci"
-  boot.extraModulePackages = [];
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
 
   hardware.coral.usb.enable = true;
 }

hosts/nixos/Incarceron/hardware-configuration.nix

@@ -7,15 +7,21 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}:
+{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "sd_mod"];
+  boot.initrd.availableKernelModules = [
-  boot.initrd.kernelModules = [];
+    "xhci_pci"
-  boot.kernelModules = ["kvm-intel"];
+    "ahci"
-  boot.extraModulePackages = [];
+    "usb_storage"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
   hardware.graphics.extraPackages = with pkgs; [
     rocmPackages.clr.icd
   ];

modules/common/default.nix

@@ -1,3 +1,4 @@
-{lib, ...}: {
+{ lib, ... }:
+{
   imports = lib.custom.scanPaths ./.;
 }

modules/common/host-spec.nix

@@ -4,7 +4,8 @@
   pkgs,
   lib,
   ...
-}: {
+}:
+{
   options.hostSpec = {
     # Data variables that don't dictate configuration settings
     username = lib.mkOption {
@@ -20,7 +21,7 @@
       description = "The email of the user";
     };
     networking = lib.mkOption {
-      default = {};
+      default = { };
       type = lib.types.attrsOf lib.types.anything;
       description = "An attribute set of networking information";
     };
@@ -44,12 +45,11 @@
     home = lib.mkOption {
       type = lib.types.str;
       description = "The home directory of the user";
-      default = let
+      default =
-        user = config.hostSpec.username;
+        let
-      in
+          user = config.hostSpec.username;
-        if pkgs.stdenv.isLinux
+        in
-        then "/home/${user}"
+        if pkgs.stdenv.isLinux then "/home/${user}" else "/Users/${user}";
-        else "/Users/${user}";
     };
     persistFolder = lib.mkOption {
       type = lib.types.str;

modules/home/default.nix

@@ -1,4 +1,4 @@
-{lib, ...}: {
+{ lib, ... }:
+{
   imports = lib.custom.scanPaths ./.;
 }
-

modules/home/monitors.nix

@@ -2,7 +2,8 @@
   lib,
   config,
   ...
-}: {
+}:
+{
   options.monitors = lib.mkOption {
     type = lib.types.listOf (
       lib.types.submodule {
@@ -69,7 +70,7 @@
         };
       }
     );
-    default = [];
+    default = [ ];
   };
   config = {
     assertions = [

modules/quadlets/flamesites/default.nix

@@ -27,7 +27,8 @@ in
     };
   };
 
-  systemd.services.flamesite-backup = { # TODO: Remove when replication setup
+  systemd.services.flamesite-backup = {
+    # TODO: Remove when replication setup
     script = ''
       ${pkgs.podman}/bin/podman exec swgal_db_1 sh -c 'exec mysqldump --no-tablespaces -usgr_user -psgr_pass sgr_db' > ${volumePath}/flamesites/swgalaxyproject/dbBackups/db.sql
       ${pkgs.podman}/bin/podman exec nnsbluegrass_db_1 sh -c 'exec mysqldump --no-tablespaces -unns_user -pnns_pass nns_db' > ${volumePath}/flamesites/nnsbluegrass/dbBackups/db.sql

modules/quadlets/grimmory/default.nix

@@ -5,7 +5,7 @@ in
 {
 
   sops.secrets = {
-    "mariadb/users/grimmory" = {};
+    "mariadb/users/grimmory" = { };
   };
 
   sops.templates."grimmory-secrets".content = ''
@@ -17,7 +17,7 @@ in
       "grimmory"
     ];
   };
-    
+
   systemd.tmpfiles.rules = [
     "d /var/lib/grimmory 774 1000 1000"
     "d /var/lib/grimmory/data 774 1000 1000"
@@ -37,13 +37,13 @@ in
           "${builtins.toString port}:6060"
         ];
         environments = {
-          TZ="Etc/UTC";
+          TZ = "Etc/UTC";
-          APP_USER_ID="1000";
+          APP_USER_ID = "1000";
-          APP_GROUP_ID="1000";
+          APP_GROUP_ID = "1000";
-          BOOKLORE_PORT="6060";
+          BOOKLORE_PORT = "6060";
 
-          DATABASE_URL="jdbc:mariadb://host.containers.internal:3306/grimmory";
+          DATABASE_URL = "jdbc:mariadb://host.containers.internal:3306/grimmory";
-          DATABASE_USERNAME="grimmory";
+          DATABASE_USERNAME = "grimmory";
         };
         environmentFiles = [
           config.sops.templates."grimmory-secrets".path

modules/services/flamesites/default.nix

@@ -40,10 +40,10 @@ in
     enable = true;
     virtualHosts = {
       # "swgalaxyproject.com".extraConfig = ''
-        # reverse_proxy http://localhost:8080
+      # reverse_proxy http://localhost:8080
       # '';
       # "nnsbluegrass.com".extraConfig = ''
-        # reverse_proxy http://localhost:9821
+      # reverse_proxy http://localhost:9821
       # '';
       "swgalaxyproject.com".extraConfig = ''
         file_server {

modules/services/matrix/default.nix

@@ -38,11 +38,11 @@ in
   users.users.caddy.extraGroups = [ "tuwunel" ];
 
   services.caddy = {
-	    enable = true;
+    enable = true;
-	    virtualHosts = {
+    virtualHosts = {
-	      "psychal.link, psychal.link:8448".extraConfig = ''
+      "psychal.link, psychal.link:8448".extraConfig = ''
-	        reverse_proxy unix//run/tuwunel/tuwunel.sock
+        	        reverse_proxy unix//run/tuwunel/tuwunel.sock
-	      '';
+        	      '';
-	    };
+    };
-	  };
+  };
 }

nixos-bootstrap/flake.nix

@@ -7,19 +7,21 @@
     nvix.url = "github:TheWanderingCrow/nvix";
   };
 
-  outputs = {
+  outputs =
-    self,
+    {
-    nixpkgs,
+      self,
-    ...
+      nixpkgs,
-  } @ inputs: {
+      ...
-    nixosConfigurations = {
+    }@inputs:
-      ISO = nixpkgs.lib.nixosSystem {
+    {
-        specialArgs = {inherit inputs;};
+      nixosConfigurations = {
-        modules = [
+        ISO = nixpkgs.lib.nixosSystem {
-          ./installers/ISO.nix
+          specialArgs = { inherit inputs; };
-          ./installer-config.nix
+          modules = [
-        ];
+            ./installers/ISO.nix
+            ./installer-config.nix
+          ];
+        };
       };
     };
-  };
 }

nixos-bootstrap/installers/DigitalOcean.nix

@@ -1,6 +1,9 @@
-{pkgs ? import <nixpkgs> {}}: let
+{
+  pkgs ? import <nixpkgs> { },
+}:
+let
   config = {
-    imports = [<nixpkgs/nixos/modules/virtualisation/digital-ocean-image.nix>];
+    imports = [ <nixpkgs/nixos/modules/virtualisation/digital-ocean-image.nix> ];
   };
 in
-  (pkgs.nixos config).digitalOceanImage
+(pkgs.nixos config).digitalOceanImage

nixos-bootstrap/installers/ISO.nix

@@ -3,7 +3,8 @@
   inputs,
   modulesPath,
   ...
-}: {
+}:
+{
   imports = [
     inputs.disko.nixosModules.disko
     "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"