From 80bfb747adddb25082f7aafe3b74d29a8e3f2c31 Mon Sep 17 00:00:00 2001 From: niten Date: Mon, 11 Jul 2022 08:39:24 -0700 Subject: [PATCH] Evolution...not currently deploying to informis/fudo --- deployments/fudo/flake.lock | 277 +++++++------- deployments/fudo/flake.nix | 14 +- deployments/informis/flake.lock | 277 +++++++------- deployments/informis/flake.nix | 11 +- deployments/seattle/flake.lock | 634 ++++++++++++++++++++++++++------ deployments/seattle/flake.nix | 11 +- 6 files changed, 819 insertions(+), 405 deletions(-) diff --git a/deployments/fudo/flake.lock b/deployments/fudo/flake.lock index a33e026..206822a 100644 --- a/deployments/fudo/flake.lock +++ b/deployments/fudo/flake.lock @@ -102,11 +102,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1639617108, - "narHash": "sha256-8lwF4kcf/pigrNIrR4JXdTTFTCxgKyVGsYppVEt1rII=", + "lastModified": 1641048770, + "narHash": "sha256-8rzyOw029lbQC/UzzROwr+k9tnYKPgLIBLxMne6abo4=", "ref": "master", - "rev": "0845e2e7eb44aefe38e3ae80ac237fd851733737", - "revCount": 6, + "rev": "88a8dbfe38d164351afeeca32c9e725d825e362d", + "revCount": 17, "type": "git", "url": "https://git.fudo.org/chute/chute.git" }, @@ -196,15 +196,24 @@ "inputs": { "doom-emacs": "doom-emacs_2", "doom-snippets": "doom-snippets", - "emacs-overlay": "emacs-overlay", + "emacs-overlay": [ + "fudo-nixos", + "fudo-home", + "emacs-overlay" + ], "emacs-so-long": "emacs-so-long", "evil-markdown": "evil-markdown", "evil-org-mode": "evil-org-mode", "evil-quick-diff": "evil-quick-diff", "explain-pause-mode": "explain-pause-mode", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils", + "format-all": "format-all", "nix-straight": "nix-straight", - "nixpkgs": "nixpkgs_5", + "nixpkgs": [ + "fudo-nixos", + "fudo-home", + "nixpkgs" + ], "nose": "nose", "ob-racket": "ob-racket", "org": "org", @@ -215,15 +224,15 @@ "rotate-text": "rotate-text" }, "locked": { - "lastModified": 1627398156, - "narHash": "sha256-Ru1aV3NuIFXAsvUE3de8KR7xDZOo1GCBJdsWKJn+Ebw=", - "owner": "vlaci", + "lastModified": 1649509049, + "narHash": "sha256-gLmRO2gPqjLPmFBhgFkl1nbBzJlNV0lmXMzapbw9qac=", + "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "fee14d217b7a911aad507679dafbeaa8c1ebf5ff", + "rev": "f3f40f333c3214c9614c23b6abd1ae498af3e5b5", "type": "github" }, "original": { - "owner": "vlaci", + "owner": "nix-community", "repo": "nix-doom-emacs", "type": "github" } @@ -231,16 +240,16 @@ "doom-emacs_2": { "flake": false, "locked": { - "lastModified": 1626604817, - "narHash": "sha256-z+dvjB02cHU+VQ5EMkzqSdX817PZar9AkmmfK27q0vo=", + "lastModified": 1645634993, + "narHash": "sha256-QeE6aUJxoaqHM28Cpt2rKC817VQvXGuuFUyLzehaC50=", "owner": "hlissner", "repo": "doom-emacs", - "rev": "46732c0adaef147144418f9f284ca6b1183ab96f", + "rev": "42e5763782fdc1aabb9f2624d468248d6978abe2", "type": "github" }, "original": { "owner": "hlissner", - "ref": "develop", + "ref": "master", "repo": "doom-emacs", "type": "github" } @@ -248,11 +257,11 @@ "doom-snippets": { "flake": false, "locked": { - "lastModified": 1625547004, - "narHash": "sha256-V+ytAjB4ZZ+5dJJAu1OY7SbnqrokX5PVBWs0AsgQ8Vs=", + "lastModified": 1646222996, + "narHash": "sha256-YhOnoNSpmcKNJg+aS/829zqXStMkKWXWf1pulHEBcpQ=", "owner": "hlissner", "repo": "doom-snippets", - "rev": "5c0eb5bd70f035cefb981c2ce64f4367498bdda6", + "rev": "f61c23ece1ad47c0522059ac45085fd283ce4452", "type": "github" }, "original": { @@ -264,11 +273,11 @@ "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1626972035, - "narHash": "sha256-YhBtnKmLDYiEzP5ZEMEQMg6oMP5EV+ToCkku7ZYfL+A=", + "lastModified": 1649586061, + "narHash": "sha256-gFAHrrY0i71WIP16FGo3pgNKTZ5m5L6FtQsOYpne9gk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "be04b45efb35db58e6ac6aa86b84f850c85b5dfe", + "rev": "16262a84ef07fb0e8cfc592b65d786b086840065", "type": "github" }, "original": { @@ -415,11 +424,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -428,50 +437,36 @@ "type": "github" } }, - "flake-utils_2": { + "format-all": { + "flake": false, "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "lastModified": 1581716637, + "narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=", + "owner": "lassik", + "repo": "emacs-format-all-the-code", + "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "lassik", + "repo": "emacs-format-all-the-code", + "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", "type": "github" } }, "fudo-entities": { "inputs": { - "flake-utils": "flake-utils", "fudo-lib": "fudo-lib", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1639518935, - "narHash": "sha256-I3+jWNiGo6q3BtQHNgWK5aZ7K22L6YzNjQ5ZOfKgYwQ=", + "lastModified": 1653253887, + "narHash": "sha256-Z88Ck6nCW+zOfsxtHa+7hB2uPPuHotAkpRZqE2KoyF8=", "ref": "master", - "rev": "ee5bede8e9766bbdf7b9f093d8eb3d1c2eb27caa", - "revCount": 24, + "rev": "52b7da1ceccb919787685875a21a1d2356c6cc1f", + "revCount": 93, "type": "git", "url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git" }, @@ -482,7 +477,6 @@ }, "fudo-entities_2": { "inputs": { - "flake-utils": "flake-utils_2", "fudo-lib": "fudo-lib_2", "nixpkgs": [ "fudo-nixos", @@ -490,11 +484,11 @@ ] }, "locked": { - "lastModified": 1639518935, - "narHash": "sha256-I3+jWNiGo6q3BtQHNgWK5aZ7K22L6YzNjQ5ZOfKgYwQ=", + "lastModified": 1653253887, + "narHash": "sha256-Z88Ck6nCW+zOfsxtHa+7hB2uPPuHotAkpRZqE2KoyF8=", "ref": "master", - "rev": "ee5bede8e9766bbdf7b9f093d8eb3d1c2eb27caa", - "revCount": 24, + "rev": "52b7da1ceccb919787685875a21a1d2356c6cc1f", + "revCount": 93, "type": "git", "url": "https://git.fudo.org/fudo-nix/entities.git" }, @@ -506,6 +500,8 @@ "fudo-home": { "inputs": { "doom-emacs": "doom-emacs", + "emacs-overlay": "emacs-overlay", + "fudo-pkgs": "fudo-pkgs", "home-manager": "home-manager", "niten-doom-config": "niten-doom-config", "nixpkgs": [ @@ -514,11 +510,11 @@ ] }, "locked": { - "lastModified": 1639853480, - "narHash": "sha256-FV9LBcA/hh0DIBb7JzmcDjXDq6wJP46NALsMW0orfbc=", + "lastModified": 1653156643, + "narHash": "sha256-0vbp1dCXHN1PTH7lOfBJXeTdZOZD+Qz/rNtoTkBTObE=", "ref": "master", - "rev": "4954bd4e6c5d784740bee169aa7db7850fcfd5e0", - "revCount": 58, + "rev": "94768ec4c09c1f6dfad138d9f60c1fb693cff31a", + "revCount": 158, "type": "git", "url": "https://git.fudo.org/fudo-nix/home.git" }, @@ -529,11 +525,11 @@ }, "fudo-lib": { "locked": { - "lastModified": 1638990149, - "narHash": "sha256-p1T0GMJXIJvTpVdn5nK7RZJX8izkabADJ/LsaL442zI=", + "lastModified": 1641848738, + "narHash": "sha256-9+xyFqyUIzIkNo2HyXxp6Lm9/f0EZqRqkRz52AQoW6Q=", "ref": "master", - "rev": "c87448ff1365c3d5230690f68d1ba246652581d1", - "revCount": 24, + "rev": "63b80fb5dc1e6ad69252a233b7c6a20f649884c6", + "revCount": 59, "type": "git", "url": "https://git.fudo.org/fudo-nix/lib.git" }, @@ -544,11 +540,11 @@ }, "fudo-lib_2": { "locked": { - "lastModified": 1638990149, - "narHash": "sha256-p1T0GMJXIJvTpVdn5nK7RZJX8izkabADJ/LsaL442zI=", + "lastModified": 1641848738, + "narHash": "sha256-9+xyFqyUIzIkNo2HyXxp6Lm9/f0EZqRqkRz52AQoW6Q=", "ref": "master", - "rev": "c87448ff1365c3d5230690f68d1ba246652581d1", - "revCount": 24, + "rev": "63b80fb5dc1e6ad69252a233b7c6a20f649884c6", + "revCount": 59, "type": "git", "url": "https://git.fudo.org/fudo-nix/lib.git" }, @@ -559,7 +555,7 @@ }, "fudo-lib_3": { "locked": { - "narHash": "sha256-UAFFqr8Dln9AtMu1mJDHGFhNQgAezZjU8yywX/yaihs=", + "narHash": "sha256-IZsP2NrqUbz0p3KeTnT7U8RjvSkHODmJTePBSGNmlxw=", "path": "/state/fudo-lib", "type": "path" }, @@ -575,14 +571,15 @@ "fudo-entities": "fudo-entities_2", "fudo-home": "fudo-home", "fudo-lib": "fudo-lib_3", - "fudo-pkgs": "fudo-pkgs", + "fudo-pkgs": "fudo-pkgs_2", "fudo-secrets": "fudo-secrets", "nixpkgs": [ "nixpkgs" - ] + ], + "nixpkgsUnstable": "nixpkgsUnstable" }, "locked": { - "narHash": "sha256-KyYHZOpcRF+NvAErciqRXdTLjsKX/dolUc4WAJHkuv4=", + "narHash": "sha256-7NpFFEQJDsOmY1hl0Acee/TIblEiWrcZFmsQ+a0OfcA=", "path": "/state/fudo-nixos", "type": "path" }, @@ -593,11 +590,26 @@ }, "fudo-pkgs": { "locked": { - "lastModified": 1639072539, - "narHash": "sha256-ezF6GF5JaJgQ7C4ZbzK4VWXl8DrDRO1gsvv/SOckmZ8=", + "lastModified": 1648662131, + "narHash": "sha256-wOJyR8xFQQhZ7gjK+sj3rJND8ORIHPuINNfQsdjM0BE=", "ref": "master", - "rev": "99319e33c6e17476225c1d939e656c6ae6c8152f", - "revCount": 18, + "rev": "c5180cbacd66673a3e8fcd0ce2c4abff119bbe93", + "revCount": 54, + "type": "git", + "url": "https://git.fudo.org/fudo-nix/pkgs.git" + }, + "original": { + "type": "git", + "url": "https://git.fudo.org/fudo-nix/pkgs.git" + } + }, + "fudo-pkgs_2": { + "locked": { + "lastModified": 1648662131, + "narHash": "sha256-wOJyR8xFQQhZ7gjK+sj3rJND8ORIHPuINNfQsdjM0BE=", + "ref": "master", + "rev": "c5180cbacd66673a3e8fcd0ce2c4abff119bbe93", + "revCount": 54, "type": "git", "url": "https://git.fudo.org/fudo-nix/pkgs.git" }, @@ -621,7 +633,7 @@ "ssh-keypairs": "ssh-keypairs" }, "locked": { - "narHash": "sha256-22lvxSaUkKdp33P19eXif1PieGty0cJw4P2R6LJFL30=", + "narHash": "sha256-N3N5RSPFSF/+tA3uqnBkhiiSNzBqsWsUBLXAqG1YS7c=", "path": "/state/secrets", "type": "path" }, @@ -645,7 +657,7 @@ "ssh-keypairs": "ssh-keypairs_2" }, "locked": { - "narHash": "sha256-22lvxSaUkKdp33P19eXif1PieGty0cJw4P2R6LJFL30=", + "narHash": "sha256-N3N5RSPFSF/+tA3uqnBkhiiSNzBqsWsUBLXAqG1YS7c=", "path": "/state/secrets", "type": "path" }, @@ -707,11 +719,11 @@ ] }, "locked": { - "lastModified": 1638553958, - "narHash": "sha256-leETjYMtD9y37CvfRSQhIGibcIl4dNVlFkY/8QgqmAM=", + "lastModified": 1648834319, + "narHash": "sha256-i5Aj4Aw64D/A0X6XW5LxSS4XBnYj7gMz+kN4dpsbdk8=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ce1d64073f48b9bc9425218803b1b607454c1e7", + "rev": "0bdbdea2e26c984b096f4f7d10e3c88536a980b0", "type": "github" }, "original": { @@ -724,7 +736,7 @@ "host-keytabs": { "flake": false, "locked": { - "narHash": "sha256-LAAZVfwD65yS6H7EcKmfiPXtLcfRQ80u3V4LFRjr7ko=", + "narHash": "sha256-SA058alChYye39gm4TwPpCufR1P+X9QnH/EunJYXd5s=", "path": "/state/secrets/kerberos/host-keytabs", "type": "path" }, @@ -736,7 +748,7 @@ "host-keytabs_2": { "flake": false, "locked": { - "narHash": "sha256-LAAZVfwD65yS6H7EcKmfiPXtLcfRQ80u3V4LFRjr7ko=", + "narHash": "sha256-SA058alChYye39gm4TwPpCufR1P+X9QnH/EunJYXd5s=", "path": "/state/secrets/kerberos/host-keytabs", "type": "path" }, @@ -748,11 +760,11 @@ "niten-doom-config": { "flake": false, "locked": { - "lastModified": 1639608722, - "narHash": "sha256-Ao+J7h/zE0X+G3frfxCkoY4hK7T1oNpTpwwv7n7pGaA=", + "lastModified": 1649611838, + "narHash": "sha256-O8+LwXi52WZHQrZRfjW+QwI99ppBiBpYQcWYNgqY+iU=", "ref": "master", - "rev": "8be77a42d7669fa71287c58ebaf210159f198b50", - "revCount": 36, + "rev": "c45feb7fd8acb0730dfc76ddd993773da5411b82", + "revCount": 38, "type": "git", "url": "https://git.fudo.org/niten/doom-emacs.git" }, @@ -764,16 +776,15 @@ "nix-straight": { "flake": false, "locked": { - "lastModified": 1621543597, - "narHash": "sha256-E/m2Hrw2og//CfOCOWe2yapYC01Tqhozn4YMPYJsC3o=", - "owner": "vlaci", + "lastModified": 1643475817, + "narHash": "sha256-NpExq5nbPbj/ppkBX3SnETEJuOne1MKJxen8vVHsDFg=", + "owner": "nix-community", "repo": "nix-straight.el", - "rev": "8e84d04f10b2298de856b2b8b9a0d13abc91b5ca", + "rev": "08d75e5651cb52f8a07e03408ed19e04bee07505", "type": "github" }, "original": { - "owner": "vlaci", - "ref": "v2.2.0", + "owner": "nix-community", "repo": "nix-straight.el", "type": "github" } @@ -793,6 +804,21 @@ "type": "github" } }, + "nixpkgsUnstable": { + "locked": { + "lastModified": 1653060744, + "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "dfd82985c273aac6eced03625f454b334daae2e8", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1638196344, @@ -825,11 +851,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1638196344, - "narHash": "sha256-fkOqSkfOkl8tqxDd+zJU4kAgyLXp/ouaP+U9gpjEZZs=", + "lastModified": 1640653651, + "narHash": "sha256-fByFYXYoE/6TqwKGbT7XBCOAlSsFzOXm4ZsRLoO70m8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2553aee74fed8c2205a4aeb3ffd206ca14ede60f", + "rev": "7bca80140fc7732c7357b26002db3d87b3ba4c61", "type": "github" }, "original": { @@ -840,26 +866,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1626852498, - "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=", + "lastModified": 1653087707, + "narHash": "sha256-zfno3snrzZTWQ2B7K53QHrGZwrjnJLTRPalymrSsziU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "16105403bdd843540cbef9c63fc0f16c1c6eaa70", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixpkgs-unstable", - "type": "indirect" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1639794673, - "narHash": "sha256-bjauV0+Z4WmxeiHXecyiEOEwo+XysO6kx36beeatbl0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2627c4b795107ba94562626925f5a9a2bc62ebc6", + "rev": "cbd40c72b2603ab54e7208f99f9b35fc158bc009", "type": "github" }, "original": { @@ -903,11 +914,11 @@ "org": { "flake": false, "locked": { - "lastModified": 1627155762, - "narHash": "sha256-XS1eA6P0ePabdrnUNe5lN19EA9dfK615gMGObr9wfBQ=", + "lastModified": 1646280299, + "narHash": "sha256-ZNkOfB8o2OHTh2t/ci8uv8aoV3I5IfAgIIOP3azD6eU=", "owner": "emacs-straight", "repo": "org-mode", - "rev": "c9dfed48a607c7f6524f1c6480f09cf61a5d6237", + "rev": "91681fc03334285dc0879fcb9a27583bd7ab9782", "type": "github" }, "original": { @@ -919,11 +930,11 @@ "org-contrib": { "flake": false, "locked": { - "lastModified": 1623339452, - "narHash": "sha256-E3pioqkmAKQm5N7YsgJZil0/ozkdRE7//tE9FGbrluM=", + "lastModified": 1639727892, + "narHash": "sha256-+T6Y87aSAx7kMpigm8d1ODDQIyPBM6a+4qGolXjCEXs=", "ref": "master", - "rev": "fc81309cf6756607a836f93049a9393c2967c4e0", - "revCount": 2599, + "rev": "5766ff1088191e4df5fecd55007ba4271e609bcc", + "revCount": 2611, "type": "git", "url": "https://git.sr.ht/~bzg/org-contrib" }, @@ -991,11 +1002,11 @@ "revealjs": { "flake": false, "locked": { - "lastModified": 1625811744, - "narHash": "sha256-Y67nVqcovn2PbHXmWOFWMq10Qz2ZIRyyWEO6qsZLbIM=", + "lastModified": 1646820626, + "narHash": "sha256-J3bcoO/42FcPIqCU7ORiV7dcvJDKtEHG8N7/stEQqDg=", "owner": "hakimel", "repo": "reveal.js", - "rev": "b18f12d964ef80bd9ffb061aae48ff4c15fb43ad", + "rev": "37861335a225a3cc9f67e98977aceda3c2a9eca9", "type": "github" }, "original": { @@ -1010,7 +1021,7 @@ "fudo-entities": "fudo-entities", "fudo-nixos": "fudo-nixos", "fudo-secrets": "fudo-secrets_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" } }, "rotate-text": { @@ -1056,7 +1067,7 @@ "service-passwords": { "flake": false, "locked": { - "narHash": "sha256-4xEJlPU+KeBtQuFqRlB1bzJMXUQ6a+DT2v3OptaHyTg=", + "narHash": "sha256-vnxG3as7SVq0yIXKsf3qHM58Sv6Dcm7NPg+kLg4QtNs=", "path": "/state/secrets/service-passwords", "type": "path" }, @@ -1068,7 +1079,7 @@ "service-passwords_2": { "flake": false, "locked": { - "narHash": "sha256-4xEJlPU+KeBtQuFqRlB1bzJMXUQ6a+DT2v3OptaHyTg=", + "narHash": "sha256-vnxG3as7SVq0yIXKsf3qHM58Sv6Dcm7NPg+kLg4QtNs=", "path": "/state/secrets/service-passwords", "type": "path" }, @@ -1080,7 +1091,7 @@ "service-secrets": { "flake": false, "locked": { - "narHash": "sha256-IfG9fX6qr+EKMfG6l/nzhrNYYXfKBtaNHHhiW6eCcGk=", + "narHash": "sha256-vXL26U+o23E5tTG4Hb/RZrfra3I8Zw/wdZnT9PKwdks=", "path": "/state/secrets/service-secrets", "type": "path" }, @@ -1092,7 +1103,7 @@ "service-secrets_2": { "flake": false, "locked": { - "narHash": "sha256-IfG9fX6qr+EKMfG6l/nzhrNYYXfKBtaNHHhiW6eCcGk=", + "narHash": "sha256-vXL26U+o23E5tTG4Hb/RZrfra3I8Zw/wdZnT9PKwdks=", "path": "/state/secrets/service-secrets", "type": "path" }, @@ -1104,7 +1115,7 @@ "ssh-keypairs": { "flake": false, "locked": { - "narHash": "sha256-TlRfaYFuJxLUCarxZ1XYnW8PruKyYO5RErVGo5hTgo4=", + "narHash": "sha256-pla2J8HmPHBVDp/2m/22lctwd6VvmJ2cik5n68jf3VY=", "path": "/state/secrets/ssh-keypairs", "type": "path" }, @@ -1116,7 +1127,7 @@ "ssh-keypairs_2": { "flake": false, "locked": { - "narHash": "sha256-TlRfaYFuJxLUCarxZ1XYnW8PruKyYO5RErVGo5hTgo4=", + "narHash": "sha256-pla2J8HmPHBVDp/2m/22lctwd6VvmJ2cik5n68jf3VY=", "path": "/state/secrets/ssh-keypairs", "type": "path" }, diff --git a/deployments/fudo/flake.nix b/deployments/fudo/flake.nix index 216da6a..8b77fac 100644 --- a/deployments/fudo/flake.nix +++ b/deployments/fudo/flake.nix @@ -2,7 +2,9 @@ description = "Fudo NixOps network."; inputs = { + # Hard-coded commit due to https://github.com/vlaci/nix-doom-emacs/issues/401 nixpkgs.url = "nixpkgs/nixos-21.11"; + # nixpkgs.url = "github:NixOS/nixpkgs?rev=971b383a28f4baee8ea3931af4840fa221929fd6"; fudo-secrets.url = "path:/state/secrets"; @@ -23,18 +25,16 @@ }; }; - outputs = { self, nixpkgs, fudo-nixos, fudo-entities, fudo-secrets, deployment-common } @ inputs: + outputs = { self, nixpkgs, fudo-nixos, fudo-entities, fudo-secrets + , deployment-common, ... }@inputs: with nixpkgs.lib; { nixopsConfigurations.default = let description = "Fudo NixOps Network"; - fudo-site = site: - site == "nuttyclub" || site == "worldstream"; + fudo-site = site: site == "nuttyclub" || site == "worldstream"; - deployment-hosts = filterAttrs - (hostname: hostOpts: - hostOpts.nixos-system && - (fudo-site hostOpts.site)) + deployment-hosts = filterAttrs (hostname: hostOpts: + hostOpts.nixos-system && (fudo-site hostOpts.site)) fudo-entities.entities.hosts; deployment-config-generator = diff --git a/deployments/informis/flake.lock b/deployments/informis/flake.lock index a33e026..1d2a6a7 100644 --- a/deployments/informis/flake.lock +++ b/deployments/informis/flake.lock @@ -102,11 +102,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1639617108, - "narHash": "sha256-8lwF4kcf/pigrNIrR4JXdTTFTCxgKyVGsYppVEt1rII=", + "lastModified": 1641048770, + "narHash": "sha256-8rzyOw029lbQC/UzzROwr+k9tnYKPgLIBLxMne6abo4=", "ref": "master", - "rev": "0845e2e7eb44aefe38e3ae80ac237fd851733737", - "revCount": 6, + "rev": "88a8dbfe38d164351afeeca32c9e725d825e362d", + "revCount": 17, "type": "git", "url": "https://git.fudo.org/chute/chute.git" }, @@ -196,15 +196,24 @@ "inputs": { "doom-emacs": "doom-emacs_2", "doom-snippets": "doom-snippets", - "emacs-overlay": "emacs-overlay", + "emacs-overlay": [ + "fudo-nixos", + "fudo-home", + "emacs-overlay" + ], "emacs-so-long": "emacs-so-long", "evil-markdown": "evil-markdown", "evil-org-mode": "evil-org-mode", "evil-quick-diff": "evil-quick-diff", "explain-pause-mode": "explain-pause-mode", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils", + "format-all": "format-all", "nix-straight": "nix-straight", - "nixpkgs": "nixpkgs_5", + "nixpkgs": [ + "fudo-nixos", + "fudo-home", + "nixpkgs" + ], "nose": "nose", "ob-racket": "ob-racket", "org": "org", @@ -215,15 +224,15 @@ "rotate-text": "rotate-text" }, "locked": { - "lastModified": 1627398156, - "narHash": "sha256-Ru1aV3NuIFXAsvUE3de8KR7xDZOo1GCBJdsWKJn+Ebw=", - "owner": "vlaci", + "lastModified": 1649509049, + "narHash": "sha256-gLmRO2gPqjLPmFBhgFkl1nbBzJlNV0lmXMzapbw9qac=", + "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "fee14d217b7a911aad507679dafbeaa8c1ebf5ff", + "rev": "f3f40f333c3214c9614c23b6abd1ae498af3e5b5", "type": "github" }, "original": { - "owner": "vlaci", + "owner": "nix-community", "repo": "nix-doom-emacs", "type": "github" } @@ -231,16 +240,16 @@ "doom-emacs_2": { "flake": false, "locked": { - "lastModified": 1626604817, - "narHash": "sha256-z+dvjB02cHU+VQ5EMkzqSdX817PZar9AkmmfK27q0vo=", + "lastModified": 1645634993, + "narHash": "sha256-QeE6aUJxoaqHM28Cpt2rKC817VQvXGuuFUyLzehaC50=", "owner": "hlissner", "repo": "doom-emacs", - "rev": "46732c0adaef147144418f9f284ca6b1183ab96f", + "rev": "42e5763782fdc1aabb9f2624d468248d6978abe2", "type": "github" }, "original": { "owner": "hlissner", - "ref": "develop", + "ref": "master", "repo": "doom-emacs", "type": "github" } @@ -248,11 +257,11 @@ "doom-snippets": { "flake": false, "locked": { - "lastModified": 1625547004, - "narHash": "sha256-V+ytAjB4ZZ+5dJJAu1OY7SbnqrokX5PVBWs0AsgQ8Vs=", + "lastModified": 1646222996, + "narHash": "sha256-YhOnoNSpmcKNJg+aS/829zqXStMkKWXWf1pulHEBcpQ=", "owner": "hlissner", "repo": "doom-snippets", - "rev": "5c0eb5bd70f035cefb981c2ce64f4367498bdda6", + "rev": "f61c23ece1ad47c0522059ac45085fd283ce4452", "type": "github" }, "original": { @@ -264,11 +273,11 @@ "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1626972035, - "narHash": "sha256-YhBtnKmLDYiEzP5ZEMEQMg6oMP5EV+ToCkku7ZYfL+A=", + "lastModified": 1649586061, + "narHash": "sha256-gFAHrrY0i71WIP16FGo3pgNKTZ5m5L6FtQsOYpne9gk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "be04b45efb35db58e6ac6aa86b84f850c85b5dfe", + "rev": "16262a84ef07fb0e8cfc592b65d786b086840065", "type": "github" }, "original": { @@ -415,11 +424,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -428,50 +437,36 @@ "type": "github" } }, - "flake-utils_2": { + "format-all": { + "flake": false, "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "lastModified": 1581716637, + "narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=", + "owner": "lassik", + "repo": "emacs-format-all-the-code", + "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "lassik", + "repo": "emacs-format-all-the-code", + "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", "type": "github" } }, "fudo-entities": { "inputs": { - "flake-utils": "flake-utils", "fudo-lib": "fudo-lib", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1639518935, - "narHash": "sha256-I3+jWNiGo6q3BtQHNgWK5aZ7K22L6YzNjQ5ZOfKgYwQ=", + "lastModified": 1650751627, + "narHash": "sha256-BmKuSB+FeIB64b1DAKgLvx1EOoNII1QSS9OOSx1k6Vg=", "ref": "master", - "rev": "ee5bede8e9766bbdf7b9f093d8eb3d1c2eb27caa", - "revCount": 24, + "rev": "97b51fcc916ee04e719cce0b653988b80fa62d93", + "revCount": 92, "type": "git", "url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git" }, @@ -482,7 +477,6 @@ }, "fudo-entities_2": { "inputs": { - "flake-utils": "flake-utils_2", "fudo-lib": "fudo-lib_2", "nixpkgs": [ "fudo-nixos", @@ -490,11 +484,11 @@ ] }, "locked": { - "lastModified": 1639518935, - "narHash": "sha256-I3+jWNiGo6q3BtQHNgWK5aZ7K22L6YzNjQ5ZOfKgYwQ=", + "lastModified": 1650751627, + "narHash": "sha256-BmKuSB+FeIB64b1DAKgLvx1EOoNII1QSS9OOSx1k6Vg=", "ref": "master", - "rev": "ee5bede8e9766bbdf7b9f093d8eb3d1c2eb27caa", - "revCount": 24, + "rev": "97b51fcc916ee04e719cce0b653988b80fa62d93", + "revCount": 92, "type": "git", "url": "https://git.fudo.org/fudo-nix/entities.git" }, @@ -506,6 +500,8 @@ "fudo-home": { "inputs": { "doom-emacs": "doom-emacs", + "emacs-overlay": "emacs-overlay", + "fudo-pkgs": "fudo-pkgs", "home-manager": "home-manager", "niten-doom-config": "niten-doom-config", "nixpkgs": [ @@ -514,11 +510,11 @@ ] }, "locked": { - "lastModified": 1639853480, - "narHash": "sha256-FV9LBcA/hh0DIBb7JzmcDjXDq6wJP46NALsMW0orfbc=", + "lastModified": 1652636394, + "narHash": "sha256-NbIQb6vKTP39mDHWLSNX9iJTbNEIkNzlHpNss91dGG8=", "ref": "master", - "rev": "4954bd4e6c5d784740bee169aa7db7850fcfd5e0", - "revCount": 58, + "rev": "61bd8826902b1251963585eb90b90a631feae887", + "revCount": 157, "type": "git", "url": "https://git.fudo.org/fudo-nix/home.git" }, @@ -529,11 +525,11 @@ }, "fudo-lib": { "locked": { - "lastModified": 1638990149, - "narHash": "sha256-p1T0GMJXIJvTpVdn5nK7RZJX8izkabADJ/LsaL442zI=", + "lastModified": 1641848738, + "narHash": "sha256-9+xyFqyUIzIkNo2HyXxp6Lm9/f0EZqRqkRz52AQoW6Q=", "ref": "master", - "rev": "c87448ff1365c3d5230690f68d1ba246652581d1", - "revCount": 24, + "rev": "63b80fb5dc1e6ad69252a233b7c6a20f649884c6", + "revCount": 59, "type": "git", "url": "https://git.fudo.org/fudo-nix/lib.git" }, @@ -544,11 +540,11 @@ }, "fudo-lib_2": { "locked": { - "lastModified": 1638990149, - "narHash": "sha256-p1T0GMJXIJvTpVdn5nK7RZJX8izkabADJ/LsaL442zI=", + "lastModified": 1641848738, + "narHash": "sha256-9+xyFqyUIzIkNo2HyXxp6Lm9/f0EZqRqkRz52AQoW6Q=", "ref": "master", - "rev": "c87448ff1365c3d5230690f68d1ba246652581d1", - "revCount": 24, + "rev": "63b80fb5dc1e6ad69252a233b7c6a20f649884c6", + "revCount": 59, "type": "git", "url": "https://git.fudo.org/fudo-nix/lib.git" }, @@ -559,7 +555,7 @@ }, "fudo-lib_3": { "locked": { - "narHash": "sha256-UAFFqr8Dln9AtMu1mJDHGFhNQgAezZjU8yywX/yaihs=", + "narHash": "sha256-jWey7aqF6yUGOdBL2+aT/Q0s8wYshjmtXp9vHUUOTM8=", "path": "/state/fudo-lib", "type": "path" }, @@ -575,14 +571,15 @@ "fudo-entities": "fudo-entities_2", "fudo-home": "fudo-home", "fudo-lib": "fudo-lib_3", - "fudo-pkgs": "fudo-pkgs", + "fudo-pkgs": "fudo-pkgs_2", "fudo-secrets": "fudo-secrets", "nixpkgs": [ "nixpkgs" - ] + ], + "nixpkgsUnstable": "nixpkgsUnstable" }, "locked": { - "narHash": "sha256-KyYHZOpcRF+NvAErciqRXdTLjsKX/dolUc4WAJHkuv4=", + "narHash": "sha256-zDespLNaRStol+Ue33zqcGGIjkmZEPa7Dy9pahmJHZU=", "path": "/state/fudo-nixos", "type": "path" }, @@ -593,11 +590,26 @@ }, "fudo-pkgs": { "locked": { - "lastModified": 1639072539, - "narHash": "sha256-ezF6GF5JaJgQ7C4ZbzK4VWXl8DrDRO1gsvv/SOckmZ8=", + "lastModified": 1648662131, + "narHash": "sha256-wOJyR8xFQQhZ7gjK+sj3rJND8ORIHPuINNfQsdjM0BE=", "ref": "master", - "rev": "99319e33c6e17476225c1d939e656c6ae6c8152f", - "revCount": 18, + "rev": "c5180cbacd66673a3e8fcd0ce2c4abff119bbe93", + "revCount": 54, + "type": "git", + "url": "https://git.fudo.org/fudo-nix/pkgs.git" + }, + "original": { + "type": "git", + "url": "https://git.fudo.org/fudo-nix/pkgs.git" + } + }, + "fudo-pkgs_2": { + "locked": { + "lastModified": 1648662131, + "narHash": "sha256-wOJyR8xFQQhZ7gjK+sj3rJND8ORIHPuINNfQsdjM0BE=", + "ref": "master", + "rev": "c5180cbacd66673a3e8fcd0ce2c4abff119bbe93", + "revCount": 54, "type": "git", "url": "https://git.fudo.org/fudo-nix/pkgs.git" }, @@ -621,7 +633,7 @@ "ssh-keypairs": "ssh-keypairs" }, "locked": { - "narHash": "sha256-22lvxSaUkKdp33P19eXif1PieGty0cJw4P2R6LJFL30=", + "narHash": "sha256-N3N5RSPFSF/+tA3uqnBkhiiSNzBqsWsUBLXAqG1YS7c=", "path": "/state/secrets", "type": "path" }, @@ -645,7 +657,7 @@ "ssh-keypairs": "ssh-keypairs_2" }, "locked": { - "narHash": "sha256-22lvxSaUkKdp33P19eXif1PieGty0cJw4P2R6LJFL30=", + "narHash": "sha256-N3N5RSPFSF/+tA3uqnBkhiiSNzBqsWsUBLXAqG1YS7c=", "path": "/state/secrets", "type": "path" }, @@ -707,11 +719,11 @@ ] }, "locked": { - "lastModified": 1638553958, - "narHash": "sha256-leETjYMtD9y37CvfRSQhIGibcIl4dNVlFkY/8QgqmAM=", + "lastModified": 1648834319, + "narHash": "sha256-i5Aj4Aw64D/A0X6XW5LxSS4XBnYj7gMz+kN4dpsbdk8=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ce1d64073f48b9bc9425218803b1b607454c1e7", + "rev": "0bdbdea2e26c984b096f4f7d10e3c88536a980b0", "type": "github" }, "original": { @@ -724,7 +736,7 @@ "host-keytabs": { "flake": false, "locked": { - "narHash": "sha256-LAAZVfwD65yS6H7EcKmfiPXtLcfRQ80u3V4LFRjr7ko=", + "narHash": "sha256-SA058alChYye39gm4TwPpCufR1P+X9QnH/EunJYXd5s=", "path": "/state/secrets/kerberos/host-keytabs", "type": "path" }, @@ -736,7 +748,7 @@ "host-keytabs_2": { "flake": false, "locked": { - "narHash": "sha256-LAAZVfwD65yS6H7EcKmfiPXtLcfRQ80u3V4LFRjr7ko=", + "narHash": "sha256-SA058alChYye39gm4TwPpCufR1P+X9QnH/EunJYXd5s=", "path": "/state/secrets/kerberos/host-keytabs", "type": "path" }, @@ -748,11 +760,11 @@ "niten-doom-config": { "flake": false, "locked": { - "lastModified": 1639608722, - "narHash": "sha256-Ao+J7h/zE0X+G3frfxCkoY4hK7T1oNpTpwwv7n7pGaA=", + "lastModified": 1649611838, + "narHash": "sha256-O8+LwXi52WZHQrZRfjW+QwI99ppBiBpYQcWYNgqY+iU=", "ref": "master", - "rev": "8be77a42d7669fa71287c58ebaf210159f198b50", - "revCount": 36, + "rev": "c45feb7fd8acb0730dfc76ddd993773da5411b82", + "revCount": 38, "type": "git", "url": "https://git.fudo.org/niten/doom-emacs.git" }, @@ -764,16 +776,15 @@ "nix-straight": { "flake": false, "locked": { - "lastModified": 1621543597, - "narHash": "sha256-E/m2Hrw2og//CfOCOWe2yapYC01Tqhozn4YMPYJsC3o=", - "owner": "vlaci", + "lastModified": 1643475817, + "narHash": "sha256-NpExq5nbPbj/ppkBX3SnETEJuOne1MKJxen8vVHsDFg=", + "owner": "nix-community", "repo": "nix-straight.el", - "rev": "8e84d04f10b2298de856b2b8b9a0d13abc91b5ca", + "rev": "08d75e5651cb52f8a07e03408ed19e04bee07505", "type": "github" }, "original": { - "owner": "vlaci", - "ref": "v2.2.0", + "owner": "nix-community", "repo": "nix-straight.el", "type": "github" } @@ -793,6 +804,21 @@ "type": "github" } }, + "nixpkgsUnstable": { + "locked": { + "lastModified": 1652659998, + "narHash": "sha256-FqNrXC1EE6U2RACwXBlsAvg1lqQGLYpuYb6+W3DL9vA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1d7db1b9e4cf1ee075a9f52e5c36f7b9f4207502", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1638196344, @@ -825,11 +851,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1638196344, - "narHash": "sha256-fkOqSkfOkl8tqxDd+zJU4kAgyLXp/ouaP+U9gpjEZZs=", + "lastModified": 1640653651, + "narHash": "sha256-fByFYXYoE/6TqwKGbT7XBCOAlSsFzOXm4ZsRLoO70m8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2553aee74fed8c2205a4aeb3ffd206ca14ede60f", + "rev": "7bca80140fc7732c7357b26002db3d87b3ba4c61", "type": "github" }, "original": { @@ -840,26 +866,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1626852498, - "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=", + "lastModified": 1652559422, + "narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "16105403bdd843540cbef9c63fc0f16c1c6eaa70", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixpkgs-unstable", - "type": "indirect" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1639794673, - "narHash": "sha256-bjauV0+Z4WmxeiHXecyiEOEwo+XysO6kx36beeatbl0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2627c4b795107ba94562626925f5a9a2bc62ebc6", + "rev": "8b3398bc7587ebb79f93dfeea1b8c574d3c6dba1", "type": "github" }, "original": { @@ -903,11 +914,11 @@ "org": { "flake": false, "locked": { - "lastModified": 1627155762, - "narHash": "sha256-XS1eA6P0ePabdrnUNe5lN19EA9dfK615gMGObr9wfBQ=", + "lastModified": 1646280299, + "narHash": "sha256-ZNkOfB8o2OHTh2t/ci8uv8aoV3I5IfAgIIOP3azD6eU=", "owner": "emacs-straight", "repo": "org-mode", - "rev": "c9dfed48a607c7f6524f1c6480f09cf61a5d6237", + "rev": "91681fc03334285dc0879fcb9a27583bd7ab9782", "type": "github" }, "original": { @@ -919,11 +930,11 @@ "org-contrib": { "flake": false, "locked": { - "lastModified": 1623339452, - "narHash": "sha256-E3pioqkmAKQm5N7YsgJZil0/ozkdRE7//tE9FGbrluM=", + "lastModified": 1639727892, + "narHash": "sha256-+T6Y87aSAx7kMpigm8d1ODDQIyPBM6a+4qGolXjCEXs=", "ref": "master", - "rev": "fc81309cf6756607a836f93049a9393c2967c4e0", - "revCount": 2599, + "rev": "5766ff1088191e4df5fecd55007ba4271e609bcc", + "revCount": 2611, "type": "git", "url": "https://git.sr.ht/~bzg/org-contrib" }, @@ -991,11 +1002,11 @@ "revealjs": { "flake": false, "locked": { - "lastModified": 1625811744, - "narHash": "sha256-Y67nVqcovn2PbHXmWOFWMq10Qz2ZIRyyWEO6qsZLbIM=", + "lastModified": 1646820626, + "narHash": "sha256-J3bcoO/42FcPIqCU7ORiV7dcvJDKtEHG8N7/stEQqDg=", "owner": "hakimel", "repo": "reveal.js", - "rev": "b18f12d964ef80bd9ffb061aae48ff4c15fb43ad", + "rev": "37861335a225a3cc9f67e98977aceda3c2a9eca9", "type": "github" }, "original": { @@ -1010,7 +1021,7 @@ "fudo-entities": "fudo-entities", "fudo-nixos": "fudo-nixos", "fudo-secrets": "fudo-secrets_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" } }, "rotate-text": { @@ -1056,7 +1067,7 @@ "service-passwords": { "flake": false, "locked": { - "narHash": "sha256-4xEJlPU+KeBtQuFqRlB1bzJMXUQ6a+DT2v3OptaHyTg=", + "narHash": "sha256-vnxG3as7SVq0yIXKsf3qHM58Sv6Dcm7NPg+kLg4QtNs=", "path": "/state/secrets/service-passwords", "type": "path" }, @@ -1068,7 +1079,7 @@ "service-passwords_2": { "flake": false, "locked": { - "narHash": "sha256-4xEJlPU+KeBtQuFqRlB1bzJMXUQ6a+DT2v3OptaHyTg=", + "narHash": "sha256-vnxG3as7SVq0yIXKsf3qHM58Sv6Dcm7NPg+kLg4QtNs=", "path": "/state/secrets/service-passwords", "type": "path" }, @@ -1080,7 +1091,7 @@ "service-secrets": { "flake": false, "locked": { - "narHash": "sha256-IfG9fX6qr+EKMfG6l/nzhrNYYXfKBtaNHHhiW6eCcGk=", + "narHash": "sha256-vXL26U+o23E5tTG4Hb/RZrfra3I8Zw/wdZnT9PKwdks=", "path": "/state/secrets/service-secrets", "type": "path" }, @@ -1092,7 +1103,7 @@ "service-secrets_2": { "flake": false, "locked": { - "narHash": "sha256-IfG9fX6qr+EKMfG6l/nzhrNYYXfKBtaNHHhiW6eCcGk=", + "narHash": "sha256-vXL26U+o23E5tTG4Hb/RZrfra3I8Zw/wdZnT9PKwdks=", "path": "/state/secrets/service-secrets", "type": "path" }, @@ -1104,7 +1115,7 @@ "ssh-keypairs": { "flake": false, "locked": { - "narHash": "sha256-TlRfaYFuJxLUCarxZ1XYnW8PruKyYO5RErVGo5hTgo4=", + "narHash": "sha256-pla2J8HmPHBVDp/2m/22lctwd6VvmJ2cik5n68jf3VY=", "path": "/state/secrets/ssh-keypairs", "type": "path" }, @@ -1116,7 +1127,7 @@ "ssh-keypairs_2": { "flake": false, "locked": { - "narHash": "sha256-TlRfaYFuJxLUCarxZ1XYnW8PruKyYO5RErVGo5hTgo4=", + "narHash": "sha256-pla2J8HmPHBVDp/2m/22lctwd6VvmJ2cik5n68jf3VY=", "path": "/state/secrets/ssh-keypairs", "type": "path" }, diff --git a/deployments/informis/flake.nix b/deployments/informis/flake.nix index 4197dd9..42fa497 100644 --- a/deployments/informis/flake.nix +++ b/deployments/informis/flake.nix @@ -2,7 +2,9 @@ description = "Informis NixOps network."; inputs = { + # Hard-coded commit due to https://github.com/vlaci/nix-doom-emacs/issues/401 nixpkgs.url = "nixpkgs/nixos-21.11"; + # nixpkgs.url = "github:NixOS/nixpkgs?rev=971b383a28f4baee8ea3931af4840fa221929fd6"; fudo-secrets.url = "path:/state/secrets"; @@ -23,16 +25,15 @@ }; }; - outputs = { self, nixpkgs, fudo-nixos, fudo-entities, fudo-secrets, deployment-common } @ inputs: + outputs = { self, nixpkgs, fudo-nixos, fudo-entities, fudo-secrets + , deployment-common }@inputs: with nixpkgs.lib; { nixopsConfigurations.default = let domain = "informis.land"; description = "Informis NixOps Network"; - deployment-hosts = filterAttrs - (hostname: hostOpts: - hostOpts.domain == domain && - hostOpts.nixos-system) + deployment-hosts = filterAttrs (hostname: hostOpts: + hostOpts.domain == domain && hostOpts.nixos-system) fudo-entities.entities.hosts; deployment-config-generator = diff --git a/deployments/seattle/flake.lock b/deployments/seattle/flake.lock index a33e026..09caf12 100644 --- a/deployments/seattle/flake.lock +++ b/deployments/seattle/flake.lock @@ -3,6 +3,7 @@ "blobs": { "flake": false, "locked": { + "lastModified": 0, "narHash": "sha256-bzJh3skCEKFM7KO9N6icOJsRqXmjbSo1s8uNh3t9mYI=", "path": "/state/secrets/blobs", "type": "path" @@ -15,6 +16,7 @@ "blobs_2": { "flake": false, "locked": { + "lastModified": 0, "narHash": "sha256-bzJh3skCEKFM7KO9N6icOJsRqXmjbSo1s8uNh3t9mYI=", "path": "/state/secrets/blobs", "type": "path" @@ -27,6 +29,7 @@ "build-keypairs": { "flake": false, "locked": { + "lastModified": 1634322891, "narHash": "sha256-4eRLRLCzZ6kQIRZqy51bj60jhFSQ/wlKLeNgABPhTyw=", "path": "/state/secrets/build-keypairs", "type": "path" @@ -39,6 +42,7 @@ "build-keypairs_2": { "flake": false, "locked": { + "lastModified": 1634322891, "narHash": "sha256-4eRLRLCzZ6kQIRZqy51bj60jhFSQ/wlKLeNgABPhTyw=", "path": "/state/secrets/build-keypairs", "type": "path" @@ -51,6 +55,7 @@ "build-seed": { "flake": false, "locked": { + "lastModified": 1635809629, "narHash": "sha256-6rzGK/itD/RBRoNGw1L2wLV1IcVbn2b0V49ay1J9z7k=", "path": "/state/secrets/build.seed", "type": "path" @@ -63,6 +68,7 @@ "build-seed_2": { "flake": false, "locked": { + "lastModified": 1635809629, "narHash": "sha256-6rzGK/itD/RBRoNGw1L2wLV1IcVbn2b0V49ay1J9z7k=", "path": "/state/secrets/build.seed", "type": "path" @@ -102,11 +108,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1639617108, - "narHash": "sha256-8lwF4kcf/pigrNIrR4JXdTTFTCxgKyVGsYppVEt1rII=", + "lastModified": 1641048770, + "narHash": "sha256-8rzyOw029lbQC/UzzROwr+k9tnYKPgLIBLxMne6abo4=", "ref": "master", - "rev": "0845e2e7eb44aefe38e3ae80ac237fd851733737", - "revCount": 6, + "rev": "88a8dbfe38d164351afeeca32c9e725d825e362d", + "revCount": 17, "type": "git", "url": "https://git.fudo.org/chute/chute.git" }, @@ -116,6 +122,54 @@ "url": "https://git.fudo.org/chute/chute.git" } }, + "clj-nix": { + "inputs": { + "devshell": "devshell", + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "fudo-nixos", + "pricebot", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1655125606, + "narHash": "sha256-mnqND6/PZMug5Jr92adJcNmwS+XYtVvtKjuowK9A9ec=", + "owner": "jlesquembre", + "repo": "clj-nix", + "rev": "77302aa77afa25e24292aa54eec31e70caa4faf0", + "type": "github" + }, + "original": { + "owner": "jlesquembre", + "repo": "clj-nix", + "type": "github" + } + }, + "clj-nix_2": { + "inputs": { + "devshell": "devshell_2", + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "fudo-nixos", + "wallfly", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1655801580, + "narHash": "sha256-4XUFDP1ES1KNWwDukQEixCe4uV7Z951kgaVAFhXI2ew=", + "owner": "jlesquembre", + "repo": "clj-nix", + "rev": "579141e009200fcd28d251731e9ac5ba46a1ec2a", + "type": "github" + }, + "original": { + "owner": "jlesquembre", + "repo": "clj-nix", + "type": "github" + } + }, "clj2nix": { "inputs": { "flake-compat": "flake-compat", @@ -159,6 +213,7 @@ "deployment-common": { "flake": false, "locked": { + "lastModified": 1, "narHash": "sha256-+OirrRnBKlLiJmIKpuob37LzGKUuyqQJf/T2hL1hGbE=", "path": "../../common", "type": "path" @@ -168,9 +223,58 @@ "type": "path" } }, + "devshell": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "fudo-nixos", + "pricebot", + "clj-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1644227066, + "narHash": "sha256-FHcFZtpZEWnUh62xlyY3jfXAXHzJNEDLDzLsJxn+ve0=", + "owner": "numtide", + "repo": "devshell", + "rev": "7033f64dd9ef8d9d8644c5030c73913351d2b660", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_2": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "fudo-nixos", + "wallfly", + "clj-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1644227066, + "narHash": "sha256-FHcFZtpZEWnUh62xlyY3jfXAXHzJNEDLDzLsJxn+ve0=", + "owner": "numtide", + "repo": "devshell", + "rev": "7033f64dd9ef8d9d8644c5030c73913351d2b660", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "dnssec-keys": { "flake": false, "locked": { + "lastModified": 1636405858, "narHash": "sha256-KGZFtyc7Sd5mGjLxnM+R/XnCtOwyZ4IuOMcblIjlCnM=", "path": "/state/secrets/dnssec-keys", "type": "path" @@ -183,6 +287,7 @@ "dnssec-keys_2": { "flake": false, "locked": { + "lastModified": 1636405858, "narHash": "sha256-KGZFtyc7Sd5mGjLxnM+R/XnCtOwyZ4IuOMcblIjlCnM=", "path": "/state/secrets/dnssec-keys", "type": "path" @@ -198,13 +303,20 @@ "doom-snippets": "doom-snippets", "emacs-overlay": "emacs-overlay", "emacs-so-long": "emacs-so-long", + "evil-escape": "evil-escape", "evil-markdown": "evil-markdown", "evil-org-mode": "evil-org-mode", "evil-quick-diff": "evil-quick-diff", "explain-pause-mode": "explain-pause-mode", - "flake-utils": "flake-utils_3", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils", + "format-all": "format-all", "nix-straight": "nix-straight", - "nixpkgs": "nixpkgs_5", + "nixpkgs": [ + "fudo-nixos", + "fudo-home", + "nixpkgs" + ], "nose": "nose", "ob-racket": "ob-racket", "org": "org", @@ -212,18 +324,21 @@ "org-yt": "org-yt", "php-extras": "php-extras", "revealjs": "revealjs", - "rotate-text": "rotate-text" + "rotate-text": "rotate-text", + "sln-mode": "sln-mode", + "ts-fold": "ts-fold", + "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1627398156, - "narHash": "sha256-Ru1aV3NuIFXAsvUE3de8KR7xDZOo1GCBJdsWKJn+Ebw=", - "owner": "vlaci", + "lastModified": 1657364333, + "narHash": "sha256-PiNZ6Kk/JedMTRDxAmvLkf/O34QRPep7I3ItMEYVllw=", + "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "fee14d217b7a911aad507679dafbeaa8c1ebf5ff", + "rev": "a59295c11efb6377b0c5eb4c8259bb49d94ec1d5", "type": "github" }, "original": { - "owner": "vlaci", + "owner": "nix-community", "repo": "nix-doom-emacs", "type": "github" } @@ -231,44 +346,44 @@ "doom-emacs_2": { "flake": false, "locked": { - "lastModified": 1626604817, - "narHash": "sha256-z+dvjB02cHU+VQ5EMkzqSdX817PZar9AkmmfK27q0vo=", - "owner": "hlissner", - "repo": "doom-emacs", - "rev": "46732c0adaef147144418f9f284ca6b1183ab96f", + "lastModified": 1657023376, + "narHash": "sha256-huKtA8twjW3GkfA6NRvCjWMWUEN58ju4sL89rRQxOes=", + "owner": "doomemacs", + "repo": "doomemacs", + "rev": "9ec60d9ab9eb5d9b098e2452395156b622cce624", "type": "github" }, "original": { - "owner": "hlissner", - "ref": "develop", - "repo": "doom-emacs", + "owner": "doomemacs", + "ref": "master", + "repo": "doomemacs", "type": "github" } }, "doom-snippets": { "flake": false, "locked": { - "lastModified": 1625547004, - "narHash": "sha256-V+ytAjB4ZZ+5dJJAu1OY7SbnqrokX5PVBWs0AsgQ8Vs=", - "owner": "hlissner", - "repo": "doom-snippets", - "rev": "5c0eb5bd70f035cefb981c2ce64f4367498bdda6", + "lastModified": 1655900328, + "narHash": "sha256-fEYwFxW2sdzNK14DrS92OCGy8KDPZKewrHljnE/RlzQ=", + "owner": "doomemacs", + "repo": "snippets", + "rev": "6b2bd5a77c536ed414794ecf71d37a60ebd4663e", "type": "github" }, "original": { - "owner": "hlissner", - "repo": "doom-snippets", + "owner": "doomemacs", + "repo": "snippets", "type": "github" } }, "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1626972035, - "narHash": "sha256-YhBtnKmLDYiEzP5ZEMEQMg6oMP5EV+ToCkku7ZYfL+A=", + "lastModified": 1657275959, + "narHash": "sha256-pg8FB1DRImBpqXHCp/0Y7bIphpVqGmkWgWOcFDMwdTg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "be04b45efb35db58e6ac6aa86b84f850c85b5dfe", + "rev": "22448c09bae21969ca14d1558a120dafe9853c73", "type": "github" }, "original": { @@ -293,6 +408,22 @@ "type": "github" } }, + "evil-escape": { + "flake": false, + "locked": { + "lastModified": 1588439096, + "narHash": "sha256-aB2Ge5o/93B18tPf4fN1c+O46CNh/nOqwLJbox4c8Gw=", + "owner": "hlissner", + "repo": "evil-escape", + "rev": "819f1ee1cf3f69a1ae920e6004f2c0baeebbe077", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "evil-escape", + "type": "github" + } + }, "evil-markdown": { "flake": false, "locked": { @@ -360,6 +491,7 @@ "filesystem-keys": { "flake": false, "locked": { + "lastModified": 1634322891, "narHash": "sha256-K2wdsA4vcNTaLR9A9qxB+aMaeANL0LXOwBWvUm63lX0=", "path": "/state/secrets/filesystem-keys", "type": "path" @@ -372,6 +504,7 @@ "filesystem-keys_2": { "flake": false, "locked": { + "lastModified": 1634322891, "narHash": "sha256-K2wdsA4vcNTaLR9A9qxB+aMaeANL0LXOwBWvUm63lX0=", "path": "/state/secrets/filesystem-keys", "type": "path" @@ -413,13 +546,29 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", "type": "github" }, "original": { @@ -430,11 +579,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", "type": "github" }, "original": { @@ -445,11 +594,11 @@ }, "flake-utils_3": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -458,20 +607,66 @@ "type": "github" } }, + "flake-utils_4": { + "locked": { + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "format-all": { + "flake": false, + "locked": { + "lastModified": 1581716637, + "narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=", + "owner": "lassik", + "repo": "emacs-format-all-the-code", + "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", + "type": "github" + }, + "original": { + "owner": "lassik", + "repo": "emacs-format-all-the-code", + "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", + "type": "github" + } + }, "fudo-entities": { "inputs": { - "flake-utils": "flake-utils", "fudo-lib": "fudo-lib", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1639518935, - "narHash": "sha256-I3+jWNiGo6q3BtQHNgWK5aZ7K22L6YzNjQ5ZOfKgYwQ=", + "lastModified": 1656710569, + "narHash": "sha256-xplQN3I4sB86TNHC8rS223FXwxGtRSxtsrhXRGYoKwY=", "ref": "master", - "rev": "ee5bede8e9766bbdf7b9f093d8eb3d1c2eb27caa", - "revCount": 24, + "rev": "ea7c227e9eb86cb90b6118be88e714dd9836c59e", + "revCount": 96, "type": "git", "url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git" }, @@ -482,7 +677,6 @@ }, "fudo-entities_2": { "inputs": { - "flake-utils": "flake-utils_2", "fudo-lib": "fudo-lib_2", "nixpkgs": [ "fudo-nixos", @@ -490,11 +684,11 @@ ] }, "locked": { - "lastModified": 1639518935, - "narHash": "sha256-I3+jWNiGo6q3BtQHNgWK5aZ7K22L6YzNjQ5ZOfKgYwQ=", + "lastModified": 1656710569, + "narHash": "sha256-xplQN3I4sB86TNHC8rS223FXwxGtRSxtsrhXRGYoKwY=", "ref": "master", - "rev": "ee5bede8e9766bbdf7b9f093d8eb3d1c2eb27caa", - "revCount": 24, + "rev": "ea7c227e9eb86cb90b6118be88e714dd9836c59e", + "revCount": 96, "type": "git", "url": "https://git.fudo.org/fudo-nix/entities.git" }, @@ -506,6 +700,7 @@ "fudo-home": { "inputs": { "doom-emacs": "doom-emacs", + "fudo-pkgs": "fudo-pkgs", "home-manager": "home-manager", "niten-doom-config": "niten-doom-config", "nixpkgs": [ @@ -514,11 +709,11 @@ ] }, "locked": { - "lastModified": 1639853480, - "narHash": "sha256-FV9LBcA/hh0DIBb7JzmcDjXDq6wJP46NALsMW0orfbc=", + "lastModified": 1657421846, + "narHash": "sha256-82y9RNubMYSJPw13IQaj3tTPQuEX2VuMLryxJTDkAyc=", "ref": "master", - "rev": "4954bd4e6c5d784740bee169aa7db7850fcfd5e0", - "revCount": 58, + "rev": "188ac6891bbd18213ffdab122f484da849c2eb3e", + "revCount": 208, "type": "git", "url": "https://git.fudo.org/fudo-nix/home.git" }, @@ -529,11 +724,11 @@ }, "fudo-lib": { "locked": { - "lastModified": 1638990149, - "narHash": "sha256-p1T0GMJXIJvTpVdn5nK7RZJX8izkabADJ/LsaL442zI=", + "lastModified": 1654117056, + "narHash": "sha256-Ray3c3Zv41Ax4MvTFY7pagfROUoXzS4x11l0EHFj9DE=", "ref": "master", - "rev": "c87448ff1365c3d5230690f68d1ba246652581d1", - "revCount": 24, + "rev": "df53c13bb7f15336a2b0f110cef0a57af7089737", + "revCount": 68, "type": "git", "url": "https://git.fudo.org/fudo-nix/lib.git" }, @@ -544,11 +739,11 @@ }, "fudo-lib_2": { "locked": { - "lastModified": 1638990149, - "narHash": "sha256-p1T0GMJXIJvTpVdn5nK7RZJX8izkabADJ/LsaL442zI=", + "lastModified": 1654117056, + "narHash": "sha256-Ray3c3Zv41Ax4MvTFY7pagfROUoXzS4x11l0EHFj9DE=", "ref": "master", - "rev": "c87448ff1365c3d5230690f68d1ba246652581d1", - "revCount": 24, + "rev": "df53c13bb7f15336a2b0f110cef0a57af7089737", + "revCount": 68, "type": "git", "url": "https://git.fudo.org/fudo-nix/lib.git" }, @@ -559,7 +754,8 @@ }, "fudo-lib_3": { "locked": { - "narHash": "sha256-UAFFqr8Dln9AtMu1mJDHGFhNQgAezZjU8yywX/yaihs=", + "lastModified": 1657510985, + "narHash": "sha256-6QKfcmobaEfgsW6s2nU6piOgFg0iSPJAoXzFvCqwF5I=", "path": "/state/fudo-lib", "type": "path" }, @@ -575,14 +771,19 @@ "fudo-entities": "fudo-entities_2", "fudo-home": "fudo-home", "fudo-lib": "fudo-lib_3", - "fudo-pkgs": "fudo-pkgs", + "fudo-pkgs": "fudo-pkgs_2", "fudo-secrets": "fudo-secrets", "nixpkgs": [ "nixpkgs" - ] + ], + "nixpkgs2111": "nixpkgs2111", + "nixpkgsUnstable": "nixpkgsUnstable", + "pricebot": "pricebot", + "wallfly": "wallfly" }, "locked": { - "narHash": "sha256-KyYHZOpcRF+NvAErciqRXdTLjsKX/dolUc4WAJHkuv4=", + "lastModified": 1657511027, + "narHash": "sha256-p3jsF4b75eSoioxN4ssyAq/txjHS9MXLRErZCE3d4Hk=", "path": "/state/fudo-nixos", "type": "path" }, @@ -593,11 +794,26 @@ }, "fudo-pkgs": { "locked": { - "lastModified": 1639072539, - "narHash": "sha256-ezF6GF5JaJgQ7C4ZbzK4VWXl8DrDRO1gsvv/SOckmZ8=", + "lastModified": 1655577860, + "narHash": "sha256-6OlBGH8TXCuPBakj/hB+o5turzroOysbb+Z1rJYuM3w=", + "ref": "refs/heads/master", + "rev": "445d96e405308f19d0d1021f11b55fd2d6b35e0f", + "revCount": 55, + "type": "git", + "url": "https://git.fudo.org/fudo-nix/pkgs.git" + }, + "original": { + "type": "git", + "url": "https://git.fudo.org/fudo-nix/pkgs.git" + } + }, + "fudo-pkgs_2": { + "locked": { + "lastModified": 1655577860, + "narHash": "sha256-6OlBGH8TXCuPBakj/hB+o5turzroOysbb+Z1rJYuM3w=", "ref": "master", - "rev": "99319e33c6e17476225c1d939e656c6ae6c8152f", - "revCount": 18, + "rev": "445d96e405308f19d0d1021f11b55fd2d6b35e0f", + "revCount": 55, "type": "git", "url": "https://git.fudo.org/fudo-nix/pkgs.git" }, @@ -621,7 +837,8 @@ "ssh-keypairs": "ssh-keypairs" }, "locked": { - "narHash": "sha256-22lvxSaUkKdp33P19eXif1PieGty0cJw4P2R6LJFL30=", + "lastModified": 1656718094, + "narHash": "sha256-yDpEBjY1j5AvrnE4qHamorrJRuSApN+tHwjhYYJXjQ0=", "path": "/state/secrets", "type": "path" }, @@ -645,7 +862,8 @@ "ssh-keypairs": "ssh-keypairs_2" }, "locked": { - "narHash": "sha256-22lvxSaUkKdp33P19eXif1PieGty0cJw4P2R6LJFL30=", + "lastModified": 1656718094, + "narHash": "sha256-yDpEBjY1j5AvrnE4qHamorrJRuSApN+tHwjhYYJXjQ0=", "path": "/state/secrets", "type": "path" }, @@ -707,16 +925,16 @@ ] }, "locked": { - "lastModified": 1638553958, - "narHash": "sha256-leETjYMtD9y37CvfRSQhIGibcIl4dNVlFkY/8QgqmAM=", + "lastModified": 1656169755, + "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ce1d64073f48b9bc9425218803b1b607454c1e7", + "rev": "4a3d01fb53f52ac83194081272795aa4612c2381", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-21.11", + "ref": "release-22.05", "repo": "home-manager", "type": "github" } @@ -724,7 +942,8 @@ "host-keytabs": { "flake": false, "locked": { - "narHash": "sha256-LAAZVfwD65yS6H7EcKmfiPXtLcfRQ80u3V4LFRjr7ko=", + "lastModified": 1647537444, + "narHash": "sha256-SA058alChYye39gm4TwPpCufR1P+X9QnH/EunJYXd5s=", "path": "/state/secrets/kerberos/host-keytabs", "type": "path" }, @@ -736,7 +955,8 @@ "host-keytabs_2": { "flake": false, "locked": { - "narHash": "sha256-LAAZVfwD65yS6H7EcKmfiPXtLcfRQ80u3V4LFRjr7ko=", + "lastModified": 1647537444, + "narHash": "sha256-SA058alChYye39gm4TwPpCufR1P+X9QnH/EunJYXd5s=", "path": "/state/secrets/kerberos/host-keytabs", "type": "path" }, @@ -748,11 +968,11 @@ "niten-doom-config": { "flake": false, "locked": { - "lastModified": 1639608722, - "narHash": "sha256-Ao+J7h/zE0X+G3frfxCkoY4hK7T1oNpTpwwv7n7pGaA=", - "ref": "master", - "rev": "8be77a42d7669fa71287c58ebaf210159f198b50", - "revCount": 36, + "lastModified": 1657421724, + "narHash": "sha256-7cPjq6qHc32mtyZehVjl6mSTT2OIwrNY02JvFzwg150=", + "ref": "refs/heads/master", + "rev": "f5f64049e4d782cd7ad2527165f520f4b0dac0d2", + "revCount": 55, "type": "git", "url": "https://git.fudo.org/niten/doom-emacs.git" }, @@ -764,16 +984,15 @@ "nix-straight": { "flake": false, "locked": { - "lastModified": 1621543597, - "narHash": "sha256-E/m2Hrw2og//CfOCOWe2yapYC01Tqhozn4YMPYJsC3o=", - "owner": "vlaci", + "lastModified": 1656684255, + "narHash": "sha256-ZefQiv4Ipu2VkLjs1oyelTLU7kBVJgkcQd+yBpJU0yo=", + "owner": "nix-community", "repo": "nix-straight.el", - "rev": "8e84d04f10b2298de856b2b8b9a0d13abc91b5ca", + "rev": "fb8dd5c44cde70abd13380766e40af7a63888942", "type": "github" }, "original": { - "owner": "vlaci", - "ref": "v2.2.0", + "owner": "nix-community", "repo": "nix-straight.el", "type": "github" } @@ -793,6 +1012,36 @@ "type": "github" } }, + "nixpkgs2111": { + "locked": { + "lastModified": 1656782578, + "narHash": "sha256-1eMCBEqJplPotTo/SZ/t5HU6Sf2I8qKlZi9MX7jv9fw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "573603b7fdb9feb0eb8efc16ee18a015c667ab1b", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.11", + "type": "indirect" + } + }, + "nixpkgsUnstable": { + "locked": { + "lastModified": 1657447684, + "narHash": "sha256-FCP9AuU1q6PE3vOeM5SFf58f/UKPBAsoSGDUGamNBbo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5f43d8b088d3771274bcfb69d3c7435b1121ac88", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1638196344, @@ -825,11 +1074,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1638196344, - "narHash": "sha256-fkOqSkfOkl8tqxDd+zJU4kAgyLXp/ouaP+U9gpjEZZs=", + "lastModified": 1640653651, + "narHash": "sha256-fByFYXYoE/6TqwKGbT7XBCOAlSsFzOXm4ZsRLoO70m8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2553aee74fed8c2205a4aeb3ffd206ca14ede60f", + "rev": "7bca80140fc7732c7357b26002db3d87b3ba4c61", "type": "github" }, "original": { @@ -840,31 +1089,46 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1626852498, - "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=", + "lastModified": 1655278232, + "narHash": "sha256-H6s7tnHYiDKFCcLADS4sl1sUq0dDJuRQXCieguk/6SA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "16105403bdd843540cbef9c63fc0f16c1c6eaa70", + "rev": "8b538fcb329a7bc3d153962f17c509ee49166973", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixpkgs-unstable", + "ref": "nixos-22.05", "type": "indirect" } }, "nixpkgs_6": { "locked": { - "lastModified": 1639794673, - "narHash": "sha256-bjauV0+Z4WmxeiHXecyiEOEwo+XysO6kx36beeatbl0=", + "lastModified": 1656265786, + "narHash": "sha256-A9RkoGrxzsmMm0vily18p92Rasb+MbdDMaSnzmywXKw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2627c4b795107ba94562626925f5a9a2bc62ebc6", + "rev": "cd90e773eae83ba7733d2377b6cdf84d45558780", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-21.11", + "ref": "nixos-22.05", + "type": "indirect" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1657296039, + "narHash": "sha256-Ghh39+aS+pw5sTP/ZO8VIKE6sBhMadDaQZtf+3yu4Vc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "71d7a4c037dc4f3e98d5c4a81b941933cf5bf675", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-22.05", "type": "indirect" } }, @@ -903,11 +1167,11 @@ "org": { "flake": false, "locked": { - "lastModified": 1627155762, - "narHash": "sha256-XS1eA6P0ePabdrnUNe5lN19EA9dfK615gMGObr9wfBQ=", + "lastModified": 1657029612, + "narHash": "sha256-enwqnerhZVpyQbeX0uKdZ4IVmZieq9ZgCbkDWy1HlNQ=", "owner": "emacs-straight", "repo": "org-mode", - "rev": "c9dfed48a607c7f6524f1c6480f09cf61a5d6237", + "rev": "71359820221ec18d27fab28403d4fd3537ca0491", "type": "github" }, "original": { @@ -919,17 +1183,17 @@ "org-contrib": { "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" + "lastModified": 1652646857, + "narHash": "sha256-IWIShWyVnbwXqGLQaDNvJ0KoepxhIrXWTjPyGPEkQ14=", + "owner": "emacsmirror", + "repo": "org-contrib", + "rev": "c1e0980fd7a57ca2042fd78acfb1dfb5c3bc03fa", + "type": "github" }, "original": { - "type": "git", - "url": "https://git.sr.ht/~bzg/org-contrib" + "owner": "emacsmirror", + "repo": "org-contrib", + "type": "github" } }, "org-yt": { @@ -964,9 +1228,30 @@ "type": "github" } }, + "pricebot": { + "inputs": { + "clj-nix": "clj-nix", + "nixpkgs": "nixpkgs_5", + "utils": "utils_5" + }, + "locked": { + "lastModified": 1655855322, + "narHash": "sha256-LuGiBNRnv6te1rrhoxiAECHXEK5GJLHdkdnqRCZiCdI=", + "ref": "master", + "rev": "72d36139708f3947c050d6659c4a2eac2c0d3b64", + "revCount": 38, + "type": "git", + "url": "https://git.fudo.org/fudo-public/pricebot.git" + }, + "original": { + "type": "git", + "url": "https://git.fudo.org/fudo-public/pricebot.git" + } + }, "realm-master-keys": { "flake": false, "locked": { + "lastModified": 1636586592, "narHash": "sha256-5hDmPweE6lshRKA+AKRgJv7VwWxHsYekwMT32uAUKJU=", "path": "/state/secrets/kerberos/master-keys", "type": "path" @@ -979,6 +1264,7 @@ "realm-master-keys_2": { "flake": false, "locked": { + "lastModified": 1636586592, "narHash": "sha256-5hDmPweE6lshRKA+AKRgJv7VwWxHsYekwMT32uAUKJU=", "path": "/state/secrets/kerberos/master-keys", "type": "path" @@ -991,11 +1277,11 @@ "revealjs": { "flake": false, "locked": { - "lastModified": 1625811744, - "narHash": "sha256-Y67nVqcovn2PbHXmWOFWMq10Qz2ZIRyyWEO6qsZLbIM=", + "lastModified": 1653993278, + "narHash": "sha256-X43lsjoLBWmttIKj9Jzut0UP0dZlsue3fYbJ3++ojbU=", "owner": "hakimel", "repo": "reveal.js", - "rev": "b18f12d964ef80bd9ffb061aae48ff4c15fb43ad", + "rev": "039972c730690af7a83a5cb832056a7cc8b565d7", "type": "github" }, "original": { @@ -1010,7 +1296,7 @@ "fudo-entities": "fudo-entities", "fudo-nixos": "fudo-nixos", "fudo-secrets": "fudo-secrets_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" } }, "rotate-text": { @@ -1032,6 +1318,7 @@ "service-keytabs": { "flake": false, "locked": { + "lastModified": 1639361926, "narHash": "sha256-0gpaf5j/Uxy6HUXDLt0T7vg4Z2aic1IHhuNUO5IcOhY=", "path": "/state/secrets/kerberos/service-keytabs", "type": "path" @@ -1044,6 +1331,7 @@ "service-keytabs_2": { "flake": false, "locked": { + "lastModified": 1639361926, "narHash": "sha256-0gpaf5j/Uxy6HUXDLt0T7vg4Z2aic1IHhuNUO5IcOhY=", "path": "/state/secrets/kerberos/service-keytabs", "type": "path" @@ -1056,7 +1344,8 @@ "service-passwords": { "flake": false, "locked": { - "narHash": "sha256-4xEJlPU+KeBtQuFqRlB1bzJMXUQ6a+DT2v3OptaHyTg=", + "lastModified": 1656532749, + "narHash": "sha256-J3oy9wGPzRUQDTxTKK2nNKPXdZ8G8xXdZatMzarg4HI=", "path": "/state/secrets/service-passwords", "type": "path" }, @@ -1068,7 +1357,8 @@ "service-passwords_2": { "flake": false, "locked": { - "narHash": "sha256-4xEJlPU+KeBtQuFqRlB1bzJMXUQ6a+DT2v3OptaHyTg=", + "lastModified": 1656532749, + "narHash": "sha256-J3oy9wGPzRUQDTxTKK2nNKPXdZ8G8xXdZatMzarg4HI=", "path": "/state/secrets/service-passwords", "type": "path" }, @@ -1080,7 +1370,8 @@ "service-secrets": { "flake": false, "locked": { - "narHash": "sha256-IfG9fX6qr+EKMfG6l/nzhrNYYXfKBtaNHHhiW6eCcGk=", + "lastModified": 1655662910, + "narHash": "sha256-2p17wcdrfUerirVBaQ+jjXTrlPAbUDC6hqn+89WFeQs=", "path": "/state/secrets/service-secrets", "type": "path" }, @@ -1092,7 +1383,8 @@ "service-secrets_2": { "flake": false, "locked": { - "narHash": "sha256-IfG9fX6qr+EKMfG6l/nzhrNYYXfKBtaNHHhiW6eCcGk=", + "lastModified": 1655662910, + "narHash": "sha256-2p17wcdrfUerirVBaQ+jjXTrlPAbUDC6hqn+89WFeQs=", "path": "/state/secrets/service-secrets", "type": "path" }, @@ -1101,10 +1393,27 @@ "type": "path" } }, + "sln-mode": { + "flake": false, + "locked": { + "lastModified": 1423727528, + "narHash": "sha256-XqkqPyEJuTtFslOz1fpTf/Klbd/zA7IGpzpmum/MGao=", + "owner": "sensorflo", + "repo": "sln-mode", + "rev": "0f91d1b957c7d2a7bab9278ec57b54d57f1dbd9c", + "type": "github" + }, + "original": { + "owner": "sensorflo", + "repo": "sln-mode", + "type": "github" + } + }, "ssh-keypairs": { "flake": false, "locked": { - "narHash": "sha256-TlRfaYFuJxLUCarxZ1XYnW8PruKyYO5RErVGo5hTgo4=", + "lastModified": 1647537635, + "narHash": "sha256-pla2J8HmPHBVDp/2m/22lctwd6VvmJ2cik5n68jf3VY=", "path": "/state/secrets/ssh-keypairs", "type": "path" }, @@ -1116,7 +1425,8 @@ "ssh-keypairs_2": { "flake": false, "locked": { - "narHash": "sha256-TlRfaYFuJxLUCarxZ1XYnW8PruKyYO5RErVGo5hTgo4=", + "lastModified": 1647537635, + "narHash": "sha256-pla2J8HmPHBVDp/2m/22lctwd6VvmJ2cik5n68jf3VY=", "path": "/state/secrets/ssh-keypairs", "type": "path" }, @@ -1125,6 +1435,22 @@ "type": "path" } }, + "ts-fold": { + "flake": false, + "locked": { + "lastModified": 1657091443, + "narHash": "sha256-yr/aW7sYoOxajVb2gTgRrwaDwwg2gtHuP3wdrwjiaxo=", + "owner": "jcs-elpa", + "repo": "ts-fold", + "rev": "dcd5b9fe5c2cb72261ff6c714beb8d0198b8522b", + "type": "github" + }, + "original": { + "owner": "jcs-elpa", + "repo": "ts-fold", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1637014545, @@ -1184,6 +1510,72 @@ "repo": "flake-utils", "type": "github" } + }, + "utils_5": { + "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" + } + }, + "utils_6": { + "locked": { + "lastModified": 1656065134, + "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "wallfly": { + "inputs": { + "clj-nix": "clj-nix_2", + "nixpkgs": "nixpkgs_6", + "utils": "utils_6" + }, + "locked": { + "lastModified": 1656718212, + "narHash": "sha256-q4StE5titkXrnvMp9GGPhXWdzZ6CT8X7iwhClu/iRXQ=", + "ref": "master", + "rev": "6c17df68507acebd7a809fc48cda1b2315971650", + "revCount": 11, + "type": "git", + "url": "https://git.fudo.org/fudo-public/wallfly.git" + }, + "original": { + "type": "git", + "url": "https://git.fudo.org/fudo-public/wallfly.git" + } + }, + "ws-butler": { + "flake": false, + "locked": { + "lastModified": 1634511126, + "narHash": "sha256-c0y0ZPtxxICPk+eaNbbQf6t+FRCliNY54CCz9QHQ8ZI=", + "owner": "hlissner", + "repo": "ws-butler", + "rev": "572a10c11b6cb88293de48acbb59a059d36f9ba5", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "ws-butler", + "type": "github" + } } }, "root": "root", diff --git a/deployments/seattle/flake.nix b/deployments/seattle/flake.nix index e778215..fe5c3ee 100644 --- a/deployments/seattle/flake.nix +++ b/deployments/seattle/flake.nix @@ -2,7 +2,7 @@ description = "Seattle Fudo NixOps network."; inputs = { - nixpkgs.url = "nixpkgs/nixos-21.11"; + nixpkgs.url = "nixpkgs/nixos-22.05"; fudo-secrets.url = "path:/state/secrets"; @@ -23,16 +23,15 @@ }; }; - outputs = { self, nixpkgs, fudo-nixos, fudo-entities, fudo-secrets, deployment-common } @ inputs: + outputs = { self, nixpkgs, fudo-nixos, fudo-entities, fudo-secrets + , deployment-common }@inputs: with nixpkgs.lib; { nixopsConfigurations.default = let domain = "sea.fudo.org"; description = "Seattle Fudo NixOps Network"; - deployment-hosts = filterAttrs - (hostname: hostOpts: - hostOpts.domain == domain && - hostOpts.nixos-system) + deployment-hosts = filterAttrs (hostname: hostOpts: + hostOpts.domain == domain && hostOpts.nixos-system) fudo-entities.entities.hosts; deployment-config-generator =