diff --git a/deployments/fudo/flake.lock b/deployments/fudo/flake.lock index 0f8a730..e785e92 100644 --- a/deployments/fudo/flake.lock +++ b/deployments/fudo/flake.lock @@ -1,5 +1,29 @@ { "nodes": { + "blobs": { + "flake": false, + "locked": { + "narHash": "sha256-kEFu7cmc0WF1ulwsWex+VSQKMeRpvfDiown8XLq7eu4=", + "path": "/state/secrets/blobs", + "type": "path" + }, + "original": { + "path": "/state/secrets/blobs", + "type": "path" + } + }, + "blobs_2": { + "flake": false, + "locked": { + "narHash": "sha256-kEFu7cmc0WF1ulwsWex+VSQKMeRpvfDiown8XLq7eu4=", + "path": "/state/secrets/blobs", + "type": "path" + }, + "original": { + "path": "/state/secrets/blobs", + "type": "path" + } + }, "build-keypairs": { "flake": false, "locked": { @@ -48,6 +72,90 @@ "type": "path" } }, + "chute": { + "inputs": { + "clj2nix": "clj2nix", + "gitignore": "gitignore", + "nixpkgs": "nixpkgs_2", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1639520373, + "narHash": "sha256-nJJpvdsL/D/gY8iFaacdoS9phz74wPh2Ta1fc/XfBMg=", + "ref": "stable", + "rev": "56438b1ee2856cb98781f4580a1c6cc0cc6e6f1e", + "revCount": 4, + "type": "git", + "url": "https://git.fudo.org/chute/chute.git" + }, + "original": { + "ref": "stable", + "type": "git", + "url": "https://git.fudo.org/chute/chute.git" + } + }, + "chuteUnstable": { + "inputs": { + "clj2nix": "clj2nix_2", + "gitignore": "gitignore_2", + "nixpkgs": "nixpkgs_4", + "utils": "utils_4" + }, + "locked": { + "lastModified": 1639549911, + "narHash": "sha256-15NAi0K2qKpuIi+5xTxkvCM+9y8sZ4EDBjTbWYooXII=", + "ref": "master", + "rev": "8b4ed29554057d3e2540be9595bcc6bdf87042da", + "revCount": 5, + "type": "git", + "url": "https://git.fudo.org/chute/chute.git" + }, + "original": { + "ref": "master", + "type": "git", + "url": "https://git.fudo.org/chute/chute.git" + } + }, + "clj2nix": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs", + "utils": "utils" + }, + "locked": { + "lastModified": 1637900288, + "narHash": "sha256-hQdSCIm1WpG5uK9hoe/iagyYc3Fhi8PJzfo1jFBa53g=", + "owner": "hlolli", + "repo": "clj2nix", + "rev": "3d0a38c954c8e0926f57de1d80d357df05fc2f94", + "type": "github" + }, + "original": { + "owner": "hlolli", + "repo": "clj2nix", + "type": "github" + } + }, + "clj2nix_2": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs_3", + "utils": "utils_3" + }, + "locked": { + "lastModified": 1637900288, + "narHash": "sha256-hQdSCIm1WpG5uK9hoe/iagyYc3Fhi8PJzfo1jFBa53g=", + "owner": "hlolli", + "repo": "clj2nix", + "rev": "3d0a38c954c8e0926f57de1d80d357df05fc2f94", + "type": "github" + }, + "original": { + "owner": "hlolli", + "repo": "clj2nix", + "type": "github" + } + }, "deployment-common": { "flake": false, "locked": { @@ -96,7 +204,7 @@ "explain-pause-mode": "explain-pause-mode", "flake-utils": "flake-utils_3", "nix-straight": "nix-straight", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_5", "nose": "nose", "ob-racket": "ob-racket", "org": "org", @@ -273,6 +381,38 @@ "type": "path" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1638122382, @@ -327,11 +467,11 @@ ] }, "locked": { - "lastModified": 1639382367, - "narHash": "sha256-Zz3c14UXRdDR4m0mz9LLnqpa1bw1jxNHaFB/Zp715xI=", + "lastModified": 1639518935, + "narHash": "sha256-I3+jWNiGo6q3BtQHNgWK5aZ7K22L6YzNjQ5ZOfKgYwQ=", "ref": "master", - "rev": "ea5ad17ed043496217fa940495b9c215bf7f0339", - "revCount": 23, + "rev": "ee5bede8e9766bbdf7b9f093d8eb3d1c2eb27caa", + "revCount": 24, "type": "git", "url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git" }, @@ -350,11 +490,11 @@ ] }, "locked": { - "lastModified": 1639382367, - "narHash": "sha256-Zz3c14UXRdDR4m0mz9LLnqpa1bw1jxNHaFB/Zp715xI=", + "lastModified": 1639518935, + "narHash": "sha256-I3+jWNiGo6q3BtQHNgWK5aZ7K22L6YzNjQ5ZOfKgYwQ=", "ref": "master", - "rev": "ea5ad17ed043496217fa940495b9c215bf7f0339", - "revCount": 23, + "rev": "ee5bede8e9766bbdf7b9f093d8eb3d1c2eb27caa", + "revCount": 24, "type": "git", "url": "https://git.fudo.org/fudo-nix/entities.git" }, @@ -374,11 +514,11 @@ ] }, "locked": { - "lastModified": 1639073015, - "narHash": "sha256-F9KuMZNZjyQx4+JxH8QWhtPQlCJCRscjvWknsxYWus4=", + "lastModified": 1639517964, + "narHash": "sha256-s3aK3E1Stg03LgxWgskS5pIPNPl7mhfpibddpglTXaA=", "ref": "master", - "rev": "8ccd875d048ec7cad944a080a24d59d36b4f8cb8", - "revCount": 54, + "rev": "a40e13493a87b7287a6142892d6e21153a7dde9a", + "revCount": 56, "type": "git", "url": "https://git.fudo.org/fudo-nix/home.git" }, @@ -419,7 +559,7 @@ }, "fudo-lib_3": { "locked": { - "narHash": "sha256-59rmsqpFdwXog4jNcplbDTaPw/iVw4xnJ9DRhUsjLWc=", + "narHash": "sha256-X2l9qB/8qXTQPIhiuQuB+QJPn+MamsNz2HWSg/NPNR0=", "path": "/state/fudo-lib", "type": "path" }, @@ -430,6 +570,8 @@ }, "fudo-nixos": { "inputs": { + "chute": "chute", + "chuteUnstable": "chuteUnstable", "fudo-entities": "fudo-entities_2", "fudo-home": "fudo-home", "fudo-lib": "fudo-lib_3", @@ -440,7 +582,7 @@ ] }, "locked": { - "narHash": "sha256-l/4EWeXD7t47TWIVRWP79TgJFX7bhyHApa6YXWjq2JQ=", + "narHash": "sha256-2/DmaDZLmP7K1zep6KdT6DoNnokWk7NFWcvlIZzgqTE=", "path": "/state/fudo-nixos", "type": "path" }, @@ -466,6 +608,7 @@ }, "fudo-secrets": { "inputs": { + "blobs": "blobs", "build-keypairs": "build-keypairs", "build-seed": "build-seed", "dnssec-keys": "dnssec-keys", @@ -474,10 +617,11 @@ "realm-master-keys": "realm-master-keys", "service-keytabs": "service-keytabs", "service-passwords": "service-passwords", + "service-secrets": "service-secrets", "ssh-keypairs": "ssh-keypairs" }, "locked": { - "narHash": "sha256-BHRAUrDwfKB0OzFRABqRCbsQ9dteeg5a5Uf4mvfjG20=", + "narHash": "sha256-5+NwkA1fKrS7PEuJw3CLwLcAr7aUPanVphh0zPfB9GQ=", "path": "/state/secrets", "type": "path" }, @@ -488,6 +632,7 @@ }, "fudo-secrets_2": { "inputs": { + "blobs": "blobs_2", "build-keypairs": "build-keypairs_2", "build-seed": "build-seed_2", "dnssec-keys": "dnssec-keys_2", @@ -496,10 +641,11 @@ "realm-master-keys": "realm-master-keys_2", "service-keytabs": "service-keytabs_2", "service-passwords": "service-passwords_2", + "service-secrets": "service-secrets_2", "ssh-keypairs": "ssh-keypairs_2" }, "locked": { - "narHash": "sha256-BHRAUrDwfKB0OzFRABqRCbsQ9dteeg5a5Uf4mvfjG20=", + "narHash": "sha256-5+NwkA1fKrS7PEuJw3CLwLcAr7aUPanVphh0zPfB9GQ=", "path": "/state/secrets", "type": "path" }, @@ -508,6 +654,50 @@ "type": "path" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "fudo-nixos", + "chute", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1635165013, + "narHash": "sha256-o/BdVjNwcB6jOmzZjOH703BesSkkS5O7ej3xhyO8hAY=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "5b9e0ff9d3b551234b4f3eb3983744fa354b17f1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "fudo-nixos", + "chuteUnstable", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1635165013, + "narHash": "sha256-o/BdVjNwcB6jOmzZjOH703BesSkkS5O7ej3xhyO8hAY=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "5b9e0ff9d3b551234b4f3eb3983744fa354b17f1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -589,6 +779,66 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1637881340, + "narHash": "sha256-/meU5CTm8GnaETZrJa0UqBQvk9T/jKp1+MLIQQ7FTTo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d460f48ddb884f7270b7f7bfcbf8a7b91140caa5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1638196344, + "narHash": "sha256-fkOqSkfOkl8tqxDd+zJU4kAgyLXp/ouaP+U9gpjEZZs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2553aee74fed8c2205a4aeb3ffd206ca14ede60f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.05", + "type": "indirect" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1637881340, + "narHash": "sha256-/meU5CTm8GnaETZrJa0UqBQvk9T/jKp1+MLIQQ7FTTo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d460f48ddb884f7270b7f7bfcbf8a7b91140caa5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1638196344, + "narHash": "sha256-fkOqSkfOkl8tqxDd+zJU4kAgyLXp/ouaP+U9gpjEZZs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2553aee74fed8c2205a4aeb3ffd206ca14ede60f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.05", + "type": "indirect" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1626852498, "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=", @@ -603,7 +853,7 @@ "type": "indirect" } }, - "nixpkgs_2": { + "nixpkgs_6": { "locked": { "lastModified": 1639161226, "narHash": "sha256-75Y08ynJDTq6HHGIF+8IADBJSVip0UyWQH7jqSFnRR8=", @@ -760,7 +1010,7 @@ "fudo-entities": "fudo-entities", "fudo-nixos": "fudo-nixos", "fudo-secrets": "fudo-secrets_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_6" } }, "rotate-text": { @@ -827,6 +1077,30 @@ "type": "path" } }, + "service-secrets": { + "flake": false, + "locked": { + "narHash": "sha256-IfG9fX6qr+EKMfG6l/nzhrNYYXfKBtaNHHhiW6eCcGk=", + "path": "/state/secrets/service-secrets", + "type": "path" + }, + "original": { + "path": "/state/secrets/service-secrets", + "type": "path" + } + }, + "service-secrets_2": { + "flake": false, + "locked": { + "narHash": "sha256-IfG9fX6qr+EKMfG6l/nzhrNYYXfKBtaNHHhiW6eCcGk=", + "path": "/state/secrets/service-secrets", + "type": "path" + }, + "original": { + "path": "/state/secrets/service-secrets", + "type": "path" + } + }, "ssh-keypairs": { "flake": false, "locked": { @@ -850,6 +1124,66 @@ "path": "/state/secrets/ssh-keypairs", "type": "path" } + }, + "utils": { + "locked": { + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_2": { + "locked": { + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_3": { + "locked": { + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_4": { + "locked": { + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/deployments/informis/flake.lock b/deployments/informis/flake.lock index 5578cf0..e785e92 100644 --- a/deployments/informis/flake.lock +++ b/deployments/informis/flake.lock @@ -1,5 +1,29 @@ { "nodes": { + "blobs": { + "flake": false, + "locked": { + "narHash": "sha256-kEFu7cmc0WF1ulwsWex+VSQKMeRpvfDiown8XLq7eu4=", + "path": "/state/secrets/blobs", + "type": "path" + }, + "original": { + "path": "/state/secrets/blobs", + "type": "path" + } + }, + "blobs_2": { + "flake": false, + "locked": { + "narHash": "sha256-kEFu7cmc0WF1ulwsWex+VSQKMeRpvfDiown8XLq7eu4=", + "path": "/state/secrets/blobs", + "type": "path" + }, + "original": { + "path": "/state/secrets/blobs", + "type": "path" + } + }, "build-keypairs": { "flake": false, "locked": { @@ -48,6 +72,90 @@ "type": "path" } }, + "chute": { + "inputs": { + "clj2nix": "clj2nix", + "gitignore": "gitignore", + "nixpkgs": "nixpkgs_2", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1639520373, + "narHash": "sha256-nJJpvdsL/D/gY8iFaacdoS9phz74wPh2Ta1fc/XfBMg=", + "ref": "stable", + "rev": "56438b1ee2856cb98781f4580a1c6cc0cc6e6f1e", + "revCount": 4, + "type": "git", + "url": "https://git.fudo.org/chute/chute.git" + }, + "original": { + "ref": "stable", + "type": "git", + "url": "https://git.fudo.org/chute/chute.git" + } + }, + "chuteUnstable": { + "inputs": { + "clj2nix": "clj2nix_2", + "gitignore": "gitignore_2", + "nixpkgs": "nixpkgs_4", + "utils": "utils_4" + }, + "locked": { + "lastModified": 1639549911, + "narHash": "sha256-15NAi0K2qKpuIi+5xTxkvCM+9y8sZ4EDBjTbWYooXII=", + "ref": "master", + "rev": "8b4ed29554057d3e2540be9595bcc6bdf87042da", + "revCount": 5, + "type": "git", + "url": "https://git.fudo.org/chute/chute.git" + }, + "original": { + "ref": "master", + "type": "git", + "url": "https://git.fudo.org/chute/chute.git" + } + }, + "clj2nix": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs", + "utils": "utils" + }, + "locked": { + "lastModified": 1637900288, + "narHash": "sha256-hQdSCIm1WpG5uK9hoe/iagyYc3Fhi8PJzfo1jFBa53g=", + "owner": "hlolli", + "repo": "clj2nix", + "rev": "3d0a38c954c8e0926f57de1d80d357df05fc2f94", + "type": "github" + }, + "original": { + "owner": "hlolli", + "repo": "clj2nix", + "type": "github" + } + }, + "clj2nix_2": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs_3", + "utils": "utils_3" + }, + "locked": { + "lastModified": 1637900288, + "narHash": "sha256-hQdSCIm1WpG5uK9hoe/iagyYc3Fhi8PJzfo1jFBa53g=", + "owner": "hlolli", + "repo": "clj2nix", + "rev": "3d0a38c954c8e0926f57de1d80d357df05fc2f94", + "type": "github" + }, + "original": { + "owner": "hlolli", + "repo": "clj2nix", + "type": "github" + } + }, "deployment-common": { "flake": false, "locked": { @@ -96,7 +204,7 @@ "explain-pause-mode": "explain-pause-mode", "flake-utils": "flake-utils_3", "nix-straight": "nix-straight", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_5", "nose": "nose", "ob-racket": "ob-racket", "org": "org", @@ -273,6 +381,38 @@ "type": "path" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1638122382, @@ -327,11 +467,11 @@ ] }, "locked": { - "lastModified": 1639074482, - "narHash": "sha256-diaAXDKP89pdcmHV7sc/a4FAE7G4xL2qvKKcinI1K7g=", + "lastModified": 1639518935, + "narHash": "sha256-I3+jWNiGo6q3BtQHNgWK5aZ7K22L6YzNjQ5ZOfKgYwQ=", "ref": "master", - "rev": "7c094f43c4009d9e4d3e2588f50d93ca054eeb9a", - "revCount": 18, + "rev": "ee5bede8e9766bbdf7b9f093d8eb3d1c2eb27caa", + "revCount": 24, "type": "git", "url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git" }, @@ -350,11 +490,11 @@ ] }, "locked": { - "lastModified": 1639074482, - "narHash": "sha256-diaAXDKP89pdcmHV7sc/a4FAE7G4xL2qvKKcinI1K7g=", + "lastModified": 1639518935, + "narHash": "sha256-I3+jWNiGo6q3BtQHNgWK5aZ7K22L6YzNjQ5ZOfKgYwQ=", "ref": "master", - "rev": "7c094f43c4009d9e4d3e2588f50d93ca054eeb9a", - "revCount": 18, + "rev": "ee5bede8e9766bbdf7b9f093d8eb3d1c2eb27caa", + "revCount": 24, "type": "git", "url": "https://git.fudo.org/fudo-nix/entities.git" }, @@ -374,11 +514,11 @@ ] }, "locked": { - "lastModified": 1639073015, - "narHash": "sha256-F9KuMZNZjyQx4+JxH8QWhtPQlCJCRscjvWknsxYWus4=", + "lastModified": 1639517964, + "narHash": "sha256-s3aK3E1Stg03LgxWgskS5pIPNPl7mhfpibddpglTXaA=", "ref": "master", - "rev": "8ccd875d048ec7cad944a080a24d59d36b4f8cb8", - "revCount": 54, + "rev": "a40e13493a87b7287a6142892d6e21153a7dde9a", + "revCount": 56, "type": "git", "url": "https://git.fudo.org/fudo-nix/home.git" }, @@ -419,21 +559,19 @@ }, "fudo-lib_3": { "locked": { - "lastModified": 1638990149, - "narHash": "sha256-p1T0GMJXIJvTpVdn5nK7RZJX8izkabADJ/LsaL442zI=", - "ref": "master", - "rev": "c87448ff1365c3d5230690f68d1ba246652581d1", - "revCount": 24, - "type": "git", - "url": "https://git.fudo.org/fudo-nix/lib.git" + "narHash": "sha256-X2l9qB/8qXTQPIhiuQuB+QJPn+MamsNz2HWSg/NPNR0=", + "path": "/state/fudo-lib", + "type": "path" }, "original": { - "type": "git", - "url": "https://git.fudo.org/fudo-nix/lib.git" + "path": "/state/fudo-lib", + "type": "path" } }, "fudo-nixos": { "inputs": { + "chute": "chute", + "chuteUnstable": "chuteUnstable", "fudo-entities": "fudo-entities_2", "fudo-home": "fudo-home", "fudo-lib": "fudo-lib_3", @@ -444,17 +582,13 @@ ] }, "locked": { - "lastModified": 1639074662, - "narHash": "sha256-n8qH2DiT7EOuGAeyRCZyhUGpzoH7AP2/UYj8LzNpBOM=", - "ref": "master", - "rev": "981da8bb98867c2b32994a6a0f678698848e6d19", - "revCount": 417, - "type": "git", - "url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git" + "narHash": "sha256-2/DmaDZLmP7K1zep6KdT6DoNnokWk7NFWcvlIZzgqTE=", + "path": "/state/fudo-nixos", + "type": "path" }, "original": { - "type": "git", - "url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git" + "path": "/state/fudo-nixos", + "type": "path" } }, "fudo-pkgs": { @@ -474,6 +608,7 @@ }, "fudo-secrets": { "inputs": { + "blobs": "blobs", "build-keypairs": "build-keypairs", "build-seed": "build-seed", "dnssec-keys": "dnssec-keys", @@ -482,10 +617,11 @@ "realm-master-keys": "realm-master-keys", "service-keytabs": "service-keytabs", "service-passwords": "service-passwords", + "service-secrets": "service-secrets", "ssh-keypairs": "ssh-keypairs" }, "locked": { - "narHash": "sha256-Q89s52d8KAMIbxh7aBoUwUTFAbgUBE5IaAIwd267k20=", + "narHash": "sha256-5+NwkA1fKrS7PEuJw3CLwLcAr7aUPanVphh0zPfB9GQ=", "path": "/state/secrets", "type": "path" }, @@ -496,6 +632,7 @@ }, "fudo-secrets_2": { "inputs": { + "blobs": "blobs_2", "build-keypairs": "build-keypairs_2", "build-seed": "build-seed_2", "dnssec-keys": "dnssec-keys_2", @@ -504,10 +641,11 @@ "realm-master-keys": "realm-master-keys_2", "service-keytabs": "service-keytabs_2", "service-passwords": "service-passwords_2", + "service-secrets": "service-secrets_2", "ssh-keypairs": "ssh-keypairs_2" }, "locked": { - "narHash": "sha256-Q89s52d8KAMIbxh7aBoUwUTFAbgUBE5IaAIwd267k20=", + "narHash": "sha256-5+NwkA1fKrS7PEuJw3CLwLcAr7aUPanVphh0zPfB9GQ=", "path": "/state/secrets", "type": "path" }, @@ -516,6 +654,50 @@ "type": "path" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "fudo-nixos", + "chute", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1635165013, + "narHash": "sha256-o/BdVjNwcB6jOmzZjOH703BesSkkS5O7ej3xhyO8hAY=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "5b9e0ff9d3b551234b4f3eb3983744fa354b17f1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "fudo-nixos", + "chuteUnstable", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1635165013, + "narHash": "sha256-o/BdVjNwcB6jOmzZjOH703BesSkkS5O7ej3xhyO8hAY=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "5b9e0ff9d3b551234b4f3eb3983744fa354b17f1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -542,7 +724,7 @@ "host-keytabs": { "flake": false, "locked": { - "narHash": "sha256-LzDfB9ubACWyQzjXzsPH6eNoESmSVcMFFb3V025Xgow=", + "narHash": "sha256-LAAZVfwD65yS6H7EcKmfiPXtLcfRQ80u3V4LFRjr7ko=", "path": "/state/secrets/kerberos/host-keytabs", "type": "path" }, @@ -554,7 +736,7 @@ "host-keytabs_2": { "flake": false, "locked": { - "narHash": "sha256-LzDfB9ubACWyQzjXzsPH6eNoESmSVcMFFb3V025Xgow=", + "narHash": "sha256-LAAZVfwD65yS6H7EcKmfiPXtLcfRQ80u3V4LFRjr7ko=", "path": "/state/secrets/kerberos/host-keytabs", "type": "path" }, @@ -597,6 +779,66 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1637881340, + "narHash": "sha256-/meU5CTm8GnaETZrJa0UqBQvk9T/jKp1+MLIQQ7FTTo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d460f48ddb884f7270b7f7bfcbf8a7b91140caa5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1638196344, + "narHash": "sha256-fkOqSkfOkl8tqxDd+zJU4kAgyLXp/ouaP+U9gpjEZZs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2553aee74fed8c2205a4aeb3ffd206ca14ede60f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.05", + "type": "indirect" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1637881340, + "narHash": "sha256-/meU5CTm8GnaETZrJa0UqBQvk9T/jKp1+MLIQQ7FTTo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d460f48ddb884f7270b7f7bfcbf8a7b91140caa5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1638196344, + "narHash": "sha256-fkOqSkfOkl8tqxDd+zJU4kAgyLXp/ouaP+U9gpjEZZs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2553aee74fed8c2205a4aeb3ffd206ca14ede60f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.05", + "type": "indirect" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1626852498, "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=", @@ -611,13 +853,13 @@ "type": "indirect" } }, - "nixpkgs_2": { + "nixpkgs_6": { "locked": { - "lastModified": 1638887115, - "narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=", + "lastModified": 1639161226, + "narHash": "sha256-75Y08ynJDTq6HHGIF+8IADBJSVip0UyWQH7jqSFnRR8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65", + "rev": "573095944e7c1d58d30fc679c81af63668b54056", "type": "github" }, "original": { @@ -768,7 +1010,7 @@ "fudo-entities": "fudo-entities", "fudo-nixos": "fudo-nixos", "fudo-secrets": "fudo-secrets_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_6" } }, "rotate-text": { @@ -790,7 +1032,7 @@ "service-keytabs": { "flake": false, "locked": { - "narHash": "sha256-9lw22Gh1IDX+MtXMLi+o3XbjvqEhOiZQG9FiG/xz/U0=", + "narHash": "sha256-0gpaf5j/Uxy6HUXDLt0T7vg4Z2aic1IHhuNUO5IcOhY=", "path": "/state/secrets/kerberos/service-keytabs", "type": "path" }, @@ -802,7 +1044,7 @@ "service-keytabs_2": { "flake": false, "locked": { - "narHash": "sha256-9lw22Gh1IDX+MtXMLi+o3XbjvqEhOiZQG9FiG/xz/U0=", + "narHash": "sha256-0gpaf5j/Uxy6HUXDLt0T7vg4Z2aic1IHhuNUO5IcOhY=", "path": "/state/secrets/kerberos/service-keytabs", "type": "path" }, @@ -835,6 +1077,30 @@ "type": "path" } }, + "service-secrets": { + "flake": false, + "locked": { + "narHash": "sha256-IfG9fX6qr+EKMfG6l/nzhrNYYXfKBtaNHHhiW6eCcGk=", + "path": "/state/secrets/service-secrets", + "type": "path" + }, + "original": { + "path": "/state/secrets/service-secrets", + "type": "path" + } + }, + "service-secrets_2": { + "flake": false, + "locked": { + "narHash": "sha256-IfG9fX6qr+EKMfG6l/nzhrNYYXfKBtaNHHhiW6eCcGk=", + "path": "/state/secrets/service-secrets", + "type": "path" + }, + "original": { + "path": "/state/secrets/service-secrets", + "type": "path" + } + }, "ssh-keypairs": { "flake": false, "locked": { @@ -858,6 +1124,66 @@ "path": "/state/secrets/ssh-keypairs", "type": "path" } + }, + "utils": { + "locked": { + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_2": { + "locked": { + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_3": { + "locked": { + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_4": { + "locked": { + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/deployments/informis/flake.nix b/deployments/informis/flake.nix index 38e87a5..4197dd9 100644 --- a/deployments/informis/flake.nix +++ b/deployments/informis/flake.nix @@ -7,7 +7,8 @@ fudo-secrets.url = "path:/state/secrets"; fudo-nixos = { - url = "git+ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git"; + url = "path:/state/fudo-nixos"; + # url = "git+ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/deployments/seattle/flake.lock b/deployments/seattle/flake.lock index b204bab..66c9c2e 100644 --- a/deployments/seattle/flake.lock +++ b/deployments/seattle/flake.lock @@ -1,5 +1,29 @@ { "nodes": { + "blobs": { + "flake": false, + "locked": { + "narHash": "sha256-DSb+6/G2RJvpqmh7yF8od06aZa+mlXouEa9uS3PhvNo=", + "path": "/state/secrets/blobs", + "type": "path" + }, + "original": { + "path": "/state/secrets/blobs", + "type": "path" + } + }, + "blobs_2": { + "flake": false, + "locked": { + "narHash": "sha256-DSb+6/G2RJvpqmh7yF8od06aZa+mlXouEa9uS3PhvNo=", + "path": "/state/secrets/blobs", + "type": "path" + }, + "original": { + "path": "/state/secrets/blobs", + "type": "path" + } + }, "build-keypairs": { "flake": false, "locked": { @@ -350,11 +374,11 @@ ] }, "locked": { - "lastModified": 1639074482, - "narHash": "sha256-diaAXDKP89pdcmHV7sc/a4FAE7G4xL2qvKKcinI1K7g=", + "lastModified": 1639382367, + "narHash": "sha256-Zz3c14UXRdDR4m0mz9LLnqpa1bw1jxNHaFB/Zp715xI=", "ref": "master", - "rev": "7c094f43c4009d9e4d3e2588f50d93ca054eeb9a", - "revCount": 18, + "rev": "ea5ad17ed043496217fa940495b9c215bf7f0339", + "revCount": 23, "type": "git", "url": "https://git.fudo.org/fudo-nix/entities.git" }, @@ -374,11 +398,11 @@ ] }, "locked": { - "lastModified": 1639073015, - "narHash": "sha256-F9KuMZNZjyQx4+JxH8QWhtPQlCJCRscjvWknsxYWus4=", + "lastModified": 1639447060, + "narHash": "sha256-GJY2u7yUU97WikmCYgVfrwro86QltRu2JTSu/NjL+PU=", "ref": "master", - "rev": "8ccd875d048ec7cad944a080a24d59d36b4f8cb8", - "revCount": 54, + "rev": "76f606d214ce032d7719b71ca59169d71152db25", + "revCount": 55, "type": "git", "url": "https://git.fudo.org/fudo-nix/home.git" }, @@ -419,7 +443,7 @@ }, "fudo-lib_3": { "locked": { - "narHash": "sha256-59rmsqpFdwXog4jNcplbDTaPw/iVw4xnJ9DRhUsjLWc=", + "narHash": "sha256-RxQXZJ3VV8oBLvWx9Risb/tRx6j4YsHOrnKJbc6zshI=", "path": "/state/fudo-lib", "type": "path" }, @@ -440,17 +464,13 @@ ] }, "locked": { - "lastModified": 1639356587, - "narHash": "sha256-zJb7Wfg6ThIUDKJCNM3UmdXSNeJGKChSMGrJAkmXB3Y=", - "ref": "master", - "rev": "5a0b508eccdfb906f5b24270aa62887820f0fd1f", - "revCount": 419, - "type": "git", - "url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git" + "narHash": "sha256-RWI/U3TuGdSNOwUsyklZYnay+4ldRhaLCIkgcRtaG0s=", + "path": "/state/fudo-nixos", + "type": "path" }, "original": { - "type": "git", - "url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git" + "path": "/state/fudo-nixos", + "type": "path" } }, "fudo-pkgs": { @@ -470,6 +490,7 @@ }, "fudo-secrets": { "inputs": { + "blobs": "blobs", "build-keypairs": "build-keypairs", "build-seed": "build-seed", "dnssec-keys": "dnssec-keys", @@ -481,7 +502,7 @@ "ssh-keypairs": "ssh-keypairs" }, "locked": { - "narHash": "sha256-Q89s52d8KAMIbxh7aBoUwUTFAbgUBE5IaAIwd267k20=", + "narHash": "sha256-TD0EFwG8ZnVyfJVX9jO7XnRIBBTPAZVPZ6t+pV06ZuU=", "path": "/state/secrets", "type": "path" }, @@ -492,6 +513,7 @@ }, "fudo-secrets_2": { "inputs": { + "blobs": "blobs_2", "build-keypairs": "build-keypairs_2", "build-seed": "build-seed_2", "dnssec-keys": "dnssec-keys_2", @@ -503,7 +525,7 @@ "ssh-keypairs": "ssh-keypairs_2" }, "locked": { - "narHash": "sha256-m0Gk8MgLEl94HREQKZ95xxqBCFrqPLNShZsLb9rGWF0=", + "narHash": "sha256-TD0EFwG8ZnVyfJVX9jO7XnRIBBTPAZVPZ6t+pV06ZuU=", "path": "/state/secrets", "type": "path" }, @@ -538,7 +560,7 @@ "host-keytabs": { "flake": false, "locked": { - "narHash": "sha256-LzDfB9ubACWyQzjXzsPH6eNoESmSVcMFFb3V025Xgow=", + "narHash": "sha256-LAAZVfwD65yS6H7EcKmfiPXtLcfRQ80u3V4LFRjr7ko=", "path": "/state/secrets/kerberos/host-keytabs", "type": "path" }, @@ -786,7 +808,7 @@ "service-keytabs": { "flake": false, "locked": { - "narHash": "sha256-9lw22Gh1IDX+MtXMLi+o3XbjvqEhOiZQG9FiG/xz/U0=", + "narHash": "sha256-0gpaf5j/Uxy6HUXDLt0T7vg4Z2aic1IHhuNUO5IcOhY=", "path": "/state/secrets/kerberos/service-keytabs", "type": "path" }, diff --git a/deployments/seattle/flake.nix b/deployments/seattle/flake.nix index a3954cf..e778215 100644 --- a/deployments/seattle/flake.nix +++ b/deployments/seattle/flake.nix @@ -7,7 +7,8 @@ fudo-secrets.url = "path:/state/secrets"; fudo-nixos = { - url = "git+ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git"; + url = "path:/state/fudo-nixos"; + # url = "git+ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git"; inputs.nixpkgs.follows = "nixpkgs"; };