Apply treefmt

flake.lock

@@ -230,22 +230,6 @@
         "type": "github"
       }
     },
-    "flake-compat_4": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1668681692,
-        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "locked": {
         "lastModified": 1642700792,
@@ -311,21 +295,6 @@
       }
     },
     "flake-utils_4": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_5": {
       "locked": {
         "lastModified": 1653893745,
         "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
@@ -546,28 +515,6 @@
         "type": "indirect"
       }
     },
-    "nvfetcher": {
-      "inputs": {
-        "flake-compat": "flake-compat_4",
-        "flake-utils": "flake-utils_4",
-        "nixpkgs": [
-          "nixos"
-        ]
-      },
-      "locked": {
-        "lastModified": 1672979485,
-        "narHash": "sha256-LrY0K1yya3nvRlGDc98wm68ozVj7E6a1EXXEr7eHp8E=",
-        "owner": "berberman",
-        "repo": "nvfetcher",
-        "rev": "0a9ac5fd07b52467d81163b1f8c94c12e5c9aff9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "berberman",
-        "repo": "nvfetcher",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -583,13 +530,12 @@
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
         "nur": "nur",
-        "nvfetcher": "nvfetcher",
         "triton-vmtools": "triton-vmtools"
       }
     },
     "triton-vmtools": {
       "inputs": {
-        "flake-utils": "flake-utils_5",
+        "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "nixos"
         ]

flake.nix

@@ -38,8 +38,6 @@
 
     nixos-generators.url = "github:nix-community/nixos-generators";
 
-    nixos-generators.url = "github:nix-community/nixos-generators";
-
     triton-vmtools.url = "git+https://git.b12f.io/pub-solar/infra?ref=main&dir=vmtools";
     triton-vmtools.inputs.nixpkgs.follows = "nixos";
 
@@ -47,18 +45,18 @@
     keycloak-theme-pub-solar.inputs.nixpkgs.follows = "nixos";
   };
 
-  outputs =
+  outputs = {
-    { self
+    self,
-    , digga
+    digga,
-    , nixos
+    nixos,
-    , home
+    home,
-    , nixos-hardware
+    nixos-hardware,
-    , nur
+    nur,
-    , agenix
+    agenix,
-    , deploy
+    deploy,
-    , triton-vmtools
+    triton-vmtools,
-    , keycloak-theme-pub-solar
+    keycloak-theme-pub-solar,
-    , ...
+    ...
   } @ inputs:
     digga.lib.mkFlake
     {
@@ -142,6 +140,7 @@
             anonymous = [pubsolaros users.pub-solar];
           };
         };
+      };
 
       home = {
         imports = [(digga.lib.importExportableModules ./users/modules)];
@@ -169,5 +168,4 @@
         };
       };
     };
-    };
 }

hosts/flora-6/caddy.nix

@@ -1,10 +1,10 @@
-{ config
-, lib
-, pkgs
-, self
-, ...
-}:
 {
+  config,
+  lib,
+  pkgs,
+  self,
+  ...
+}: {
   services.caddy = {
     enable = lib.mkForce true;
     email = "admins@pub.solar";
@@ -79,7 +79,6 @@
           reverse_proxy obs-portal.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.int.greenbaum.zone:3000
         '';
       };
-
     };
   };
   networking.firewall.allowedTCPPorts = [80 443];

hosts/flora-6/default.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   imports = [
     ./flora-6.nix
   ];

hosts/flora-6/flora-6.nix

@@ -1,16 +1,15 @@
-{ config
-, latestModulesPath
-, lib
-, inputs
-, pkgs
-, profiles
-, self
-, ...
-}:
-let
-  psCfg = config.pub-solar;
-in
 {
+  config,
+  latestModulesPath,
+  lib,
+  inputs,
+  pkgs,
+  profiles,
+  self,
+  ...
+}: let
+  psCfg = config.pub-solar;
+in {
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix

hosts/flora-6/gitea.nix

@@ -1,10 +1,10 @@
-{ config
-, lib
-, pkgs
-, self
-, ...
-}:
 {
+  config,
+  lib,
+  pkgs,
+  self,
+  ...
+}: {
   age.secrets.gitea-database-password = {
     file = "${self}/secrets/gitea-database-password.age";
     mode = "600";

hosts/flora-6/hardware-configuration.nix

@@ -1,9 +1,13 @@
 # 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 = [];
 
   boot.initrd.availableKernelModules = ["ahci" "virtio_pci" "xhci_pci" "sr_mod" "virtio_blk"];
@@ -11,21 +15,18 @@
   boot.kernelModules = [];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    {
     device = "/dev/disk/by-label/nixos";
     autoResize = true;
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    {
     device = "/dev/disk/by-label/boot";
     fsType = "vfat";
   };
 
-  fileSystems."/data" =
+  fileSystems."/data" = {
-    {
     device = "/dev/disk/by-label/ephemeral0";
     fsType = "ext4";
     options = [

hosts/flora-6/keycloak.nix

@@ -1,11 +1,11 @@
-{ config
-, lib
-, inputs
-, pkgs
-, self
-, ...
-}:
 {
+  config,
+  lib,
+  inputs,
+  pkgs,
+  self,
+  ...
+}: {
   age.secrets.keycloak-database-password = {
     file = "${self}/secrets/keycloak-database-password.age";
     mode = "700";

hosts/flora-6/triton-vmtools.nix

@@ -1,5 +1,8 @@
-{ pkgs, inputs, ... }:
 {
+  pkgs,
+  inputs,
+  ...
+}: {
   environment.systemPackages = with pkgs; [
     inputs.triton-vmtools.packages.${pkgs.system}.default
   ];

modules/core/networking.nix

@@ -1,12 +1,12 @@
-{ config
+{
-, pkgs
+  config,
-, lib
+  pkgs,
-, ...
+  lib,
+  ...
 }:
 with lib; let
   cfg = config.pub-solar.core;
-in
+in {
-{
   options.pub-solar.core = {
     enableCaddy = mkOption {
       type = types.bool;

modules/core/nix.nix

@@ -1,8 +1,9 @@
-{ config
+{
-, pkgs
+  config,
-, lib
+  pkgs,
-, inputs
+  lib,
-, ...
+  inputs,
+  ...
 }: {
   nix = {
     # Use default version alias for nix package

modules/docker/default.nix

@@ -1,13 +1,13 @@
-{ lib
+{
-, config
+  lib,
-, pkgs
+  config,
-, ...
+  pkgs,
+  ...
 }:
 with lib; let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.docker;
-in
+in {
-{
   options.pub-solar.docker = {
     enable = mkEnableOption "Life in metal boxes";
   };

modules/sway/default.nix

@@ -1,12 +1,12 @@
-{ lib
+{
-, config
+  lib,
-, pkgs
+  config,
-, ...
+  pkgs,
+  ...
 }:
 with lib; let
   psCfg = config.pub-solar;
-in
+in {
-{
   options.pub-solar.sway = {
     enable = mkEnableOption "Life in boxes";
 

modules/terminal-life/default.nix

@@ -40,7 +40,8 @@ in {
       screen
     ];
 
-    home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
+    home-manager = with pkgs;
+      pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
         home.packages = [
           ack
           asciinema

pkgs/lgcl.nix

@@ -1,4 +1,5 @@
-self: with self; let
+self:
+with self; let
   looking-glass-client = self.looking-glass-client.overrideAttrs (old: {
     meta.platforms = ["x86_64-linux" "aarch64-linux"];
   });

pkgs/mopidy-jellyfin.nix

@@ -1,4 +1,5 @@
-self: with self; let
+self:
+with self; let
   websocket-client = python39.pkgs.buildPythonPackage rec {
     pname = "websocket-client";
     version = "1.2.1";

pkgs/uhk-agent.nix

@@ -1,4 +1,5 @@
-self: with self; let
+self:
+with self; let
   uhk-agent-bin = stdenv.mkDerivation rec {
     pname = "uhk-agent-bin";
     version = "1.5.14";

profiles/cachix/default.nix

@@ -1,14 +1,13 @@
-{ pkgs
+{
-, lib
+  pkgs,
-, ...
+  lib,
-}:
+  ...
-let
+}: let
   folder = ./.;
   toImport = name: value: folder + ("/" + name);
   filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key && key != "default.nix";
   imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
-in
+in {
-{
   inherit imports;
   nix.settings.substituters = ["https://cache.nixos.org/"];
 }

secrets/secrets.nix

@@ -4,8 +4,7 @@ let
   flora-6 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGP1InpTBN4AlF/4V8HHumAMLJzeO8DpzjUv9Co/+J09 root@pub-solar-infra-vm-1";
   allKeys = [flora-6 teutat3s];
   deployKeys = [flora-6 teutat3s];
-in
+in {
-{
   "gitea-database-password.age".publicKeys = deployKeys;
   "gitea-mailer-password.age".publicKeys = deployKeys;
   "keycloak-database-password.age".publicKeys = deployKeys;

users/barkeeper/default.nix

@@ -1,8 +1,12 @@
-{ config, hmUsers, pkgs, lib, ... }:
-let
-  psCfg = config.pub-solar;
-in
 {
+  config,
+  hmUsers,
+  pkgs,
+  lib,
+  ...
+}: let
+  psCfg = config.pub-solar;
+in {
   config = {
     home-manager.users = {inherit (hmUsers) barkeeper;};