diff --git a/flake.lock b/flake.lock index 2e39939..baeeb63 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { @@ -169,25 +169,6 @@ "url": "https://cgit.krebsco.de/blessings" } }, - "brockman": { - "inputs": { - "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1733833740, - "narHash": "sha256-vaNjbqpR1KZhLY7/Ht+pcQuaNO+NhQ71n+0QWtaQaXo=", - "owner": "kmein", - "repo": "brockman", - "rev": "ebea6a616190dbaeda793951b008c65383be1e0a", - "type": "github" - }, - "original": { - "owner": "kmein", - "repo": "brockman", - "type": "github" - } - }, "buildbot-nix": { "inputs": { "flake-parts": "flake-parts_2", @@ -199,11 +180,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1732578586, - "narHash": "sha256-kR2RwG4H32zRkyVVfDKUnoPxORb6DzztE16oc98ZzSg=", + "lastModified": 1737857314, + "narHash": "sha256-T9THCbnlj4CkKbTP+lisA5PUMoTXE7uh4FyDQzui+dc=", "owner": "Mic92", "repo": "buildbot-nix", - "rev": "037344cad03e933ea370c0766b39b959820446e5", + "rev": "c077f430f3717d41bb303d031398058665315166", "type": "github" }, "original": { @@ -305,7 +286,7 @@ }, "fenix": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "rust-analyzer-src": "rust-analyzer-src" }, "locked": { @@ -322,6 +303,22 @@ "type": "github" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1734969791, + "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -384,11 +381,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -534,19 +531,72 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "stylix", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "gnome-shell": { "flake": false, "locked": { - "lastModified": 1713702291, - "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "lastModified": 1732369855, + "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "rev": "dadd58f630eeea41d645ee225a63f719390829dc", "type": "github" }, "original": { "owner": "GNOME", - "ref": "46.1", + "ref": "47.2", "repo": "gnome-shell", "type": "github" } @@ -565,11 +615,11 @@ ] }, "locked": { - "lastModified": 1730903510, - "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=", + "lastModified": 1736917206, + "narHash": "sha256-JTBWmyGf8K1Rwb+gviHIUzRJk/sITtT+72HXFkTZUjo=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141", + "rev": "afd0a42e8c61ebb56899315ee4084a8b2e4ff425", "type": "github" }, "original": { @@ -608,11 +658,11 @@ ] }, "locked": { - "lastModified": 1733572789, - "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { @@ -690,7 +740,7 @@ "inputs": { "fenix": "fenix", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1702906210, @@ -774,7 +824,7 @@ "menstruation-telegram": "menstruation-telegram", "nix-on-droid": "nix-on-droid", "nixinate": "nixinate", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-old": "nixpkgs-old", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", @@ -949,7 +999,7 @@ }, "nixinate_2": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1708891350, @@ -965,54 +1015,18 @@ "type": "github" } }, - "nixlib": { - "locked": { - "lastModified": 1636849918, - "narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixos-generators": { - "inputs": { - "nixlib": "nixlib", - "nixpkgs": [ - "brockman", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1653339081, - "narHash": "sha256-dpim9Mtd57Yj6qt7p7UKwjWm6NnOU3S7jaEyEscSyPE=", - "owner": "nix-community", - "repo": "nixos-generators", - "rev": "fb3ee0f618b8c80dea1239691b15dfeb4bb46331", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-generators", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1654012153, - "narHash": "sha256-In+gfoH2Tnf/UmpzeuGlfuexU2EC4QIelBsm2zMK5AE=", + "lastModified": 1693636127, + "narHash": "sha256-ZlS/lFGzK7BJXX2YVGnP3yZi3T9OLOEtBCyMJsb91U8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "49a2bcc6e2065909c701f862f9a1a62b3082b40a", + "rev": "9075cba53e86dc318d159aee55dc9a7c9a4829c1", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -1099,11 +1113,11 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1733830410, - "narHash": "sha256-eBpi7AacnhhDrOE8FTmj2Rt0PafEWqb31s0wTJKCsCc=", + "lastModified": 1738005445, + "narHash": "sha256-hc4cRhHPrCVaMHqVCT+CcJX0BZdYRwFP99UHyiR948g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "45135b31a8782310c1e70ac242ba4130c5601030", + "rev": "eb12bf57742db460e2f6b12918911deacc103812", "type": "github" }, "original": { @@ -1114,22 +1128,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1659446231, "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", @@ -1145,7 +1143,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1615532953, "narHash": "sha256-SWpaGjrp/INzorEqMz3HLi6Uuk9I0KAn4YS8B4n3q5g=", @@ -1159,22 +1157,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1693636127, - "narHash": "sha256-ZlS/lFGzK7BJXX2YVGnP3yZi3T9OLOEtBCyMJsb91U8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9075cba53e86dc318d159aee55dc9a7c9a4829c1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1659446231, "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", @@ -1190,7 +1172,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1615532953, "narHash": "sha256-SWpaGjrp/INzorEqMz3HLi6Uuk9I0KAn4YS8B4n3q5g=", @@ -1203,6 +1185,22 @@ "type": "indirect" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1701436327, + "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_5": { "locked": { "lastModified": 1701436327, @@ -1220,22 +1218,6 @@ } }, "nixpkgs_6": { - "locked": { - "lastModified": 1701436327, - "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1653060744, "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=", @@ -1251,13 +1233,13 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { - "lastModified": 1733550349, - "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", + "lastModified": 1737885640, + "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", + "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7", "type": "github" }, "original": { @@ -1267,13 +1249,13 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -1283,6 +1265,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nmd": { "flake": false, "locked": { @@ -1397,15 +1395,15 @@ "nur_2": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1733828023, - "narHash": "sha256-P6VUTtoauXQ8Um8dEU2pvSiGBjWMcMRRNdpuj0qBDk4=", + "lastModified": 1738006222, + "narHash": "sha256-MsqFDA4e0PnYuxlCn1gpIl6C1fWyPLY2ND1/Jr8yrCY=", "owner": "nix-community", "repo": "NUR", - "rev": "5518ebad74468be340329de7fd2c1505592389f7", + "rev": "5d8189fe2c0655a93b081f4b7b892236b2500507", "type": "github" }, "original": { @@ -1453,11 +1451,11 @@ ] }, "locked": { - "lastModified": 1677165419, - "narHash": "sha256-pjYpXg+09rayon6uhSNd30ryrT2zYLOlDLBHQ9pnGZg=", + "lastModified": 1736882697, + "narHash": "sha256-G++JyQ6GJlQ8T/R18xb02HhSE1NWfpAboUEBleaadd8=", "owner": "kmein", "repo": "recht", - "rev": "5fa158ce21de797bd95a934dab8d4403b7531d20", + "rev": "dd49a91b1e611920889680aa2c9101166b0ce83e", "type": "github" }, "original": { @@ -1483,11 +1481,11 @@ }, "retiolum_2": { "locked": { - "lastModified": 1731340814, - "narHash": "sha256-2SiSp+UV9c45FPeDUUtjiIOMgyOKYAbpO0IEEjkgb54=", + "lastModified": 1737987273, + "narHash": "sha256-WQCLoDbthUO5PcdYDBxZZQgpQbEXab50EcwChkukxN4=", "ref": "refs/heads/master", - "rev": "30c7f45de25bd35641ba09bd7bbde084804f2b61", - "revCount": 349, + "rev": "514fe96610f745435b89355822691b1961dc4857", + "revCount": 350, "type": "git", "url": "https://git.thalheim.io/Mic92/retiolum" }, @@ -1499,7 +1497,6 @@ "root": { "inputs": { "agenix": "agenix", - "brockman": "brockman", "coptic-dictionary": "coptic-dictionary", "flake-utils": "flake-utils_3", "home-manager": "home-manager_2", @@ -1507,7 +1504,7 @@ "menstruation-telegram": "menstruation-telegram_2", "nix-on-droid": "nix-on-droid_2", "nixinate": "nixinate_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixpkgs-old": "nixpkgs-old_2", "nixpkgs-unstable": "nixpkgs-unstable_2", "nur": "nur_2", @@ -1575,11 +1572,11 @@ ] }, "locked": { - "lastModified": 1733798086, - "narHash": "sha256-XHIh0h84xDnjkqampyNI/r2FAkKmwbL719ZsygiJHKE=", + "lastModified": 1737944843, + "narHash": "sha256-ZSXR/po/slqpsk3JLVjXbE04Vqrb4k7yCGHjyMj3tOk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8a19e07800d64462913f3dbf5c9a20ea7b50e6cd", + "rev": "27bb917a41480b6ceee8e42d32dfcc9ecc6fa6c6", "type": "github" }, "original": { @@ -1650,14 +1647,14 @@ "inputs": { "buildbot-nix": "buildbot-nix", "nix-writers": "nix-writers", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1733336762, - "narHash": "sha256-rwO+P8LbkVUJWcp4NAq4VUK2B+KytVGkpi8bd7ulyyQ=", + "lastModified": 1737969857, + "narHash": "sha256-OrLWVsigZljnHNA5HRty6D/8IF4ge4WzHjmimYzxD+Q=", "owner": "krebs", "repo": "stockholm", - "rev": "636d6ee89b15e38a44442c041d255ef8743e5efa", + "rev": "c45109b564345a9aedb3577b3a3150a4fabb5403", "type": "github" }, "original": { @@ -1702,8 +1699,10 @@ "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_5", + "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": [ "home-manager" @@ -1717,11 +1716,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1732993760, - "narHash": "sha256-t1J6wgzGjvvGNfdd0ei8HnZf9sTw+SpvCNAX0i6Qgwc=", + "lastModified": 1737924417, + "narHash": "sha256-Jt0F1wY2AcgQdSfOE1+B0YnBYDgFYXJKDyEIa6/2VFk=", "owner": "danth", "repo": "stylix", - "rev": "d13ffb381c83b6139b9d67feff7addf18f8408fe", + "rev": "bcbd472edc8ed15624a378ce513b1e001d77594a", "type": "github" }, "original": { @@ -1809,7 +1808,7 @@ "telebots": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1677156381, @@ -1828,7 +1827,7 @@ "telebots_2": { "inputs": { "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1703313352, @@ -1889,11 +1888,11 @@ ] }, "locked": { - "lastModified": 1687504941, - "narHash": "sha256-wnCRcQn8izEHE8MfBpPkLezxAMIg7SVTq8CZsgkar54=", + "lastModified": 1738004786, + "narHash": "sha256-JQe2jTE1GS8qDtsEO5K1E0rLA6IHr7CqMlsm4Ne4YsM=", "owner": "kmein", "repo": "tinc-graph", - "rev": "91a3a85beaaec4ec43ea5a41322c3a5a6e04edc4", + "rev": "b7027f323f322f4de3f7575ad2694493f341b1ae", "type": "github" }, "original": { @@ -1982,11 +1981,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1737483750, + "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", "type": "github" }, "original": { @@ -2034,7 +2033,7 @@ "niveum", "flake-utils" ], - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1615819231, @@ -2056,7 +2055,7 @@ "flake-utils": [ "flake-utils" ], - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1615819231, diff --git a/flake.nix b/flake.nix index 4c4ab4d..a5e845a 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,6 @@ inputs = { agenix.url = "github:ryantm/agenix"; # alew-web.url = "git+ssh://gitea@code.kmein.de:22022/kfm/alew-web.git?ref=refs/heads/master"; - brockman.url = "github:kmein/brockman"; coptic-dictionary.url = "github:kmein/coptic-dictionary"; flake-utils.url = "github:numtide/flake-utils"; home-manager.url = "github:nix-community/home-manager/release-24.11"; @@ -66,7 +65,6 @@ nixpkgs, nixpkgs-unstable, nur, - brockman, home-manager, agenix, retiolum, @@ -210,7 +208,6 @@ inputs.self.nixosModules.panoptikon inputs.self.nixosModules.htgen inputs.stockholm.nixosModules.reaktor2 - brockman.nixosModule retiolum.nixosModules.retiolum nur.modules.nixos.default { nixpkgs.overlays = [ inputs.stockholm.overlays.default ]; } diff --git a/systems/ful/matomo.nix b/systems/ful/matomo.nix index dd69d84..3b47852 100644 --- a/systems/ful/matomo.nix +++ b/systems/ful/matomo.nix @@ -21,6 +21,7 @@ in { nginx = { serverName = "matomo.kmein.de"; }; + package = pkgs.matomo_5; }; services.mysql = {