Set up formatting

flake.lock

@@ -58,6 +58,21 @@
       }
     },
     "flake-utils": {
+      "locked": {
+        "lastModified": 1653893745,
+        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
       "locked": {
         "lastModified": 1648297722,
         "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
@@ -307,6 +322,7 @@
       "inputs": {
         "darwin": "darwin",
         "deploy-rs": "deploy-rs",
+        "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "nix-gaming": "nix-gaming",
         "nixpkgs": "nixpkgs_2",
@@ -385,7 +401,7 @@
     },
     "youmubot": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "naersk": "naersk_2",
         "nixpkgs": [
           "nixpkgs"

flake.nix

@@ -12,6 +12,8 @@
     deploy-rs.url = "github:Serokell/deploy-rs";
     nur.url = "github:nix-community/NUR";
 
+    flake-utils.url = github:numtide/flake-utils;
+
     # ---
     # Imported apps
     rnix-lsp.url = "github:nix-community/rnix-lsp";
@@ -146,5 +148,7 @@
       # This is highly advised, and will prevent many possible mistakes
       checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
 
-    };
+    } // (inputs.flake-utils.lib.eachDefaultSystem (system: {
+      formatter = nixpkgs.legacyPackages.${system}.nixpkgs-fmt;
+    }));
 }

home/mac-home.nix

@@ -17,8 +17,7 @@
   ];
 
   # Additional settings for programs
-  programs.fish.shellAliases = {
+  programs.fish.shellAliases = { };
-  };
 
   # This value determines the Home Manager release that your
   # configuration is compatible with. This helps avoid breakage

modules/cloud/postgresql/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... } :
+{ pkgs, config, lib, ... }:
 
 with lib;
 let
@@ -7,7 +7,7 @@ let
   # From a database name, create an "ensureUser"
   # entry with the same name and assign all permissions
   # to that database.
-  userFromDatabase = databaseName : {
+  userFromDatabase = databaseName: {
     name = databaseName;
     ensurePermissions = {
       "DATABASE ${databaseName}" = "ALL PRIVILEGES";
@@ -17,7 +17,7 @@ in
 {
   options.cloud.postgresql.databases = mkOption {
     type = types.listOf types.str;
-    default = [];
+    default = [ ];
     description = ''
       The list of databases to be created.
       An user with the same name

modules/cloud/traefik/default.nix

@@ -1,11 +1,12 @@
-{ pkgs, config, lib, ... } :
+{ pkgs, config, lib, ... }:
 
 with lib;
 let
   # Copied from traefik.nix
   jsonValue = with types;
     let
-      valueType = nullOr (oneOf [
+      valueType = nullOr
+        (oneOf [
           bool
           int
           float
@@ -16,7 +17,8 @@ let
         description = "JSON value";
         emptyValue.value = { };
       };
-    in valueType;
+    in
+    valueType;
 
   cfg = config.cloud.traefik;
 in
@@ -30,7 +32,7 @@ in
 
     config = mkOption {
       type = jsonValue;
-      default = {};
+      default = { };
       description = "The dynamic configuration to be passed to traefik";
     };
 
@@ -62,7 +64,7 @@ in
 
       # Logging
       # -------
-      accessLog = {};
+      accessLog = { };
       log.level = "info";
 
       # ACME Automatic SSL

modules/my-tinc/default.nix

@@ -38,7 +38,8 @@ in
 
   config = mkIf cfg.enable (builtins.seq
     (mkIf (isNull cfg.rsaPrivateKey && isNull cfg.ed25519PrivateKey) (builtins.abort "one of the keys must be defined"))
-    (let
+    (
+      let
         networkName = "my-tinc";
 
         myHost = builtins.getAttr cfg.hostName hosts;
@@ -72,7 +73,7 @@ in
 
         # simple interface setup
         # ----------------------
-      networking.interfaces."tinc.${networkName}".ipv4.addresses = [ { address = myMeshIp; prefixLength = 24; } ];
+        networking.interfaces."tinc.${networkName}".ipv4.addresses = [{ address = myMeshIp; prefixLength = 24; }];
 
         # firewall
         networking.firewall.allowedUDPPorts = [ 655 ];
@@ -80,7 +81,7 @@ in
 
         # configure tinc service
         # ----------------------
-      services.tinc.networks."${networkName}"= {
+        services.tinc.networks."${networkName}" = {
 
           name = cfg.hostName; # who are we in this network.
 
@@ -93,6 +94,7 @@ in
           ed25519PrivateKeyFile = cfg.ed25519PrivateKey;
           rsaPrivateKeyFile = cfg.rsaPrivateKey;
         };
-    })
+      }
+    )
   );
 }

modules/my-tinc/hosts.nix

@@ -13,11 +13,13 @@ in
 {
   config = mkIf cfg.enable {
     # All hosts we know of
-    services.tinc.networks.my-tinc.hostSettings = mapAttrs (name: host: {
+    services.tinc.networks.my-tinc.hostSettings = mapAttrs
-      addresses = if (host ? address) then [ { address = host.address; } ] else [];
+      (name: host: {
-      subnets = [ { address = host.subnetAddr; } ];
+        addresses = if (host ? address) then [{ address = host.address; }] else [ ];
+        subnets = [{ address = host.subnetAddr; }];
         rsaPublicKey = mkIf (host ? "rsaPublicKey") host.rsaPublicKey;
         settings.Ed25519PublicKey = mkIf (host ? "ed25519PublicKey") host.ed25519PublicKey;
-    }) hosts;
+      })
+      hosts;
   };
 }

nki-personal-do/hardware-configuration.nix

@@ -6,5 +6,5 @@
   fileSystems."/" = { device = "/dev/vda1"; fsType = "ext4"; };
 
   # swap
-  swapDevices = [ { device = "/var/swapfile"; } ];
+  swapDevices = [{ device = "/var/swapfile"; }];
 }