diff --git a/common/inputs.nix b/common/inputs.nix deleted file mode 100644 index d049e6b..0000000 --- a/common/inputs.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ nixos-version, ... }: - -{ - nixpkgs.url = "nixpkgs/nixos-${nixos-version}"; - - fudo-home = { - url = "git+https://git.fudo.org/niten/nix-home.git?ref=flake"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - fudo-secrets.url = "path:/state/secrets"; - - fudo-pkgs.url = "git+https://git.fudo.org/fudo-public/fudo-pkgs.git"; - - fudo-nixos = { - url = "git+ssh://fudo_git@git.fudo.org:2222/fudosys/NixOS.git?ref=nixops-flake"; - inputs.nixpkgs.follows = "nixpkgs"; - }; -} diff --git a/deployments/seattle/flake.lock b/deployments/seattle/flake.lock index d4e840f..45ac387 100644 --- a/deployments/seattle/flake.lock +++ b/deployments/seattle/flake.lock @@ -1,26 +1,74 @@ { "nodes": { - "backplane-passwords": { - "flake": false, - "locked": { - "narHash": "sha256-Bf5sVg4oSg6uCKMJl21btfBH4NQI/Wz4SU9j130Shyg=", - "path": "./backplane-passwords", - "type": "path" - }, - "original": { - "path": "./backplane-passwords", - "type": "path" - } - }, "build-keypairs": { "flake": false, "locked": { "narHash": "sha256-4eRLRLCzZ6kQIRZqy51bj60jhFSQ/wlKLeNgABPhTyw=", - "path": "./build-keypairs", + "path": "/state/secrets/build-keypairs", "type": "path" }, "original": { - "path": "./build-keypairs", + "path": "/state/secrets/build-keypairs", + "type": "path" + } + }, + "build-keypairs_2": { + "flake": false, + "locked": { + "narHash": "sha256-4eRLRLCzZ6kQIRZqy51bj60jhFSQ/wlKLeNgABPhTyw=", + "path": "/state/secrets/build-keypairs", + "type": "path" + }, + "original": { + "path": "/state/secrets/build-keypairs", + "type": "path" + } + }, + "build-seed": { + "flake": false, + "locked": { + "narHash": "sha256-6rzGK/itD/RBRoNGw1L2wLV1IcVbn2b0V49ay1J9z7k=", + "path": "/state/secrets/build.seed", + "type": "path" + }, + "original": { + "path": "/state/secrets/build.seed", + "type": "path" + } + }, + "build-seed_2": { + "flake": false, + "locked": { + "narHash": "sha256-6rzGK/itD/RBRoNGw1L2wLV1IcVbn2b0V49ay1J9z7k=", + "path": "/state/secrets/build.seed", + "type": "path" + }, + "original": { + "path": "/state/secrets/build.seed", + "type": "path" + } + }, + "dnssec-keys": { + "flake": false, + "locked": { + "narHash": "sha256-KGZFtyc7Sd5mGjLxnM+R/XnCtOwyZ4IuOMcblIjlCnM=", + "path": "/state/secrets/dnssec-keys", + "type": "path" + }, + "original": { + "path": "/state/secrets/dnssec-keys", + "type": "path" + } + }, + "dnssec-keys_2": { + "flake": false, + "locked": { + "narHash": "sha256-KGZFtyc7Sd5mGjLxnM+R/XnCtOwyZ4IuOMcblIjlCnM=", + "path": "/state/secrets/dnssec-keys", + "type": "path" + }, + "original": { + "path": "/state/secrets/dnssec-keys", "type": "path" } }, @@ -77,6 +125,59 @@ "type": "github" } }, + "doom-emacs_3": { + "inputs": { + "doom-emacs": "doom-emacs_4", + "doom-snippets": "doom-snippets_2", + "emacs-overlay": "emacs-overlay_2", + "emacs-so-long": "emacs-so-long_2", + "evil-markdown": "evil-markdown_2", + "evil-org-mode": "evil-org-mode_2", + "evil-quick-diff": "evil-quick-diff_2", + "explain-pause-mode": "explain-pause-mode_2", + "flake-utils": "flake-utils_2", + "nix-straight": "nix-straight_2", + "nixpkgs": "nixpkgs_2", + "nose": "nose_2", + "ob-racket": "ob-racket_2", + "org": "org_2", + "org-contrib": "org-contrib_2", + "org-yt": "org-yt_2", + "php-extras": "php-extras_2", + "revealjs": "revealjs_2", + "rotate-text": "rotate-text_2" + }, + "locked": { + "lastModified": 1627398156, + "narHash": "sha256-Ru1aV3NuIFXAsvUE3de8KR7xDZOo1GCBJdsWKJn+Ebw=", + "owner": "vlaci", + "repo": "nix-doom-emacs", + "rev": "fee14d217b7a911aad507679dafbeaa8c1ebf5ff", + "type": "github" + }, + "original": { + "owner": "vlaci", + "repo": "nix-doom-emacs", + "type": "github" + } + }, + "doom-emacs_4": { + "flake": false, + "locked": { + "lastModified": 1626604817, + "narHash": "sha256-z+dvjB02cHU+VQ5EMkzqSdX817PZar9AkmmfK27q0vo=", + "owner": "hlissner", + "repo": "doom-emacs", + "rev": "46732c0adaef147144418f9f284ca6b1183ab96f", + "type": "github" + }, + "original": { + "owner": "hlissner", + "ref": "develop", + "repo": "doom-emacs", + "type": "github" + } + }, "doom-snippets": { "flake": false, "locked": { @@ -93,6 +194,22 @@ "type": "github" } }, + "doom-snippets_2": { + "flake": false, + "locked": { + "lastModified": 1625547004, + "narHash": "sha256-V+ytAjB4ZZ+5dJJAu1OY7SbnqrokX5PVBWs0AsgQ8Vs=", + "owner": "hlissner", + "repo": "doom-snippets", + "rev": "5c0eb5bd70f035cefb981c2ce64f4367498bdda6", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "doom-snippets", + "type": "github" + } + }, "emacs-overlay": { "flake": false, "locked": { @@ -109,6 +226,22 @@ "type": "github" } }, + "emacs-overlay_2": { + "flake": false, + "locked": { + "lastModified": 1626972035, + "narHash": "sha256-YhBtnKmLDYiEzP5ZEMEQMg6oMP5EV+ToCkku7ZYfL+A=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "be04b45efb35db58e6ac6aa86b84f850c85b5dfe", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, "emacs-so-long": { "flake": false, "locked": { @@ -125,6 +258,22 @@ "type": "github" } }, + "emacs-so-long_2": { + "flake": false, + "locked": { + "lastModified": 1575031854, + "narHash": "sha256-xIa5zO0ZaToDrec1OFjBK6l39AbA4l/CE4LInVu2hi0=", + "owner": "hlissner", + "repo": "emacs-so-long", + "rev": "ed666b0716f60e8988c455804de24b55919e71ca", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "emacs-so-long", + "type": "github" + } + }, "evil-markdown": { "flake": false, "locked": { @@ -141,6 +290,22 @@ "type": "github" } }, + "evil-markdown_2": { + "flake": false, + "locked": { + "lastModified": 1626852210, + "narHash": "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=", + "owner": "Somelauw", + "repo": "evil-markdown", + "rev": "8e6cc68af83914b2fa9fd3a3b8472573dbcef477", + "type": "github" + }, + "original": { + "owner": "Somelauw", + "repo": "evil-markdown", + "type": "github" + } + }, "evil-org-mode": { "flake": false, "locked": { @@ -157,6 +322,22 @@ "type": "github" } }, + "evil-org-mode_2": { + "flake": false, + "locked": { + "lastModified": 1607203864, + "narHash": "sha256-JxwqVYDN6OIJEH15MVI6XOZAPtUWUhJQWHyzcrUvrFg=", + "owner": "hlissner", + "repo": "evil-org-mode", + "rev": "a9706da260c45b98601bcd72b1d2c0a24a017700", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "evil-org-mode", + "type": "github" + } + }, "evil-quick-diff": { "flake": false, "locked": { @@ -173,6 +354,22 @@ "type": "github" } }, + "evil-quick-diff_2": { + "flake": false, + "locked": { + "lastModified": 1575189609, + "narHash": "sha256-oGzl1ayW9rIuq0haoiFS7RZsS8NFMdEA7K1BSozgnJU=", + "owner": "rgrinberg", + "repo": "evil-quick-diff", + "rev": "69c883720b30a892c63bc89f49d4f0e8b8028908", + "type": "github" + }, + "original": { + "owner": "rgrinberg", + "repo": "evil-quick-diff", + "type": "github" + } + }, "explain-pause-mode": { "flake": false, "locked": { @@ -189,15 +386,43 @@ "type": "github" } }, + "explain-pause-mode_2": { + "flake": false, + "locked": { + "lastModified": 1595842060, + "narHash": "sha256-++znrjiDSx+cy4okFBBXUBkRFdtnE2x+trkmqjB3Njs=", + "owner": "lastquestion", + "repo": "explain-pause-mode", + "rev": "2356c8c3639cbeeb9751744dbe737267849b4b51", + "type": "github" + }, + "original": { + "owner": "lastquestion", + "repo": "explain-pause-mode", + "type": "github" + } + }, "filesystem-keys": { "flake": false, "locked": { "narHash": "sha256-K2wdsA4vcNTaLR9A9qxB+aMaeANL0LXOwBWvUm63lX0=", - "path": "./filesystem-keys", + "path": "/state/secrets/filesystem-keys", "type": "path" }, "original": { - "path": "./filesystem-keys", + "path": "/state/secrets/filesystem-keys", + "type": "path" + } + }, + "filesystem-keys_2": { + "flake": false, + "locked": { + "narHash": "sha256-K2wdsA4vcNTaLR9A9qxB+aMaeANL0LXOwBWvUm63lX0=", + "path": "/state/secrets/filesystem-keys", + "type": "path" + }, + "original": { + "path": "/state/secrets/filesystem-keys", "type": "path" } }, @@ -216,6 +441,21 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1623875721, + "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fudo-home": { "inputs": { "doom-emacs": "doom-emacs", @@ -226,11 +466,11 @@ ] }, "locked": { - "lastModified": 1635528550, - "narHash": "sha256-q+ZMD+VmZHz9TazccHQvEdttdxWgKtm5ldDt+w4jpFU=", + "lastModified": 1637022553, + "narHash": "sha256-1YL/i6g/lQyd8y47ljwC9YuUa9LUP+xvq1Jg3jOd4bU=", "ref": "flake", - "rev": "7d7f95b1c229ceed825559f1f94ee6f676b429a6", - "revCount": 38, + "rev": "887a14bfa910a333af188962b6f77878eced368b", + "revCount": 47, "type": "git", "url": "https://git.fudo.org/niten/nix-home.git" }, @@ -240,25 +480,65 @@ "url": "https://git.fudo.org/niten/nix-home.git" } }, - "fudo-nixos": { - "flake": false, + "fudo-home_2": { + "inputs": { + "doom-emacs": "doom-emacs_3", + "home-manager": "home-manager_2", + "niten-doom-config": "niten-doom-config_2", + "nixpkgs": "nixpkgs_3" + }, "locked": { - "narHash": "sha256-QYhuo67dvvLdy8RD3gGWCzBG4azEZTuY8vLICu1N32s=", - "path": "/state/nixops/fudo-nixos", + "narHash": "sha256-TpFI+nD+c9JXhKKDBgIHJhIfveTScBD6gotTPt8tvg4=", + "path": "/state/nixops/fudo-home", "type": "path" }, "original": { - "path": "/state/nixops/fudo-nixos", + "path": "/state/nixops/fudo-home", "type": "path" } }, + "fudo-nixos": { + "inputs": { + "fudo-home": "fudo-home_2", + "fudo-pkgs": "fudo-pkgs", + "fudo-secrets": "fudo-secrets", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1637257901, + "narHash": "sha256-TjQM8Dm4Jn7dJlKV/zt+5UK46lO5vzX7EHfqtHIu/P8=", + "ref": "nixops-flake", + "rev": "4168027ac234de6f8c2cc29c888b44c2897cef58", + "revCount": 377, + "type": "git", + "url": "ssh://fudo_git@git.fudo.org:2222/fudosys/NixOS.git" + }, + "original": { + "ref": "nixops-flake", + "type": "git", + "url": "ssh://fudo_git@git.fudo.org:2222/fudosys/NixOS.git" + } + }, "fudo-pkgs": { "locked": { - "lastModified": 1633732024, - "narHash": "sha256-H1xthHmjvczP+qYQnoLmZjqagHEk5LVsv/0zDlmZoAc=", + "narHash": "sha256-XwEs/VkqJp1mNwYUeBUqCPrW6GUEwAxbXMVOy7bF2P8=", + "path": "/state/nixops/fudo-pkgs", + "type": "path" + }, + "original": { + "path": "/state/nixops/fudo-pkgs", + "type": "path" + } + }, + "fudo-pkgs_2": { + "locked": { + "lastModified": 1637050187, + "narHash": "sha256-E1Xz7MLL/ZZZcxVd/7VycBC0N/zFz+OjIHx2h0ki+Fo=", "ref": "master", - "rev": "160807215cf9158605b072c54a9b682522d62989", - "revCount": 10, + "rev": "4dc41229084416562eb12d02c84020fb3800d96b", + "revCount": 17, "type": "git", "url": "https://git.fudo.org/fudo-public/fudo-pkgs.git" }, @@ -269,16 +549,40 @@ }, "fudo-secrets": { "inputs": { - "backplane-passwords": "backplane-passwords", "build-keypairs": "build-keypairs", + "build-seed": "build-seed", + "dnssec-keys": "dnssec-keys", "filesystem-keys": "filesystem-keys", "host-keytabs": "host-keytabs", + "realm-master-keys": "realm-master-keys", "service-keytabs": "service-keytabs", "service-passwords": "service-passwords", "ssh-keypairs": "ssh-keypairs" }, "locked": { - "narHash": "sha256-0L3GFcBuGWbPyz5GUj9jX+ENtPx/U2rcMzO3yCDSq1M=", + "narHash": "sha256-Q89s52d8KAMIbxh7aBoUwUTFAbgUBE5IaAIwd267k20=", + "path": "/state/secrets", + "type": "path" + }, + "original": { + "path": "/state/secrets", + "type": "path" + } + }, + "fudo-secrets_2": { + "inputs": { + "build-keypairs": "build-keypairs_2", + "build-seed": "build-seed_2", + "dnssec-keys": "dnssec-keys_2", + "filesystem-keys": "filesystem-keys_2", + "host-keytabs": "host-keytabs_2", + "realm-master-keys": "realm-master-keys_2", + "service-keytabs": "service-keytabs_2", + "service-passwords": "service-passwords_2", + "ssh-keypairs": "ssh-keypairs_2" + }, + "locked": { + "narHash": "sha256-Q89s52d8KAMIbxh7aBoUwUTFAbgUBE5IaAIwd267k20=", "path": "/state/secrets", "type": "path" }, @@ -309,15 +613,50 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "fudo-nixos", + "fudo-home", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1637019201, + "narHash": "sha256-lq4gz51fx4m5FXfx1SCB444aEBeaYtLMVm3P18Wi9ls=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "bcf03fa16a1f06b8a0abb27bf49afa8d6fffe8f1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-21.05", + "repo": "home-manager", + "type": "github" + } + }, "host-keytabs": { "flake": false, "locked": { - "narHash": "sha256-+4bPq8vQIaBsMXXcuw41yLTxe6e/Yy80NlCdrabEPCM=", - "path": "./kerberos/host-keytabs", + "narHash": "sha256-LzDfB9ubACWyQzjXzsPH6eNoESmSVcMFFb3V025Xgow=", + "path": "/state/secrets/kerberos/host-keytabs", "type": "path" }, "original": { - "path": "./kerberos/host-keytabs", + "path": "/state/secrets/kerberos/host-keytabs", + "type": "path" + } + }, + "host-keytabs_2": { + "flake": false, + "locked": { + "narHash": "sha256-LzDfB9ubACWyQzjXzsPH6eNoESmSVcMFFb3V025Xgow=", + "path": "/state/secrets/kerberos/host-keytabs", + "type": "path" + }, + "original": { + "path": "/state/secrets/kerberos/host-keytabs", "type": "path" } }, @@ -337,6 +676,22 @@ "url": "https://git.fudo.org/niten/doom-emacs.git" } }, + "niten-doom-config_2": { + "flake": false, + "locked": { + "lastModified": 1633712607, + "narHash": "sha256-6PAw7Xvoj4JROeTqK1nhT2zv7bPpiQlm9t7H5HQ0f2k=", + "ref": "master", + "rev": "0a4f8ce4121ba3d64d29b0d52733c08febfb83d8", + "revCount": 35, + "type": "git", + "url": "https://git.fudo.org/niten/doom-emacs.git" + }, + "original": { + "type": "git", + "url": "https://git.fudo.org/niten/doom-emacs.git" + } + }, "nix-straight": { "flake": false, "locked": { @@ -354,6 +709,23 @@ "type": "github" } }, + "nix-straight_2": { + "flake": false, + "locked": { + "lastModified": 1621543597, + "narHash": "sha256-E/m2Hrw2og//CfOCOWe2yapYC01Tqhozn4YMPYJsC3o=", + "owner": "vlaci", + "repo": "nix-straight.el", + "rev": "8e84d04f10b2298de856b2b8b9a0d13abc91b5ca", + "type": "github" + }, + "original": { + "owner": "vlaci", + "ref": "v2.2.0", + "repo": "nix-straight.el", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1626852498, @@ -371,11 +743,41 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1635456205, - "narHash": "sha256-CLZxFvwec8BhFlB5tkIq08UBDNNrijOY780UF6ubJXc=", + "lastModified": 1626852498, + "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "66d6ec6ed2ddc77d08cf677cc8230db39f051793", + "rev": "16105403bdd843540cbef9c63fc0f16c1c6eaa70", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixpkgs-unstable", + "type": "indirect" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1636944046, + "narHash": "sha256-74KLDsiWSBsYXKj/ql9EGbw1TbIJRE7clFkhl30HV/c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "46251a79f752ae1d46ef733e8e9760b6d3429da4", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.05", + "type": "indirect" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1636944046, + "narHash": "sha256-74KLDsiWSBsYXKj/ql9EGbw1TbIJRE7clFkhl30HV/c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "46251a79f752ae1d46ef733e8e9760b6d3429da4", "type": "github" }, "original": { @@ -400,6 +802,22 @@ "type": "github" } }, + "nose_2": { + "flake": false, + "locked": { + "lastModified": 1400604510, + "narHash": "sha256-daEi8Kta1oGaDEmUUDDQMahTTPOpvNpDKk22rlr7cB0=", + "owner": "emacsattic", + "repo": "nose", + "rev": "f8528297519eba911696c4e68fa88892de9a7b72", + "type": "github" + }, + "original": { + "owner": "emacsattic", + "repo": "nose", + "type": "github" + } + }, "ob-racket": { "flake": false, "locked": { @@ -416,6 +834,22 @@ "type": "github" } }, + "ob-racket_2": { + "flake": false, + "locked": { + "lastModified": 1584656173, + "narHash": "sha256-rBUYDDCXb+3D4xTPQo9UocbTPZ32kWV1Uya/1DmZknU=", + "owner": "xchrishawk", + "repo": "ob-racket", + "rev": "83457ec9e1e96a29fd2086ed19432b9d75787673", + "type": "github" + }, + "original": { + "owner": "xchrishawk", + "repo": "ob-racket", + "type": "github" + } + }, "org": { "flake": false, "locked": { @@ -448,6 +882,22 @@ "url": "https://git.sr.ht/~bzg/org-contrib" } }, + "org-contrib_2": { + "flake": false, + "locked": { + "lastModified": 1623339452, + "narHash": "sha256-E3pioqkmAKQm5N7YsgJZil0/ozkdRE7//tE9FGbrluM=", + "ref": "master", + "rev": "fc81309cf6756607a836f93049a9393c2967c4e0", + "revCount": 2599, + "type": "git", + "url": "https://git.sr.ht/~bzg/org-contrib" + }, + "original": { + "type": "git", + "url": "https://git.sr.ht/~bzg/org-contrib" + } + }, "org-yt": { "flake": false, "locked": { @@ -464,6 +914,38 @@ "type": "github" } }, + "org-yt_2": { + "flake": false, + "locked": { + "lastModified": 1527381913, + "narHash": "sha256-dzQ6B7ryzatHCTLyEnRSbWO0VUiX/FHYnpHTs74aVUs=", + "owner": "TobiasZawada", + "repo": "org-yt", + "rev": "40cc1ac76d741055cbefa13860d9f070a7ade001", + "type": "github" + }, + "original": { + "owner": "TobiasZawada", + "repo": "org-yt", + "type": "github" + } + }, + "org_2": { + "flake": false, + "locked": { + "lastModified": 1627155762, + "narHash": "sha256-XS1eA6P0ePabdrnUNe5lN19EA9dfK615gMGObr9wfBQ=", + "owner": "emacs-straight", + "repo": "org-mode", + "rev": "c9dfed48a607c7f6524f1c6480f09cf61a5d6237", + "type": "github" + }, + "original": { + "owner": "emacs-straight", + "repo": "org-mode", + "type": "github" + } + }, "php-extras": { "flake": false, "locked": { @@ -480,6 +962,46 @@ "type": "github" } }, + "php-extras_2": { + "flake": false, + "locked": { + "lastModified": 1573312690, + "narHash": "sha256-r4WyVbzvT0ra4Z6JywNBOw5RxOEYd6Qe2IpebHXkj1U=", + "owner": "arnested", + "repo": "php-extras", + "rev": "d410c5af663c30c01d461ac476d1cbfbacb49367", + "type": "github" + }, + "original": { + "owner": "arnested", + "repo": "php-extras", + "type": "github" + } + }, + "realm-master-keys": { + "flake": false, + "locked": { + "narHash": "sha256-5hDmPweE6lshRKA+AKRgJv7VwWxHsYekwMT32uAUKJU=", + "path": "/state/secrets/kerberos/master-keys", + "type": "path" + }, + "original": { + "path": "/state/secrets/kerberos/master-keys", + "type": "path" + } + }, + "realm-master-keys_2": { + "flake": false, + "locked": { + "narHash": "sha256-5hDmPweE6lshRKA+AKRgJv7VwWxHsYekwMT32uAUKJU=", + "path": "/state/secrets/kerberos/master-keys", + "type": "path" + }, + "original": { + "path": "/state/secrets/kerberos/master-keys", + "type": "path" + } + }, "revealjs": { "flake": false, "locked": { @@ -496,13 +1018,29 @@ "type": "github" } }, + "revealjs_2": { + "flake": false, + "locked": { + "lastModified": 1625811744, + "narHash": "sha256-Y67nVqcovn2PbHXmWOFWMq10Qz2ZIRyyWEO6qsZLbIM=", + "owner": "hakimel", + "repo": "reveal.js", + "rev": "b18f12d964ef80bd9ffb061aae48ff4c15fb43ad", + "type": "github" + }, + "original": { + "owner": "hakimel", + "repo": "reveal.js", + "type": "github" + } + }, "root": { "inputs": { "fudo-home": "fudo-home", "fudo-nixos": "fudo-nixos", - "fudo-pkgs": "fudo-pkgs", - "fudo-secrets": "fudo-secrets", - "nixpkgs": "nixpkgs_2" + "fudo-pkgs": "fudo-pkgs_2", + "fudo-secrets": "fudo-secrets_2", + "nixpkgs": "nixpkgs_4" } }, "rotate-text": { @@ -521,39 +1059,91 @@ "type": "github" } }, + "rotate-text_2": { + "flake": false, + "locked": { + "lastModified": 1322962747, + "narHash": "sha256-SOeOgSlcEIsKhUiYDJv0p+mLUb420s9E2BmvZQvZ0wk=", + "owner": "debug-ito", + "repo": "rotate-text.el", + "rev": "48f193697db996855aee1ad2bc99b38c6646fe76", + "type": "github" + }, + "original": { + "owner": "debug-ito", + "repo": "rotate-text.el", + "type": "github" + } + }, "service-keytabs": { "flake": false, "locked": { - "narHash": "sha256-F2npNGjUglGumazLFj9qQABGradbwCnKYZn8BEGweJc=", - "path": "./kerberos/service-keytabs", + "narHash": "sha256-9lw22Gh1IDX+MtXMLi+o3XbjvqEhOiZQG9FiG/xz/U0=", + "path": "/state/secrets/kerberos/service-keytabs", "type": "path" }, "original": { - "path": "./kerberos/service-keytabs", + "path": "/state/secrets/kerberos/service-keytabs", + "type": "path" + } + }, + "service-keytabs_2": { + "flake": false, + "locked": { + "narHash": "sha256-9lw22Gh1IDX+MtXMLi+o3XbjvqEhOiZQG9FiG/xz/U0=", + "path": "/state/secrets/kerberos/service-keytabs", + "type": "path" + }, + "original": { + "path": "/state/secrets/kerberos/service-keytabs", "type": "path" } }, "service-passwords": { "flake": false, "locked": { - "narHash": "sha256-QF809kxBsyAfshBlm3GLUFaxk5KbU8cIn8v/gY9C9c8=", - "path": "./service-passwords", + "narHash": "sha256-4xEJlPU+KeBtQuFqRlB1bzJMXUQ6a+DT2v3OptaHyTg=", + "path": "/state/secrets/service-passwords", "type": "path" }, "original": { - "path": "./service-passwords", + "path": "/state/secrets/service-passwords", + "type": "path" + } + }, + "service-passwords_2": { + "flake": false, + "locked": { + "narHash": "sha256-4xEJlPU+KeBtQuFqRlB1bzJMXUQ6a+DT2v3OptaHyTg=", + "path": "/state/secrets/service-passwords", + "type": "path" + }, + "original": { + "path": "/state/secrets/service-passwords", "type": "path" } }, "ssh-keypairs": { "flake": false, "locked": { - "narHash": "sha256-HE2nCM6p8hhoLu7JFOaVimzC3XIZfgCT4WHgnp+wqm0=", - "path": "./ssh-keypairs", + "narHash": "sha256-TlRfaYFuJxLUCarxZ1XYnW8PruKyYO5RErVGo5hTgo4=", + "path": "/state/secrets/ssh-keypairs", "type": "path" }, "original": { - "path": "./ssh-keypairs", + "path": "/state/secrets/ssh-keypairs", + "type": "path" + } + }, + "ssh-keypairs_2": { + "flake": false, + "locked": { + "narHash": "sha256-TlRfaYFuJxLUCarxZ1XYnW8PruKyYO5RErVGo5hTgo4=", + "path": "/state/secrets/ssh-keypairs", + "type": "path" + }, + "original": { + "path": "/state/secrets/ssh-keypairs", "type": "path" } } diff --git a/deployments/seattle/flake.nix b/deployments/seattle/flake.nix index a32bbf9..5d2899f 100644 --- a/deployments/seattle/flake.nix +++ b/deployments/seattle/flake.nix @@ -1,12 +1,26 @@ { description = "Definition of the Seattle NixOps network."; - inputs = import ../../common/inputs.nix { - nixos-version = "21.05"; + inputs = { + nixpkgs.url = "nixpkgs/nixos-21.05"; + + fudo-home = { + url = "git+https://git.fudo.org/niten/nix-home.git?ref=flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + fudo-secrets.url = "path:/state/secrets"; + + fudo-pkgs.url = "git+https://git.fudo.org/fudo-public/fudo-pkgs.git"; + + fudo-nixos = { + url = "git+ssh://fudo_git@git.fudo.org:2222/fudosys/NixOS.git?ref=nixops-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, fudo-nixos, ... } @ inputs: - import ../../common/deployment.nix { + outputs = { self, nixpkgs, fudo-nixos, ... } @ inputs: let + deployment = import ../../common/deployment.nix { description = "Seattle NixOps network"; hostnames = with nixpkgs.lib; let domain = "sea.fudo.org"; @@ -16,5 +30,6 @@ in mapAttrsToList (hostname: hostOpts: fudo-nixos.nixosConfigurations.${hostname}) deployment-hosts; - }; + }; + in (deployment inputs); }