diff --git a/flake.lock b/flake.lock index 7b84de8..ba37b09 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "candy-icons": { "flake": false, "locked": { - "lastModified": 1729631398, - "narHash": "sha256-Bv91a5NglKWwddqx0kPgdCrik9SOPtcfQFJDWOdcQG4=", + "lastModified": 1730754101, + "narHash": "sha256-tT+JX2iBIq+uVELW7gdtTL6VHzohowMJ6IMBSCnnkAw=", "ref": "refs/heads/master", - "rev": "f8a4125d338d86a58723ab36f9f827248d07c85c", - "revCount": 1234, + "rev": "72e20c0c473b9c5904ea085de0954048ba14d701", + "revCount": 1236, "type": "git", "url": "https://github.com/EliverLara/candy-icons" }, @@ -37,11 +37,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1730190761, - "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", + "lastModified": 1731549112, + "narHash": "sha256-c9I3i1CwZ10SoM5npQQVnfwgvB86jAS3lT4ZqkRoSOI=", "owner": "nix-community", "repo": "disko", - "rev": "3979285062d6781525cded0f6c4ff92e71376b55", + "rev": "5fd852c4155a689098095406500d0ae3d04654a8", "type": "github" }, "original": { @@ -87,11 +87,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "hardware": { "locked": { - "lastModified": 1730537918, - "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=", + "lastModified": 1731403644, + "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560", + "rev": "f6581f1c3b137086e42a08a906bdada63045f991", "type": "github" }, "original": { @@ -159,11 +159,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1730633670, - "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", + "lastModified": 1731604581, + "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", + "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1730652030, - "narHash": "sha256-uTToUpFphR9ywc+DQUD/8hmboOMFV1lBVFf/ztzdn6A=", + "lastModified": 1731227601, + "narHash": "sha256-aGUQ6W/Oxd9xjH9RQbnUtC61sTK2fWlKr+J7kavT/RQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e74e57a37de55ecfdc62f49fe5a7463b2a52499a", + "rev": "7691d0ac1deb6ac7482c5a22fe1a14a34ca608b0", "type": "github" }, "original": { @@ -247,11 +247,11 @@ "yorha-sound-theme": "yorha-sound-theme" }, "locked": { - "lastModified": 1729834246, - "narHash": "sha256-VLjpd6SY+Ltv/n6o3z9osCA6O0HYKaHZhvYeFjsehEI=", + "lastModified": 1731647853, + "narHash": "sha256-3yzajp5oNIHOL3SyLfunUm4PozLX52YMpA1Q4OyV62k=", "ref": "refs/heads/main", - "rev": "5b4b87c834ce97caa588cca61fcaad1c7b14f0fe", - "revCount": 29, + "rev": "15ceb9dd2b4b388b76ff23cc95c24f6a9c46abd6", + "revCount": 30, "type": "git", "url": "https://forgejo.invariantspace.com/macronova/nix-custom" }, @@ -284,11 +284,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", + "lastModified": 1731245184, + "narHash": "sha256-vmLS8+x+gHRv1yzj3n+GTAEObwmhxmkkukB2DwtJRdU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "rev": "aebe249544837ce42588aa4b2e7972222ba12e8f", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -347,11 +347,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -394,11 +394,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { @@ -442,11 +442,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", + "lastModified": 1730768919, + "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", + "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", "type": "github" }, "original": { @@ -478,11 +478,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1730635861, - "narHash": "sha256-Npp3pl9aeAiq+wZPDbw2ZxybNuZWyuN7AY6fik56DCo=", + "lastModified": 1731193165, + "narHash": "sha256-pGF8L5g9QpkQtJP9JmNIRNZfcyhJHf7uT+d8tqI1h6Y=", "owner": "pjones", "repo": "plasma-manager", - "rev": "293668587937daae1df085ee36d2b2d0792b7a0f", + "rev": "f33173b9d22e554a6f869626bc01808d35995257", "type": "github" }, "original": { @@ -499,11 +499,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -533,11 +533,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1730605784, - "narHash": "sha256-1NveNAMLHbxOg0BpBMSVuZ2yW2PpDnZLbZ25wV50PMc=", + "lastModified": 1731364708, + "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e9b5eef9b51cdf966c76143e13a9476725b2f760", + "rev": "4c91d52db103e757fc25b58998b0576ae702d659", "type": "github" }, "original": { @@ -549,11 +549,11 @@ "sweet-ambar-blue": { "flake": false, "locked": { - "lastModified": 1729453950, - "narHash": "sha256-mYojaV645xiCBf2+hO8HRq06XKzP3E5shqJBIBXWduw=", + "lastModified": 1731018321, + "narHash": "sha256-j/O1SkxkkBl47AhYiYix4Uz4vZ4jHP3VqwJ208Wnv3I=", "ref": "Ambar-Blue", - "rev": "08021d3c662600a7e900339aa87fb5571aa3b169", - "revCount": 304, + "rev": "ca388046f3d866feafdad77389bd5a72de77fcc5", + "revCount": 305, "type": "git", "url": "https://github.com/EliverLara/Sweet" }, @@ -566,11 +566,11 @@ "sweet-ambar-blue-dark": { "flake": false, "locked": { - "lastModified": 1729453873, - "narHash": "sha256-ZNKH+dLY/T64qDNPYL6TJ5L6N3u+V5wp86yDWE5qXug=", + "lastModified": 1731018459, + "narHash": "sha256-oeZw8cU2+1kRAeuWBnGsVPGe6Di7ChkPJGkcUK+4jZ0=", "ref": "Ambar-Blue-Dark", - "rev": "b3477c35c22ae72b07d8cd00c2dc1c59503967d4", - "revCount": 388, + "rev": "5a76db222a21a133792b8d3525fe997a629fdce4", + "revCount": 390, "type": "git", "url": "https://github.com/EliverLara/Sweet" }, @@ -646,11 +646,11 @@ "wallpaper-engine-plasma6-plugin": { "flake": false, "locked": { - "lastModified": 1726816409, - "narHash": "sha256-KFTYZM82tQOQ+EKcPZPcsv0I9opqR2ahUTFjeKXmcVc=", + "lastModified": 1730612159, + "narHash": "sha256-ICQLtw+qaOMf0lkqKegp+Dkl7eUgPqKDn8Fj5Osb7eA=", "ref": "refs/heads/main", - "rev": "066813c4309faf1a86b5bc54bdaa69b4d7e511ed", - "revCount": 626, + "rev": "ed58dd8b920dbb2bf0859ab64e0b5939b8a32a0e", + "revCount": 628, "submodules": true, "type": "git", "url": "https://github.com/catsout/wallpaper-engine-kde-plugin" diff --git a/flake.nix b/flake.nix index f285c21..898bd37 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,6 @@ # TODO: Remove this when possible config.permittedInsecurePackages = [ - "fluffychat-web-1.22.1" "olm-3.2.16" ]; diff --git a/linux/singularity/caddy.nix b/linux/singularity/caddy.nix index 8834209..78dc8a1 100644 --- a/linux/singularity/caddy.nix +++ b/linux/singularity/caddy.nix @@ -59,9 +59,6 @@ with config.constants; { ''; "matrix.${domain}".extraConfig = '' reverse_proxy /_matrix/* ${homeSrv "conduit"} - file_server { - root ${pkgs.fluffychat-web} - } ''; "vault.${domain}".extraConfig = '' reverse_proxy ${localSrv "vault"} {