Evolution...not currently deploying to informis/fudo

This commit is contained in:
niten 2022-07-11 08:39:24 -07:00
parent 1c4de3dac7
commit 80bfb747ad
6 changed files with 819 additions and 405 deletions

View File

@ -102,11 +102,11 @@
"utils": "utils_4" "utils": "utils_4"
}, },
"locked": { "locked": {
"lastModified": 1639617108, "lastModified": 1641048770,
"narHash": "sha256-8lwF4kcf/pigrNIrR4JXdTTFTCxgKyVGsYppVEt1rII=", "narHash": "sha256-8rzyOw029lbQC/UzzROwr+k9tnYKPgLIBLxMne6abo4=",
"ref": "master", "ref": "master",
"rev": "0845e2e7eb44aefe38e3ae80ac237fd851733737", "rev": "88a8dbfe38d164351afeeca32c9e725d825e362d",
"revCount": 6, "revCount": 17,
"type": "git", "type": "git",
"url": "https://git.fudo.org/chute/chute.git" "url": "https://git.fudo.org/chute/chute.git"
}, },
@ -196,15 +196,24 @@
"inputs": { "inputs": {
"doom-emacs": "doom-emacs_2", "doom-emacs": "doom-emacs_2",
"doom-snippets": "doom-snippets", "doom-snippets": "doom-snippets",
"emacs-overlay": "emacs-overlay", "emacs-overlay": [
"fudo-nixos",
"fudo-home",
"emacs-overlay"
],
"emacs-so-long": "emacs-so-long", "emacs-so-long": "emacs-so-long",
"evil-markdown": "evil-markdown", "evil-markdown": "evil-markdown",
"evil-org-mode": "evil-org-mode", "evil-org-mode": "evil-org-mode",
"evil-quick-diff": "evil-quick-diff", "evil-quick-diff": "evil-quick-diff",
"explain-pause-mode": "explain-pause-mode", "explain-pause-mode": "explain-pause-mode",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils",
"format-all": "format-all",
"nix-straight": "nix-straight", "nix-straight": "nix-straight",
"nixpkgs": "nixpkgs_5", "nixpkgs": [
"fudo-nixos",
"fudo-home",
"nixpkgs"
],
"nose": "nose", "nose": "nose",
"ob-racket": "ob-racket", "ob-racket": "ob-racket",
"org": "org", "org": "org",
@ -215,15 +224,15 @@
"rotate-text": "rotate-text" "rotate-text": "rotate-text"
}, },
"locked": { "locked": {
"lastModified": 1627398156, "lastModified": 1649509049,
"narHash": "sha256-Ru1aV3NuIFXAsvUE3de8KR7xDZOo1GCBJdsWKJn+Ebw=", "narHash": "sha256-gLmRO2gPqjLPmFBhgFkl1nbBzJlNV0lmXMzapbw9qac=",
"owner": "vlaci", "owner": "nix-community",
"repo": "nix-doom-emacs", "repo": "nix-doom-emacs",
"rev": "fee14d217b7a911aad507679dafbeaa8c1ebf5ff", "rev": "f3f40f333c3214c9614c23b6abd1ae498af3e5b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "vlaci", "owner": "nix-community",
"repo": "nix-doom-emacs", "repo": "nix-doom-emacs",
"type": "github" "type": "github"
} }
@ -231,16 +240,16 @@
"doom-emacs_2": { "doom-emacs_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1626604817, "lastModified": 1645634993,
"narHash": "sha256-z+dvjB02cHU+VQ5EMkzqSdX817PZar9AkmmfK27q0vo=", "narHash": "sha256-QeE6aUJxoaqHM28Cpt2rKC817VQvXGuuFUyLzehaC50=",
"owner": "hlissner", "owner": "hlissner",
"repo": "doom-emacs", "repo": "doom-emacs",
"rev": "46732c0adaef147144418f9f284ca6b1183ab96f", "rev": "42e5763782fdc1aabb9f2624d468248d6978abe2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hlissner", "owner": "hlissner",
"ref": "develop", "ref": "master",
"repo": "doom-emacs", "repo": "doom-emacs",
"type": "github" "type": "github"
} }
@ -248,11 +257,11 @@
"doom-snippets": { "doom-snippets": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1625547004, "lastModified": 1646222996,
"narHash": "sha256-V+ytAjB4ZZ+5dJJAu1OY7SbnqrokX5PVBWs0AsgQ8Vs=", "narHash": "sha256-YhOnoNSpmcKNJg+aS/829zqXStMkKWXWf1pulHEBcpQ=",
"owner": "hlissner", "owner": "hlissner",
"repo": "doom-snippets", "repo": "doom-snippets",
"rev": "5c0eb5bd70f035cefb981c2ce64f4367498bdda6", "rev": "f61c23ece1ad47c0522059ac45085fd283ce4452",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -264,11 +273,11 @@
"emacs-overlay": { "emacs-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1626972035, "lastModified": 1649586061,
"narHash": "sha256-YhBtnKmLDYiEzP5ZEMEQMg6oMP5EV+ToCkku7ZYfL+A=", "narHash": "sha256-gFAHrrY0i71WIP16FGo3pgNKTZ5m5L6FtQsOYpne9gk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "be04b45efb35db58e6ac6aa86b84f850c85b5dfe", "rev": "16262a84ef07fb0e8cfc592b65d786b086840065",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -415,11 +424,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1638122382, "lastModified": 1644229661,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -428,50 +437,36 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": { "format-all": {
"flake": false,
"locked": { "locked": {
"lastModified": 1638122382, "lastModified": 1581716637,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=",
"owner": "numtide", "owner": "lassik",
"repo": "flake-utils", "repo": "emacs-format-all-the-code",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "lassik",
"repo": "flake-utils", "repo": "emacs-format-all-the-code",
"type": "github" "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3",
}
},
"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",
"type": "github" "type": "github"
} }
}, },
"fudo-entities": { "fudo-entities": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"fudo-lib": "fudo-lib", "fudo-lib": "fudo-lib",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1639518935, "lastModified": 1653253887,
"narHash": "sha256-I3+jWNiGo6q3BtQHNgWK5aZ7K22L6YzNjQ5ZOfKgYwQ=", "narHash": "sha256-Z88Ck6nCW+zOfsxtHa+7hB2uPPuHotAkpRZqE2KoyF8=",
"ref": "master", "ref": "master",
"rev": "ee5bede8e9766bbdf7b9f093d8eb3d1c2eb27caa", "rev": "52b7da1ceccb919787685875a21a1d2356c6cc1f",
"revCount": 24, "revCount": 93,
"type": "git", "type": "git",
"url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git" "url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git"
}, },
@ -482,7 +477,6 @@
}, },
"fudo-entities_2": { "fudo-entities_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2",
"fudo-lib": "fudo-lib_2", "fudo-lib": "fudo-lib_2",
"nixpkgs": [ "nixpkgs": [
"fudo-nixos", "fudo-nixos",
@ -490,11 +484,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1639518935, "lastModified": 1653253887,
"narHash": "sha256-I3+jWNiGo6q3BtQHNgWK5aZ7K22L6YzNjQ5ZOfKgYwQ=", "narHash": "sha256-Z88Ck6nCW+zOfsxtHa+7hB2uPPuHotAkpRZqE2KoyF8=",
"ref": "master", "ref": "master",
"rev": "ee5bede8e9766bbdf7b9f093d8eb3d1c2eb27caa", "rev": "52b7da1ceccb919787685875a21a1d2356c6cc1f",
"revCount": 24, "revCount": 93,
"type": "git", "type": "git",
"url": "https://git.fudo.org/fudo-nix/entities.git" "url": "https://git.fudo.org/fudo-nix/entities.git"
}, },
@ -506,6 +500,8 @@
"fudo-home": { "fudo-home": {
"inputs": { "inputs": {
"doom-emacs": "doom-emacs", "doom-emacs": "doom-emacs",
"emacs-overlay": "emacs-overlay",
"fudo-pkgs": "fudo-pkgs",
"home-manager": "home-manager", "home-manager": "home-manager",
"niten-doom-config": "niten-doom-config", "niten-doom-config": "niten-doom-config",
"nixpkgs": [ "nixpkgs": [
@ -514,11 +510,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1639853480, "lastModified": 1653156643,
"narHash": "sha256-FV9LBcA/hh0DIBb7JzmcDjXDq6wJP46NALsMW0orfbc=", "narHash": "sha256-0vbp1dCXHN1PTH7lOfBJXeTdZOZD+Qz/rNtoTkBTObE=",
"ref": "master", "ref": "master",
"rev": "4954bd4e6c5d784740bee169aa7db7850fcfd5e0", "rev": "94768ec4c09c1f6dfad138d9f60c1fb693cff31a",
"revCount": 58, "revCount": 158,
"type": "git", "type": "git",
"url": "https://git.fudo.org/fudo-nix/home.git" "url": "https://git.fudo.org/fudo-nix/home.git"
}, },
@ -529,11 +525,11 @@
}, },
"fudo-lib": { "fudo-lib": {
"locked": { "locked": {
"lastModified": 1638990149, "lastModified": 1641848738,
"narHash": "sha256-p1T0GMJXIJvTpVdn5nK7RZJX8izkabADJ/LsaL442zI=", "narHash": "sha256-9+xyFqyUIzIkNo2HyXxp6Lm9/f0EZqRqkRz52AQoW6Q=",
"ref": "master", "ref": "master",
"rev": "c87448ff1365c3d5230690f68d1ba246652581d1", "rev": "63b80fb5dc1e6ad69252a233b7c6a20f649884c6",
"revCount": 24, "revCount": 59,
"type": "git", "type": "git",
"url": "https://git.fudo.org/fudo-nix/lib.git" "url": "https://git.fudo.org/fudo-nix/lib.git"
}, },
@ -544,11 +540,11 @@
}, },
"fudo-lib_2": { "fudo-lib_2": {
"locked": { "locked": {
"lastModified": 1638990149, "lastModified": 1641848738,
"narHash": "sha256-p1T0GMJXIJvTpVdn5nK7RZJX8izkabADJ/LsaL442zI=", "narHash": "sha256-9+xyFqyUIzIkNo2HyXxp6Lm9/f0EZqRqkRz52AQoW6Q=",
"ref": "master", "ref": "master",
"rev": "c87448ff1365c3d5230690f68d1ba246652581d1", "rev": "63b80fb5dc1e6ad69252a233b7c6a20f649884c6",
"revCount": 24, "revCount": 59,
"type": "git", "type": "git",
"url": "https://git.fudo.org/fudo-nix/lib.git" "url": "https://git.fudo.org/fudo-nix/lib.git"
}, },
@ -559,7 +555,7 @@
}, },
"fudo-lib_3": { "fudo-lib_3": {
"locked": { "locked": {
"narHash": "sha256-UAFFqr8Dln9AtMu1mJDHGFhNQgAezZjU8yywX/yaihs=", "narHash": "sha256-IZsP2NrqUbz0p3KeTnT7U8RjvSkHODmJTePBSGNmlxw=",
"path": "/state/fudo-lib", "path": "/state/fudo-lib",
"type": "path" "type": "path"
}, },
@ -575,14 +571,15 @@
"fudo-entities": "fudo-entities_2", "fudo-entities": "fudo-entities_2",
"fudo-home": "fudo-home", "fudo-home": "fudo-home",
"fudo-lib": "fudo-lib_3", "fudo-lib": "fudo-lib_3",
"fudo-pkgs": "fudo-pkgs", "fudo-pkgs": "fudo-pkgs_2",
"fudo-secrets": "fudo-secrets", "fudo-secrets": "fudo-secrets",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"nixpkgsUnstable": "nixpkgsUnstable"
}, },
"locked": { "locked": {
"narHash": "sha256-KyYHZOpcRF+NvAErciqRXdTLjsKX/dolUc4WAJHkuv4=", "narHash": "sha256-7NpFFEQJDsOmY1hl0Acee/TIblEiWrcZFmsQ+a0OfcA=",
"path": "/state/fudo-nixos", "path": "/state/fudo-nixos",
"type": "path" "type": "path"
}, },
@ -593,11 +590,26 @@
}, },
"fudo-pkgs": { "fudo-pkgs": {
"locked": { "locked": {
"lastModified": 1639072539, "lastModified": 1648662131,
"narHash": "sha256-ezF6GF5JaJgQ7C4ZbzK4VWXl8DrDRO1gsvv/SOckmZ8=", "narHash": "sha256-wOJyR8xFQQhZ7gjK+sj3rJND8ORIHPuINNfQsdjM0BE=",
"ref": "master", "ref": "master",
"rev": "99319e33c6e17476225c1d939e656c6ae6c8152f", "rev": "c5180cbacd66673a3e8fcd0ce2c4abff119bbe93",
"revCount": 18, "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", "type": "git",
"url": "https://git.fudo.org/fudo-nix/pkgs.git" "url": "https://git.fudo.org/fudo-nix/pkgs.git"
}, },
@ -621,7 +633,7 @@
"ssh-keypairs": "ssh-keypairs" "ssh-keypairs": "ssh-keypairs"
}, },
"locked": { "locked": {
"narHash": "sha256-22lvxSaUkKdp33P19eXif1PieGty0cJw4P2R6LJFL30=", "narHash": "sha256-N3N5RSPFSF/+tA3uqnBkhiiSNzBqsWsUBLXAqG1YS7c=",
"path": "/state/secrets", "path": "/state/secrets",
"type": "path" "type": "path"
}, },
@ -645,7 +657,7 @@
"ssh-keypairs": "ssh-keypairs_2" "ssh-keypairs": "ssh-keypairs_2"
}, },
"locked": { "locked": {
"narHash": "sha256-22lvxSaUkKdp33P19eXif1PieGty0cJw4P2R6LJFL30=", "narHash": "sha256-N3N5RSPFSF/+tA3uqnBkhiiSNzBqsWsUBLXAqG1YS7c=",
"path": "/state/secrets", "path": "/state/secrets",
"type": "path" "type": "path"
}, },
@ -707,11 +719,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1638553958, "lastModified": 1648834319,
"narHash": "sha256-leETjYMtD9y37CvfRSQhIGibcIl4dNVlFkY/8QgqmAM=", "narHash": "sha256-i5Aj4Aw64D/A0X6XW5LxSS4XBnYj7gMz+kN4dpsbdk8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6ce1d64073f48b9bc9425218803b1b607454c1e7", "rev": "0bdbdea2e26c984b096f4f7d10e3c88536a980b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -724,7 +736,7 @@
"host-keytabs": { "host-keytabs": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-LAAZVfwD65yS6H7EcKmfiPXtLcfRQ80u3V4LFRjr7ko=", "narHash": "sha256-SA058alChYye39gm4TwPpCufR1P+X9QnH/EunJYXd5s=",
"path": "/state/secrets/kerberos/host-keytabs", "path": "/state/secrets/kerberos/host-keytabs",
"type": "path" "type": "path"
}, },
@ -736,7 +748,7 @@
"host-keytabs_2": { "host-keytabs_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-LAAZVfwD65yS6H7EcKmfiPXtLcfRQ80u3V4LFRjr7ko=", "narHash": "sha256-SA058alChYye39gm4TwPpCufR1P+X9QnH/EunJYXd5s=",
"path": "/state/secrets/kerberos/host-keytabs", "path": "/state/secrets/kerberos/host-keytabs",
"type": "path" "type": "path"
}, },
@ -748,11 +760,11 @@
"niten-doom-config": { "niten-doom-config": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1639608722, "lastModified": 1649611838,
"narHash": "sha256-Ao+J7h/zE0X+G3frfxCkoY4hK7T1oNpTpwwv7n7pGaA=", "narHash": "sha256-O8+LwXi52WZHQrZRfjW+QwI99ppBiBpYQcWYNgqY+iU=",
"ref": "master", "ref": "master",
"rev": "8be77a42d7669fa71287c58ebaf210159f198b50", "rev": "c45feb7fd8acb0730dfc76ddd993773da5411b82",
"revCount": 36, "revCount": 38,
"type": "git", "type": "git",
"url": "https://git.fudo.org/niten/doom-emacs.git" "url": "https://git.fudo.org/niten/doom-emacs.git"
}, },
@ -764,16 +776,15 @@
"nix-straight": { "nix-straight": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1621543597, "lastModified": 1643475817,
"narHash": "sha256-E/m2Hrw2og//CfOCOWe2yapYC01Tqhozn4YMPYJsC3o=", "narHash": "sha256-NpExq5nbPbj/ppkBX3SnETEJuOne1MKJxen8vVHsDFg=",
"owner": "vlaci", "owner": "nix-community",
"repo": "nix-straight.el", "repo": "nix-straight.el",
"rev": "8e84d04f10b2298de856b2b8b9a0d13abc91b5ca", "rev": "08d75e5651cb52f8a07e03408ed19e04bee07505",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "vlaci", "owner": "nix-community",
"ref": "v2.2.0",
"repo": "nix-straight.el", "repo": "nix-straight.el",
"type": "github" "type": "github"
} }
@ -793,6 +804,21 @@
"type": "github" "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": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1638196344, "lastModified": 1638196344,
@ -825,11 +851,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1638196344, "lastModified": 1640653651,
"narHash": "sha256-fkOqSkfOkl8tqxDd+zJU4kAgyLXp/ouaP+U9gpjEZZs=", "narHash": "sha256-fByFYXYoE/6TqwKGbT7XBCOAlSsFzOXm4ZsRLoO70m8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2553aee74fed8c2205a4aeb3ffd206ca14ede60f", "rev": "7bca80140fc7732c7357b26002db3d87b3ba4c61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -840,26 +866,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1626852498, "lastModified": 1653087707,
"narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=", "narHash": "sha256-zfno3snrzZTWQ2B7K53QHrGZwrjnJLTRPalymrSsziU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "16105403bdd843540cbef9c63fc0f16c1c6eaa70", "rev": "cbd40c72b2603ab54e7208f99f9b35fc158bc009",
"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",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -903,11 +914,11 @@
"org": { "org": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1627155762, "lastModified": 1646280299,
"narHash": "sha256-XS1eA6P0ePabdrnUNe5lN19EA9dfK615gMGObr9wfBQ=", "narHash": "sha256-ZNkOfB8o2OHTh2t/ci8uv8aoV3I5IfAgIIOP3azD6eU=",
"owner": "emacs-straight", "owner": "emacs-straight",
"repo": "org-mode", "repo": "org-mode",
"rev": "c9dfed48a607c7f6524f1c6480f09cf61a5d6237", "rev": "91681fc03334285dc0879fcb9a27583bd7ab9782",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -919,11 +930,11 @@
"org-contrib": { "org-contrib": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1623339452, "lastModified": 1639727892,
"narHash": "sha256-E3pioqkmAKQm5N7YsgJZil0/ozkdRE7//tE9FGbrluM=", "narHash": "sha256-+T6Y87aSAx7kMpigm8d1ODDQIyPBM6a+4qGolXjCEXs=",
"ref": "master", "ref": "master",
"rev": "fc81309cf6756607a836f93049a9393c2967c4e0", "rev": "5766ff1088191e4df5fecd55007ba4271e609bcc",
"revCount": 2599, "revCount": 2611,
"type": "git", "type": "git",
"url": "https://git.sr.ht/~bzg/org-contrib" "url": "https://git.sr.ht/~bzg/org-contrib"
}, },
@ -991,11 +1002,11 @@
"revealjs": { "revealjs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1625811744, "lastModified": 1646820626,
"narHash": "sha256-Y67nVqcovn2PbHXmWOFWMq10Qz2ZIRyyWEO6qsZLbIM=", "narHash": "sha256-J3bcoO/42FcPIqCU7ORiV7dcvJDKtEHG8N7/stEQqDg=",
"owner": "hakimel", "owner": "hakimel",
"repo": "reveal.js", "repo": "reveal.js",
"rev": "b18f12d964ef80bd9ffb061aae48ff4c15fb43ad", "rev": "37861335a225a3cc9f67e98977aceda3c2a9eca9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1010,7 +1021,7 @@
"fudo-entities": "fudo-entities", "fudo-entities": "fudo-entities",
"fudo-nixos": "fudo-nixos", "fudo-nixos": "fudo-nixos",
"fudo-secrets": "fudo-secrets_2", "fudo-secrets": "fudo-secrets_2",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_5"
} }
}, },
"rotate-text": { "rotate-text": {
@ -1056,7 +1067,7 @@
"service-passwords": { "service-passwords": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-4xEJlPU+KeBtQuFqRlB1bzJMXUQ6a+DT2v3OptaHyTg=", "narHash": "sha256-vnxG3as7SVq0yIXKsf3qHM58Sv6Dcm7NPg+kLg4QtNs=",
"path": "/state/secrets/service-passwords", "path": "/state/secrets/service-passwords",
"type": "path" "type": "path"
}, },
@ -1068,7 +1079,7 @@
"service-passwords_2": { "service-passwords_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-4xEJlPU+KeBtQuFqRlB1bzJMXUQ6a+DT2v3OptaHyTg=", "narHash": "sha256-vnxG3as7SVq0yIXKsf3qHM58Sv6Dcm7NPg+kLg4QtNs=",
"path": "/state/secrets/service-passwords", "path": "/state/secrets/service-passwords",
"type": "path" "type": "path"
}, },
@ -1080,7 +1091,7 @@
"service-secrets": { "service-secrets": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-IfG9fX6qr+EKMfG6l/nzhrNYYXfKBtaNHHhiW6eCcGk=", "narHash": "sha256-vXL26U+o23E5tTG4Hb/RZrfra3I8Zw/wdZnT9PKwdks=",
"path": "/state/secrets/service-secrets", "path": "/state/secrets/service-secrets",
"type": "path" "type": "path"
}, },
@ -1092,7 +1103,7 @@
"service-secrets_2": { "service-secrets_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-IfG9fX6qr+EKMfG6l/nzhrNYYXfKBtaNHHhiW6eCcGk=", "narHash": "sha256-vXL26U+o23E5tTG4Hb/RZrfra3I8Zw/wdZnT9PKwdks=",
"path": "/state/secrets/service-secrets", "path": "/state/secrets/service-secrets",
"type": "path" "type": "path"
}, },
@ -1104,7 +1115,7 @@
"ssh-keypairs": { "ssh-keypairs": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-TlRfaYFuJxLUCarxZ1XYnW8PruKyYO5RErVGo5hTgo4=", "narHash": "sha256-pla2J8HmPHBVDp/2m/22lctwd6VvmJ2cik5n68jf3VY=",
"path": "/state/secrets/ssh-keypairs", "path": "/state/secrets/ssh-keypairs",
"type": "path" "type": "path"
}, },
@ -1116,7 +1127,7 @@
"ssh-keypairs_2": { "ssh-keypairs_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-TlRfaYFuJxLUCarxZ1XYnW8PruKyYO5RErVGo5hTgo4=", "narHash": "sha256-pla2J8HmPHBVDp/2m/22lctwd6VvmJ2cik5n68jf3VY=",
"path": "/state/secrets/ssh-keypairs", "path": "/state/secrets/ssh-keypairs",
"type": "path" "type": "path"
}, },

View File

@ -2,7 +2,9 @@
description = "Fudo NixOps network."; description = "Fudo NixOps network.";
inputs = { inputs = {
# Hard-coded commit due to https://github.com/vlaci/nix-doom-emacs/issues/401
nixpkgs.url = "nixpkgs/nixos-21.11"; nixpkgs.url = "nixpkgs/nixos-21.11";
# nixpkgs.url = "github:NixOS/nixpkgs?rev=971b383a28f4baee8ea3931af4840fa221929fd6";
fudo-secrets.url = "path:/state/secrets"; 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; { with nixpkgs.lib; {
nixopsConfigurations.default = let nixopsConfigurations.default = let
description = "Fudo NixOps Network"; description = "Fudo NixOps Network";
fudo-site = site: fudo-site = site: site == "nuttyclub" || site == "worldstream";
site == "nuttyclub" || site == "worldstream";
deployment-hosts = filterAttrs deployment-hosts = filterAttrs (hostname: hostOpts:
(hostname: hostOpts: hostOpts.nixos-system && (fudo-site hostOpts.site))
hostOpts.nixos-system &&
(fudo-site hostOpts.site))
fudo-entities.entities.hosts; fudo-entities.entities.hosts;
deployment-config-generator = deployment-config-generator =

View File

@ -102,11 +102,11 @@
"utils": "utils_4" "utils": "utils_4"
}, },
"locked": { "locked": {
"lastModified": 1639617108, "lastModified": 1641048770,
"narHash": "sha256-8lwF4kcf/pigrNIrR4JXdTTFTCxgKyVGsYppVEt1rII=", "narHash": "sha256-8rzyOw029lbQC/UzzROwr+k9tnYKPgLIBLxMne6abo4=",
"ref": "master", "ref": "master",
"rev": "0845e2e7eb44aefe38e3ae80ac237fd851733737", "rev": "88a8dbfe38d164351afeeca32c9e725d825e362d",
"revCount": 6, "revCount": 17,
"type": "git", "type": "git",
"url": "https://git.fudo.org/chute/chute.git" "url": "https://git.fudo.org/chute/chute.git"
}, },
@ -196,15 +196,24 @@
"inputs": { "inputs": {
"doom-emacs": "doom-emacs_2", "doom-emacs": "doom-emacs_2",
"doom-snippets": "doom-snippets", "doom-snippets": "doom-snippets",
"emacs-overlay": "emacs-overlay", "emacs-overlay": [
"fudo-nixos",
"fudo-home",
"emacs-overlay"
],
"emacs-so-long": "emacs-so-long", "emacs-so-long": "emacs-so-long",
"evil-markdown": "evil-markdown", "evil-markdown": "evil-markdown",
"evil-org-mode": "evil-org-mode", "evil-org-mode": "evil-org-mode",
"evil-quick-diff": "evil-quick-diff", "evil-quick-diff": "evil-quick-diff",
"explain-pause-mode": "explain-pause-mode", "explain-pause-mode": "explain-pause-mode",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils",
"format-all": "format-all",
"nix-straight": "nix-straight", "nix-straight": "nix-straight",
"nixpkgs": "nixpkgs_5", "nixpkgs": [
"fudo-nixos",
"fudo-home",
"nixpkgs"
],
"nose": "nose", "nose": "nose",
"ob-racket": "ob-racket", "ob-racket": "ob-racket",
"org": "org", "org": "org",
@ -215,15 +224,15 @@
"rotate-text": "rotate-text" "rotate-text": "rotate-text"
}, },
"locked": { "locked": {
"lastModified": 1627398156, "lastModified": 1649509049,
"narHash": "sha256-Ru1aV3NuIFXAsvUE3de8KR7xDZOo1GCBJdsWKJn+Ebw=", "narHash": "sha256-gLmRO2gPqjLPmFBhgFkl1nbBzJlNV0lmXMzapbw9qac=",
"owner": "vlaci", "owner": "nix-community",
"repo": "nix-doom-emacs", "repo": "nix-doom-emacs",
"rev": "fee14d217b7a911aad507679dafbeaa8c1ebf5ff", "rev": "f3f40f333c3214c9614c23b6abd1ae498af3e5b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "vlaci", "owner": "nix-community",
"repo": "nix-doom-emacs", "repo": "nix-doom-emacs",
"type": "github" "type": "github"
} }
@ -231,16 +240,16 @@
"doom-emacs_2": { "doom-emacs_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1626604817, "lastModified": 1645634993,
"narHash": "sha256-z+dvjB02cHU+VQ5EMkzqSdX817PZar9AkmmfK27q0vo=", "narHash": "sha256-QeE6aUJxoaqHM28Cpt2rKC817VQvXGuuFUyLzehaC50=",
"owner": "hlissner", "owner": "hlissner",
"repo": "doom-emacs", "repo": "doom-emacs",
"rev": "46732c0adaef147144418f9f284ca6b1183ab96f", "rev": "42e5763782fdc1aabb9f2624d468248d6978abe2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hlissner", "owner": "hlissner",
"ref": "develop", "ref": "master",
"repo": "doom-emacs", "repo": "doom-emacs",
"type": "github" "type": "github"
} }
@ -248,11 +257,11 @@
"doom-snippets": { "doom-snippets": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1625547004, "lastModified": 1646222996,
"narHash": "sha256-V+ytAjB4ZZ+5dJJAu1OY7SbnqrokX5PVBWs0AsgQ8Vs=", "narHash": "sha256-YhOnoNSpmcKNJg+aS/829zqXStMkKWXWf1pulHEBcpQ=",
"owner": "hlissner", "owner": "hlissner",
"repo": "doom-snippets", "repo": "doom-snippets",
"rev": "5c0eb5bd70f035cefb981c2ce64f4367498bdda6", "rev": "f61c23ece1ad47c0522059ac45085fd283ce4452",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -264,11 +273,11 @@
"emacs-overlay": { "emacs-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1626972035, "lastModified": 1649586061,
"narHash": "sha256-YhBtnKmLDYiEzP5ZEMEQMg6oMP5EV+ToCkku7ZYfL+A=", "narHash": "sha256-gFAHrrY0i71WIP16FGo3pgNKTZ5m5L6FtQsOYpne9gk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "be04b45efb35db58e6ac6aa86b84f850c85b5dfe", "rev": "16262a84ef07fb0e8cfc592b65d786b086840065",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -415,11 +424,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1638122382, "lastModified": 1644229661,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -428,50 +437,36 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": { "format-all": {
"flake": false,
"locked": { "locked": {
"lastModified": 1638122382, "lastModified": 1581716637,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=",
"owner": "numtide", "owner": "lassik",
"repo": "flake-utils", "repo": "emacs-format-all-the-code",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "lassik",
"repo": "flake-utils", "repo": "emacs-format-all-the-code",
"type": "github" "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3",
}
},
"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",
"type": "github" "type": "github"
} }
}, },
"fudo-entities": { "fudo-entities": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"fudo-lib": "fudo-lib", "fudo-lib": "fudo-lib",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1639518935, "lastModified": 1650751627,
"narHash": "sha256-I3+jWNiGo6q3BtQHNgWK5aZ7K22L6YzNjQ5ZOfKgYwQ=", "narHash": "sha256-BmKuSB+FeIB64b1DAKgLvx1EOoNII1QSS9OOSx1k6Vg=",
"ref": "master", "ref": "master",
"rev": "ee5bede8e9766bbdf7b9f093d8eb3d1c2eb27caa", "rev": "97b51fcc916ee04e719cce0b653988b80fa62d93",
"revCount": 24, "revCount": 92,
"type": "git", "type": "git",
"url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git" "url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git"
}, },
@ -482,7 +477,6 @@
}, },
"fudo-entities_2": { "fudo-entities_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2",
"fudo-lib": "fudo-lib_2", "fudo-lib": "fudo-lib_2",
"nixpkgs": [ "nixpkgs": [
"fudo-nixos", "fudo-nixos",
@ -490,11 +484,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1639518935, "lastModified": 1650751627,
"narHash": "sha256-I3+jWNiGo6q3BtQHNgWK5aZ7K22L6YzNjQ5ZOfKgYwQ=", "narHash": "sha256-BmKuSB+FeIB64b1DAKgLvx1EOoNII1QSS9OOSx1k6Vg=",
"ref": "master", "ref": "master",
"rev": "ee5bede8e9766bbdf7b9f093d8eb3d1c2eb27caa", "rev": "97b51fcc916ee04e719cce0b653988b80fa62d93",
"revCount": 24, "revCount": 92,
"type": "git", "type": "git",
"url": "https://git.fudo.org/fudo-nix/entities.git" "url": "https://git.fudo.org/fudo-nix/entities.git"
}, },
@ -506,6 +500,8 @@
"fudo-home": { "fudo-home": {
"inputs": { "inputs": {
"doom-emacs": "doom-emacs", "doom-emacs": "doom-emacs",
"emacs-overlay": "emacs-overlay",
"fudo-pkgs": "fudo-pkgs",
"home-manager": "home-manager", "home-manager": "home-manager",
"niten-doom-config": "niten-doom-config", "niten-doom-config": "niten-doom-config",
"nixpkgs": [ "nixpkgs": [
@ -514,11 +510,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1639853480, "lastModified": 1652636394,
"narHash": "sha256-FV9LBcA/hh0DIBb7JzmcDjXDq6wJP46NALsMW0orfbc=", "narHash": "sha256-NbIQb6vKTP39mDHWLSNX9iJTbNEIkNzlHpNss91dGG8=",
"ref": "master", "ref": "master",
"rev": "4954bd4e6c5d784740bee169aa7db7850fcfd5e0", "rev": "61bd8826902b1251963585eb90b90a631feae887",
"revCount": 58, "revCount": 157,
"type": "git", "type": "git",
"url": "https://git.fudo.org/fudo-nix/home.git" "url": "https://git.fudo.org/fudo-nix/home.git"
}, },
@ -529,11 +525,11 @@
}, },
"fudo-lib": { "fudo-lib": {
"locked": { "locked": {
"lastModified": 1638990149, "lastModified": 1641848738,
"narHash": "sha256-p1T0GMJXIJvTpVdn5nK7RZJX8izkabADJ/LsaL442zI=", "narHash": "sha256-9+xyFqyUIzIkNo2HyXxp6Lm9/f0EZqRqkRz52AQoW6Q=",
"ref": "master", "ref": "master",
"rev": "c87448ff1365c3d5230690f68d1ba246652581d1", "rev": "63b80fb5dc1e6ad69252a233b7c6a20f649884c6",
"revCount": 24, "revCount": 59,
"type": "git", "type": "git",
"url": "https://git.fudo.org/fudo-nix/lib.git" "url": "https://git.fudo.org/fudo-nix/lib.git"
}, },
@ -544,11 +540,11 @@
}, },
"fudo-lib_2": { "fudo-lib_2": {
"locked": { "locked": {
"lastModified": 1638990149, "lastModified": 1641848738,
"narHash": "sha256-p1T0GMJXIJvTpVdn5nK7RZJX8izkabADJ/LsaL442zI=", "narHash": "sha256-9+xyFqyUIzIkNo2HyXxp6Lm9/f0EZqRqkRz52AQoW6Q=",
"ref": "master", "ref": "master",
"rev": "c87448ff1365c3d5230690f68d1ba246652581d1", "rev": "63b80fb5dc1e6ad69252a233b7c6a20f649884c6",
"revCount": 24, "revCount": 59,
"type": "git", "type": "git",
"url": "https://git.fudo.org/fudo-nix/lib.git" "url": "https://git.fudo.org/fudo-nix/lib.git"
}, },
@ -559,7 +555,7 @@
}, },
"fudo-lib_3": { "fudo-lib_3": {
"locked": { "locked": {
"narHash": "sha256-UAFFqr8Dln9AtMu1mJDHGFhNQgAezZjU8yywX/yaihs=", "narHash": "sha256-jWey7aqF6yUGOdBL2+aT/Q0s8wYshjmtXp9vHUUOTM8=",
"path": "/state/fudo-lib", "path": "/state/fudo-lib",
"type": "path" "type": "path"
}, },
@ -575,14 +571,15 @@
"fudo-entities": "fudo-entities_2", "fudo-entities": "fudo-entities_2",
"fudo-home": "fudo-home", "fudo-home": "fudo-home",
"fudo-lib": "fudo-lib_3", "fudo-lib": "fudo-lib_3",
"fudo-pkgs": "fudo-pkgs", "fudo-pkgs": "fudo-pkgs_2",
"fudo-secrets": "fudo-secrets", "fudo-secrets": "fudo-secrets",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"nixpkgsUnstable": "nixpkgsUnstable"
}, },
"locked": { "locked": {
"narHash": "sha256-KyYHZOpcRF+NvAErciqRXdTLjsKX/dolUc4WAJHkuv4=", "narHash": "sha256-zDespLNaRStol+Ue33zqcGGIjkmZEPa7Dy9pahmJHZU=",
"path": "/state/fudo-nixos", "path": "/state/fudo-nixos",
"type": "path" "type": "path"
}, },
@ -593,11 +590,26 @@
}, },
"fudo-pkgs": { "fudo-pkgs": {
"locked": { "locked": {
"lastModified": 1639072539, "lastModified": 1648662131,
"narHash": "sha256-ezF6GF5JaJgQ7C4ZbzK4VWXl8DrDRO1gsvv/SOckmZ8=", "narHash": "sha256-wOJyR8xFQQhZ7gjK+sj3rJND8ORIHPuINNfQsdjM0BE=",
"ref": "master", "ref": "master",
"rev": "99319e33c6e17476225c1d939e656c6ae6c8152f", "rev": "c5180cbacd66673a3e8fcd0ce2c4abff119bbe93",
"revCount": 18, "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", "type": "git",
"url": "https://git.fudo.org/fudo-nix/pkgs.git" "url": "https://git.fudo.org/fudo-nix/pkgs.git"
}, },
@ -621,7 +633,7 @@
"ssh-keypairs": "ssh-keypairs" "ssh-keypairs": "ssh-keypairs"
}, },
"locked": { "locked": {
"narHash": "sha256-22lvxSaUkKdp33P19eXif1PieGty0cJw4P2R6LJFL30=", "narHash": "sha256-N3N5RSPFSF/+tA3uqnBkhiiSNzBqsWsUBLXAqG1YS7c=",
"path": "/state/secrets", "path": "/state/secrets",
"type": "path" "type": "path"
}, },
@ -645,7 +657,7 @@
"ssh-keypairs": "ssh-keypairs_2" "ssh-keypairs": "ssh-keypairs_2"
}, },
"locked": { "locked": {
"narHash": "sha256-22lvxSaUkKdp33P19eXif1PieGty0cJw4P2R6LJFL30=", "narHash": "sha256-N3N5RSPFSF/+tA3uqnBkhiiSNzBqsWsUBLXAqG1YS7c=",
"path": "/state/secrets", "path": "/state/secrets",
"type": "path" "type": "path"
}, },
@ -707,11 +719,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1638553958, "lastModified": 1648834319,
"narHash": "sha256-leETjYMtD9y37CvfRSQhIGibcIl4dNVlFkY/8QgqmAM=", "narHash": "sha256-i5Aj4Aw64D/A0X6XW5LxSS4XBnYj7gMz+kN4dpsbdk8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6ce1d64073f48b9bc9425218803b1b607454c1e7", "rev": "0bdbdea2e26c984b096f4f7d10e3c88536a980b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -724,7 +736,7 @@
"host-keytabs": { "host-keytabs": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-LAAZVfwD65yS6H7EcKmfiPXtLcfRQ80u3V4LFRjr7ko=", "narHash": "sha256-SA058alChYye39gm4TwPpCufR1P+X9QnH/EunJYXd5s=",
"path": "/state/secrets/kerberos/host-keytabs", "path": "/state/secrets/kerberos/host-keytabs",
"type": "path" "type": "path"
}, },
@ -736,7 +748,7 @@
"host-keytabs_2": { "host-keytabs_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-LAAZVfwD65yS6H7EcKmfiPXtLcfRQ80u3V4LFRjr7ko=", "narHash": "sha256-SA058alChYye39gm4TwPpCufR1P+X9QnH/EunJYXd5s=",
"path": "/state/secrets/kerberos/host-keytabs", "path": "/state/secrets/kerberos/host-keytabs",
"type": "path" "type": "path"
}, },
@ -748,11 +760,11 @@
"niten-doom-config": { "niten-doom-config": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1639608722, "lastModified": 1649611838,
"narHash": "sha256-Ao+J7h/zE0X+G3frfxCkoY4hK7T1oNpTpwwv7n7pGaA=", "narHash": "sha256-O8+LwXi52WZHQrZRfjW+QwI99ppBiBpYQcWYNgqY+iU=",
"ref": "master", "ref": "master",
"rev": "8be77a42d7669fa71287c58ebaf210159f198b50", "rev": "c45feb7fd8acb0730dfc76ddd993773da5411b82",
"revCount": 36, "revCount": 38,
"type": "git", "type": "git",
"url": "https://git.fudo.org/niten/doom-emacs.git" "url": "https://git.fudo.org/niten/doom-emacs.git"
}, },
@ -764,16 +776,15 @@
"nix-straight": { "nix-straight": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1621543597, "lastModified": 1643475817,
"narHash": "sha256-E/m2Hrw2og//CfOCOWe2yapYC01Tqhozn4YMPYJsC3o=", "narHash": "sha256-NpExq5nbPbj/ppkBX3SnETEJuOne1MKJxen8vVHsDFg=",
"owner": "vlaci", "owner": "nix-community",
"repo": "nix-straight.el", "repo": "nix-straight.el",
"rev": "8e84d04f10b2298de856b2b8b9a0d13abc91b5ca", "rev": "08d75e5651cb52f8a07e03408ed19e04bee07505",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "vlaci", "owner": "nix-community",
"ref": "v2.2.0",
"repo": "nix-straight.el", "repo": "nix-straight.el",
"type": "github" "type": "github"
} }
@ -793,6 +804,21 @@
"type": "github" "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": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1638196344, "lastModified": 1638196344,
@ -825,11 +851,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1638196344, "lastModified": 1640653651,
"narHash": "sha256-fkOqSkfOkl8tqxDd+zJU4kAgyLXp/ouaP+U9gpjEZZs=", "narHash": "sha256-fByFYXYoE/6TqwKGbT7XBCOAlSsFzOXm4ZsRLoO70m8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2553aee74fed8c2205a4aeb3ffd206ca14ede60f", "rev": "7bca80140fc7732c7357b26002db3d87b3ba4c61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -840,26 +866,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1626852498, "lastModified": 1652559422,
"narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=", "narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "16105403bdd843540cbef9c63fc0f16c1c6eaa70", "rev": "8b3398bc7587ebb79f93dfeea1b8c574d3c6dba1",
"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",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -903,11 +914,11 @@
"org": { "org": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1627155762, "lastModified": 1646280299,
"narHash": "sha256-XS1eA6P0ePabdrnUNe5lN19EA9dfK615gMGObr9wfBQ=", "narHash": "sha256-ZNkOfB8o2OHTh2t/ci8uv8aoV3I5IfAgIIOP3azD6eU=",
"owner": "emacs-straight", "owner": "emacs-straight",
"repo": "org-mode", "repo": "org-mode",
"rev": "c9dfed48a607c7f6524f1c6480f09cf61a5d6237", "rev": "91681fc03334285dc0879fcb9a27583bd7ab9782",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -919,11 +930,11 @@
"org-contrib": { "org-contrib": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1623339452, "lastModified": 1639727892,
"narHash": "sha256-E3pioqkmAKQm5N7YsgJZil0/ozkdRE7//tE9FGbrluM=", "narHash": "sha256-+T6Y87aSAx7kMpigm8d1ODDQIyPBM6a+4qGolXjCEXs=",
"ref": "master", "ref": "master",
"rev": "fc81309cf6756607a836f93049a9393c2967c4e0", "rev": "5766ff1088191e4df5fecd55007ba4271e609bcc",
"revCount": 2599, "revCount": 2611,
"type": "git", "type": "git",
"url": "https://git.sr.ht/~bzg/org-contrib" "url": "https://git.sr.ht/~bzg/org-contrib"
}, },
@ -991,11 +1002,11 @@
"revealjs": { "revealjs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1625811744, "lastModified": 1646820626,
"narHash": "sha256-Y67nVqcovn2PbHXmWOFWMq10Qz2ZIRyyWEO6qsZLbIM=", "narHash": "sha256-J3bcoO/42FcPIqCU7ORiV7dcvJDKtEHG8N7/stEQqDg=",
"owner": "hakimel", "owner": "hakimel",
"repo": "reveal.js", "repo": "reveal.js",
"rev": "b18f12d964ef80bd9ffb061aae48ff4c15fb43ad", "rev": "37861335a225a3cc9f67e98977aceda3c2a9eca9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1010,7 +1021,7 @@
"fudo-entities": "fudo-entities", "fudo-entities": "fudo-entities",
"fudo-nixos": "fudo-nixos", "fudo-nixos": "fudo-nixos",
"fudo-secrets": "fudo-secrets_2", "fudo-secrets": "fudo-secrets_2",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_5"
} }
}, },
"rotate-text": { "rotate-text": {
@ -1056,7 +1067,7 @@
"service-passwords": { "service-passwords": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-4xEJlPU+KeBtQuFqRlB1bzJMXUQ6a+DT2v3OptaHyTg=", "narHash": "sha256-vnxG3as7SVq0yIXKsf3qHM58Sv6Dcm7NPg+kLg4QtNs=",
"path": "/state/secrets/service-passwords", "path": "/state/secrets/service-passwords",
"type": "path" "type": "path"
}, },
@ -1068,7 +1079,7 @@
"service-passwords_2": { "service-passwords_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-4xEJlPU+KeBtQuFqRlB1bzJMXUQ6a+DT2v3OptaHyTg=", "narHash": "sha256-vnxG3as7SVq0yIXKsf3qHM58Sv6Dcm7NPg+kLg4QtNs=",
"path": "/state/secrets/service-passwords", "path": "/state/secrets/service-passwords",
"type": "path" "type": "path"
}, },
@ -1080,7 +1091,7 @@
"service-secrets": { "service-secrets": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-IfG9fX6qr+EKMfG6l/nzhrNYYXfKBtaNHHhiW6eCcGk=", "narHash": "sha256-vXL26U+o23E5tTG4Hb/RZrfra3I8Zw/wdZnT9PKwdks=",
"path": "/state/secrets/service-secrets", "path": "/state/secrets/service-secrets",
"type": "path" "type": "path"
}, },
@ -1092,7 +1103,7 @@
"service-secrets_2": { "service-secrets_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-IfG9fX6qr+EKMfG6l/nzhrNYYXfKBtaNHHhiW6eCcGk=", "narHash": "sha256-vXL26U+o23E5tTG4Hb/RZrfra3I8Zw/wdZnT9PKwdks=",
"path": "/state/secrets/service-secrets", "path": "/state/secrets/service-secrets",
"type": "path" "type": "path"
}, },
@ -1104,7 +1115,7 @@
"ssh-keypairs": { "ssh-keypairs": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-TlRfaYFuJxLUCarxZ1XYnW8PruKyYO5RErVGo5hTgo4=", "narHash": "sha256-pla2J8HmPHBVDp/2m/22lctwd6VvmJ2cik5n68jf3VY=",
"path": "/state/secrets/ssh-keypairs", "path": "/state/secrets/ssh-keypairs",
"type": "path" "type": "path"
}, },
@ -1116,7 +1127,7 @@
"ssh-keypairs_2": { "ssh-keypairs_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-TlRfaYFuJxLUCarxZ1XYnW8PruKyYO5RErVGo5hTgo4=", "narHash": "sha256-pla2J8HmPHBVDp/2m/22lctwd6VvmJ2cik5n68jf3VY=",
"path": "/state/secrets/ssh-keypairs", "path": "/state/secrets/ssh-keypairs",
"type": "path" "type": "path"
}, },

View File

@ -2,7 +2,9 @@
description = "Informis NixOps network."; description = "Informis NixOps network.";
inputs = { inputs = {
# Hard-coded commit due to https://github.com/vlaci/nix-doom-emacs/issues/401
nixpkgs.url = "nixpkgs/nixos-21.11"; nixpkgs.url = "nixpkgs/nixos-21.11";
# nixpkgs.url = "github:NixOS/nixpkgs?rev=971b383a28f4baee8ea3931af4840fa221929fd6";
fudo-secrets.url = "path:/state/secrets"; 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; { with nixpkgs.lib; {
nixopsConfigurations.default = let nixopsConfigurations.default = let
domain = "informis.land"; domain = "informis.land";
description = "Informis NixOps Network"; description = "Informis NixOps Network";
deployment-hosts = filterAttrs deployment-hosts = filterAttrs (hostname: hostOpts:
(hostname: hostOpts: hostOpts.domain == domain && hostOpts.nixos-system)
hostOpts.domain == domain &&
hostOpts.nixos-system)
fudo-entities.entities.hosts; fudo-entities.entities.hosts;
deployment-config-generator = deployment-config-generator =

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@
description = "Seattle Fudo NixOps network."; description = "Seattle Fudo NixOps network.";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-21.11"; nixpkgs.url = "nixpkgs/nixos-22.05";
fudo-secrets.url = "path:/state/secrets"; 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; { with nixpkgs.lib; {
nixopsConfigurations.default = let nixopsConfigurations.default = let
domain = "sea.fudo.org"; domain = "sea.fudo.org";
description = "Seattle Fudo NixOps Network"; description = "Seattle Fudo NixOps Network";
deployment-hosts = filterAttrs deployment-hosts = filterAttrs (hostname: hostOpts:
(hostname: hostOpts: hostOpts.domain == domain && hostOpts.nixos-system)
hostOpts.domain == domain &&
hostOpts.nixos-system)
fudo-entities.entities.hosts; fudo-entities.entities.hosts;
deployment-config-generator = deployment-config-generator =