diff --git a/flake.lock b/flake.lock index e69745e..4d773e3 100644 --- a/flake.lock +++ b/flake.lock @@ -3,15 +3,16 @@ "commonmark-simple": { "flake": false, "locked": { - "lastModified": 1705078713, - "narHash": "sha256-YgDHJG8M47ZXGLWu8o7MhXbIrgQ0Ai32Gr8nKvZGGw8=", + "lastModified": 1755566927, + "narHash": "sha256-2WE5SjwgwjKdsHxDRfQIb2WRrVYoNPiCIyG4HZd8Znk=", "owner": "srid", "repo": "commonmark-simple", - "rev": "fc106c94f781f6a35ef66900880edc08cbe3b034", + "rev": "81dc7a66b2490a701bfc87e6e892307665e6336e", "type": "github" }, "original": { "owner": "srid", + "ref": "0.2.0.0", "repo": "commonmark-simple", "type": "github" } @@ -33,6 +34,23 @@ } }, "commonmark-wikilink": { + "flake": false, + "locked": { + "lastModified": 1755567049, + "narHash": "sha256-MWOb0Ojc4EQd9fOnQEveRDdbH5Cr6kjUt04uWzBPLGQ=", + "owner": "srid", + "repo": "commonmark-wikilink", + "rev": "5ab01515939047b58943cc1234e7ee0cb82d1c22", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "0.2.0.0", + "repo": "commonmark-wikilink", + "type": "github" + } + }, + "commonmark-wikilink_2": { "flake": false, "locked": { "lastModified": 1738248145, @@ -48,58 +66,19 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1741473158, - "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", - "owner": "numtide", - "repo": "devshell", - "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "ema": { - "inputs": { - "flake-parts": [ - "emanote", - "flake-parts" - ], - "flake-root": [ - "emanote", - "flake-root" - ], - "haskell-flake": [ - "emanote", - "haskell-flake" - ], - "nixpkgs": [ - "emanote", - "nixpkgs" - ], - "treefmt-nix": [ - "emanote", - "treefmt-nix" - ] - }, + "flake": false, "locked": { - "lastModified": 1702334080, - "narHash": "sha256-zrtzyLrSORxtocLMji5U9p4pDicMulOqgsuiB4LCu1o=", + "lastModified": 1753226458, + "narHash": "sha256-vDhjw+Cm7HniaiIHirwM0B2yzzLYLO3HHMaZsQRL3uw=", "owner": "srid", "repo": "ema", - "rev": "33f4cf31ace7e612e78ad25f5fc45089745ab644", + "rev": "7ff434cf8f494c62de7fe6c1a36d8681929beb93", "type": "github" }, "original": { "owner": "srid", - "ref": "no-ws", + "ref": "0.12.0.0", "repo": "ema", "type": "github" } @@ -107,15 +86,16 @@ "ema_2": { "flake": false, "locked": { - "lastModified": 1745123527, - "narHash": "sha256-FD6GJaiiKkH65N7iDjHtOtaEcWMf1P/t98kktILSkcg=", + "lastModified": 1753226458, + "narHash": "sha256-vDhjw+Cm7HniaiIHirwM0B2yzzLYLO3HHMaZsQRL3uw=", "owner": "srid", "repo": "ema", - "rev": "8590cc91e1f3dc3e10409d914c40a484645a2680", + "rev": "7ff434cf8f494c62de7fe6c1a36d8681929beb93", "type": "github" }, "original": { "owner": "srid", + "ref": "0.12.0.0", "repo": "ema", "type": "github" } @@ -123,23 +103,25 @@ "emanote": { "inputs": { "commonmark-simple": "commonmark-simple", + "commonmark-wikilink": "commonmark-wikilink", "ema": "ema", "emanote-template": [], "flake-parts": "flake-parts", - "flake-root": "flake-root", + "fourmolu-nix": "fourmolu-nix", + "git-hooks": "git-hooks", "haskell-flake": "haskell-flake", "heist-extra": "heist-extra", + "lvar": "lvar", + "nixos-unified": "nixos-unified", "nixpkgs": "nixpkgs", - "systems": "systems", - "treefmt-nix": "treefmt-nix", "unionmount": "unionmount" }, "locked": { - "lastModified": 1705141168, - "narHash": "sha256-uz6LGgOPuAGrVtPOlcEpgiSMA0Cp5G/uK3UwPhGP/AE=", + "lastModified": 1766432517, + "narHash": "sha256-2y58CyRlcPIQgVvPxsxKOp6aFO6S16CyYOJxFfBaKE8=", "owner": "srid", "repo": "emanote", - "rev": "7e4b27223d299ad325f685c63fa0f267fe2d8a00", + "rev": "6deb47e5db07221709d5214820ff4456e2bda92d", "type": "github" }, "original": { @@ -167,25 +149,28 @@ "emanote_2": { "inputs": { "commonmark-simple": "commonmark-simple_2", - "commonmark-wikilink": "commonmark-wikilink", + "commonmark-wikilink": "commonmark-wikilink_2", "ema": "ema_2", "emanote-template": "emanote-template", "flake-parts": "flake-parts_2", - "flake-root": "flake-root_2", + "flake-root": "flake-root", "haskell-flake": "haskell-flake_2", "heist-extra": "heist-extra_2", - "lvar": "lvar", - "nixos-unified": "nixos-unified", - "nixpkgs": "nixpkgs_4", - "treefmt-nix": "treefmt-nix_2", + "lvar": "lvar_2", + "nixos-unified": "nixos-unified_2", + "nixpkgs": [ + "osds-site", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix", "unionmount": "unionmount_2" }, "locked": { - "lastModified": 1753040695, - "narHash": "sha256-dpOcuQ1eIF6mmjA4b3eGreoYIpffevdhqxs/ykq/IxI=", + "lastModified": 1753298660, + "narHash": "sha256-rE84s+P4hx4AtriCPagexOQ7KsqIYsLyXGVx+QyzWFw=", "owner": "srid", "repo": "emanote", - "rev": "fa5d7125fe32c3b25ee271f3b4013753880519f0", + "rev": "7d505ee7ecfdbce87daff982034561f6a4625abc", "type": "github" }, "original": { @@ -212,14 +197,17 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "emanote", + "nixpkgs" + ] }, "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -252,14 +240,14 @@ }, "flake-parts_3": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1753121425, + "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", "type": "github" }, "original": { @@ -269,21 +257,6 @@ } }, "flake-root": { - "locked": { - "lastModified": 1692742795, - "narHash": "sha256-f+Y0YhVCIJ06LemO+3Xx00lIcqQxSKJHXT/yk1RTKxw=", - "owner": "srid", - "repo": "flake-root", - "rev": "d9a70d9c7a5fd7f3258ccf48da9335e9b47c3937", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, - "flake-root_2": { "locked": { "lastModified": 1723604017, "narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=", @@ -298,11 +271,45 @@ "type": "github" } }, + "fourmolu-nix": { + "locked": { + "lastModified": 1707266073, + "narHash": "sha256-tCFzZQJicDdYjnuJiNK4hiiRAH7c2wQzMhOCdUMbVKE=", + "owner": "jedimahdi", + "repo": "fourmolu-nix", + "rev": "717f5a91b0d7b97b1be7ecc3a0fd42d37ffe1c9b", + "type": "github" + }, + "original": { + "owner": "jedimahdi", + "repo": "fourmolu-nix", + "type": "github" + } + }, + "git-hooks": { + "flake": false, + "locked": { + "lastModified": 1748731907, + "narHash": "sha256-KVgK2PB1h5RNhHJzGn090XcW1i9Mq0FVh6qTVKsg2RU=", + "owner": "bmrips", + "repo": "git-hooks.nix", + "rev": "2749fc9197fd12231746ef685225eaf85fe087fd", + "type": "github" + }, + "original": { + "owner": "bmrips", + "repo": "git-hooks.nix", + "type": "github" + } + }, "git-hooks-nix": { "inputs": { "flake-compat": "flake-compat", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_5" + "nixpkgs": [ + "osds-site", + "nixpkgs" + ] }, "locked": { "lastModified": 1750779888, @@ -342,11 +349,11 @@ }, "haskell-flake": { "locked": { - "lastModified": 1705067885, - "narHash": "sha256-al2JqNIkXfLiVreqSJWly64Z6YVNphWBh4m3IxGIdYI=", + "lastModified": 1752499668, + "narHash": "sha256-Yif99ho8GNgXP0l9vxPHCKi7X16Cf7rwVd+HW1cMVeQ=", "owner": "srid", "repo": "haskell-flake", - "rev": "8a526aaf98cde6af6b2d1d368e9acb460ee34547", + "rev": "39065472d2587af93a502423276bfb98c2c6fb09", "type": "github" }, "original": { @@ -373,11 +380,11 @@ "heist-extra": { "flake": false, "locked": { - "lastModified": 1691619499, - "narHash": "sha256-4e8v5t4FM99pdcPhohP3dAeGtsFnirbfYGpbr2+qWxI=", + "lastModified": 1766109391, + "narHash": "sha256-ytHgIoRlkI5K0SDq33znlY0wjlqcwoQCe1z9JfHT/Fw=", "owner": "srid", "repo": "heist-extra", - "rev": "54ff970f733dd45b5509d1c4c298927b6241041b", + "rev": "81f1ea0cf1226215430171dbe613a2988c6cc46a", "type": "github" }, "original": { @@ -405,15 +412,33 @@ "lvar": { "flake": false, "locked": { - "lastModified": 1745122737, - "narHash": "sha256-ZnYXkkPmnNvt4tA45JgSC7dpttmqhUo4AHfEjB1r1gE=", + "lastModified": 1753226155, + "narHash": "sha256-Uwg5s0SlxLp83bXHA+6TIQV+L+lu8lwMpBdNuiuk7hg=", "owner": "srid", "repo": "lvar", - "rev": "047a24c4dcd7f85f9c18058f6be991cea531870e", + "rev": "cd110d4823ee7b8bbbf115a47c79bc304c3309cd", "type": "github" }, "original": { "owner": "srid", + "ref": "0.2.0.0", + "repo": "lvar", + "type": "github" + } + }, + "lvar_2": { + "flake": false, + "locked": { + "lastModified": 1753226155, + "narHash": "sha256-Uwg5s0SlxLp83bXHA+6TIQV+L+lu8lwMpBdNuiuk7hg=", + "owner": "srid", + "repo": "lvar", + "rev": "cd110d4823ee7b8bbbf115a47c79bc304c3309cd", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "0.2.0.0", "repo": "lvar", "type": "github" } @@ -433,13 +458,28 @@ "type": "github" } }, + "nixos-unified_2": { + "locked": { + "lastModified": 1751174231, + "narHash": "sha256-OLPo3ZI/gKH0C6P6l2W9RYm1ow/Jl4qBrasQ3rjAA0E=", + "owner": "srid", + "repo": "nixos-unified", + "rev": "05eb3d59d3b48460ea01c419702d4fc0c3210805", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "nixos-unified", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1704842529, - "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", + "lastModified": 1752900028, + "narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", + "rev": "6b4955211758ba47fac850c040a27f23b9b4008f", "type": "github" }, "original": { @@ -450,24 +490,6 @@ } }, "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_2": { "locked": { "lastModified": 1751159883, "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", @@ -484,11 +506,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1705183652, - "narHash": "sha256-rnfkyUH0x72oHfiSDhuCHDHg3gFgF+lF8zkkg5Zihsw=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "428544ae95eec077c7f823b422afae5f174dee4b", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { @@ -500,11 +522,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1722073938, - "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=", + "lastModified": 1753399495, + "narHash": "sha256-7XG/QBqhrYOyA2houjRTL2NMa7IKZZ/somBqr+Q/6Wo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae", + "rev": "0d00f23f023b7215b3f1035adb5247c8ec180dbc", "type": "github" }, "original": { @@ -514,85 +536,20 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1752900028, - "narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6b4955211758ba47fac850c040a27f23b9b4008f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1730768919, - "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1747958103, - "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "osds-site": { "inputs": { - "devshell": "devshell", "emanote": "emanote_2", "flake-parts": "flake-parts_3", "git-hooks-nix": "git-hooks-nix", - "nixpkgs": "nixpkgs_6", - "treefmt-nix": "treefmt-nix_3" + "nixpkgs": "nixpkgs_3", + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1753043365, - "narHash": "sha256-asHvMrxozzTIG/enqK4mV4QEOaqpkJ+Uyh5mohGnkNU=", + "lastModified": 1753516055, + "narHash": "sha256-bib/DAacc32NEmcFCGIZYgL89Hud1jbHKMp+qbtah/A=", "ref": "refs/heads/main", - "rev": "0828b30631731c9cc62143970af2cac9ae60e5ae", - "revCount": 2, + "rev": "c284766e4ea7b180a8123fe11111ff4c0340d91f", + "revCount": 12, "type": "git", "url": "https://git.ewanick.com/bill/osds-site" }, @@ -612,43 +569,7 @@ "osds-site": "osds-site" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "emanote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1693468138, - "narHash": "sha256-DddblCahuTW8K0ncPOheTlG3igE8b15LJjafF1PWhOo=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "6930a5ba0a722385baf273885a03f561dcb1af67", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { "inputs": { "nixpkgs": [ "osds-site", @@ -670,16 +591,19 @@ "type": "github" } }, - "treefmt-nix_3": { + "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": [ + "osds-site", + "nixpkgs" + ] }, "locked": { - "lastModified": 1753006367, - "narHash": "sha256-tzbhc4XttkyEhswByk5R38l+ztN9UDbnj0cTcP6Hp9A=", + "lastModified": 1753439394, + "narHash": "sha256-Bv9h1AJegLI8uAhiJ1sZ4XAndYxhgf38tMgCQwiEpmc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "421b56313c65a0815a52b424777f55acf0b56ddf", + "rev": "2673921c03d6e75fdf4aa93e025772608d1482cf", "type": "github" }, "original": { @@ -691,15 +615,16 @@ "unionmount": { "flake": false, "locked": { - "lastModified": 1691619410, - "narHash": "sha256-V9/OcGu9cy4kV9jta12A6w5BEj8awSEVYrXPpg8YckQ=", + "lastModified": 1755566785, + "narHash": "sha256-1TBIhcgbQxBF48ET7Dy+PM3U2lCROBDVg5PhOtm2Q/M=", "owner": "srid", "repo": "unionmount", - "rev": "ed73b627f88c8f021f41ba4b518ba41beff9df42", + "rev": "4387cdeca64d22ff02da318b1527ff8817123ced", "type": "github" }, "original": { "owner": "srid", + "ref": "0.3.0.0", "repo": "unionmount", "type": "github" } diff --git a/flake.nix b/flake.nix index 9d8240c..74702f9 100644 --- a/flake.nix +++ b/flake.nix @@ -18,17 +18,23 @@ }; outputs = - inputs@{ - self, - nixpkgs, - emanote, - osds-site, - ... + inputs@{ self + , nixpkgs + , emanote + , osds-site + , ... }: { nixosConfigurations.linode-nixos = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs emanote; }; modules = [ + { + nixpkgs.config.permittedInsecurePackages = [ + "forgejo-1.20.6-1-unstable-2024-04-18" + "jitsi-meet-1.0.8792" + ]; + } + ./server-config/configuration.nix ./nixos-apps diff --git a/server-config/configuration.nix b/server-config/configuration.nix index 63c4d1f..a1673d6 100644 --- a/server-config/configuration.nix +++ b/server-config/configuration.nix @@ -2,12 +2,11 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ - inputs, - config, - pkgs, - lib, - ... +{ inputs +, config +, pkgs +, lib +, ... }: {