nix fmt

flake.nix

@@ -25,11 +25,11 @@
           modules = [
             ({ modulesPath, ... }: {
 
-              imports = [ 
+              imports = [
-                agenix.nixosModules.default 
+                agenix.nixosModules.default
 
                 ./system/containers.nix
-                ./system/hardware-configuration.nix 
+                ./system/hardware-configuration.nix
                 ./system/nix-configuration.nix
                 ./system/security.nix
                 ./system/services.nix

secrets.nix

@@ -1,13 +1,10 @@
 let
-  james = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID7R6FstqVDjVuyKGEUmWolYJ/I/DDxYOQV/zKPkiAth james@eversole.co";
+  james =
-  eve-psr-nix0 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMyaPYK0HcKAjrD1g+FPqPEU9FJ0I6+iKYmQlWKE0zHp root@matri.cx";
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID7R6FstqVDjVuyKGEUmWolYJ/I/DDxYOQV/zKPkiAth james@eversole.co";
+  eve-psr-nix0 =
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMyaPYK0HcKAjrD1g+FPqPEU9FJ0I6+iKYmQlWKE0zHp root@matri.cx";
   all = [ james eve-psr-nix0 ];
-in
+in {
-{
+  "secrets/keys.age" = { publicKeys = all; };
-  "secrets/keys.age" = { 
+  "secrets/sezycei.age" = { publicKeys = all; };
-    publicKeys = all;
-  };
-  "secrets/sezycei.age" = {
-    publicKeys = all;
-  };
 }

system/containers.nix

@@ -88,7 +88,8 @@
           "/etc/localtime:/etc/localtime:ro"
           "/home/torrent/data:/data"
         ];
-        environmentFiles = [ /home/sezycei/srv/containerdata/transmission/.env ];
+        environmentFiles =
+          [ /home/sezycei/srv/containerdata/transmission/.env ];
         extraOptions = [ "--cap-add=NET_ADMIN" "--privileged" ];
       };
     };

system/nix-configuration.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{ ... }: {
-{
   nix = {
     buildMachines = [ ];
     distributedBuilds = false;

system/security.nix

@@ -1,4 +1 @@
-{ ... }:
+{ ... }: { security.sudo.wheelNeedsPassword = false; }
-{
-  security.sudo.wheelNeedsPassword = false;
-}

system/services.nix

@@ -1,9 +1,6 @@
-{ ... }:
+{ ... }: {
-{
   services = {
-    openssh = {
+    openssh = { enable = true; };
-      enable = true;
-    };
 
     hydra = {
       enable = true;

system/system.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }: {
-{
   boot = {
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = true;

system/virtualisation.nix

@@ -1,8 +1 @@
-{ ... }:
+{ ... }: { virtualisation = { oci-containers = { backend = "podman"; }; }; }
-{
-  virtualisation = {
-    oci-containers = {
-      backend = "podman";
-    };
-  };
-}

user/users.nix

@@ -1,18 +1,11 @@
-{ config, pkgs, ... }:
+{ config, pkgs, ... }: {
-{
   users.users = {
     sezycei = {
       isNormalUser = true;
       passwordFile = config.age.secrets.sezycei.path;
-      extraGroups = [ "wheel" ]; 
+      extraGroups = [ "wheel" ];
-      packages = with pkgs; [
+      packages = with pkgs; [ byobu tmux stack ];
-        byobu 
-        tmux
-        stack 
-      ];
     };
-    torrent = {
+    torrent = { isNormalUser = true; };
-      isNormalUser = true;
+  };
-    };
-	};
 }