From 02ae4f69a68c6db3e92873bd9d3f4ae184b723b3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 30 Oct 2024 10:16:13 +0100 Subject: [PATCH 001/384] Remove the binary cache for conduwuit for now as it seems to be down --- nixos/shared/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index a845b75..1138ad2 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -43,14 +43,12 @@ "https://nix-community.cachix.org" "https://nixpkgs-unfree.cachix.org" "https://0uptime.cachix.org" - "https://attic.kennel.juneis.dog/conduit" ]; trusted-public-keys = [ "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" - "conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk=" ]; }; }; From 3236096a8173bc4dc99145aa33d9babebefa9edb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 30 Oct 2024 10:26:47 +0100 Subject: [PATCH 002/384] Let's try disabling all this conduwuit stuff? It's still querying the binary cache for some reason --- flake.lock | 1006 ++--------------- flake.nix | 10 +- pkgs/simple-completion-language-server/result | 1 - 3 files changed, 110 insertions(+), 907 deletions(-) delete mode 120000 pkgs/simple-completion-language-server/result diff --git a/flake.lock b/flake.lock index 63d14af..408d326 100644 --- a/flake.lock +++ b/flake.lock @@ -1,29 +1,5 @@ { "nodes": { - "attic": { - "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1725300620, - "narHash": "sha256-IdM+pZ6BnmD3o1fTJZ2BD43k7dwi1BbVfLDLpM1nE5s=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "bea72d75b6165dfb529ba0c39cc6c7e9c7f0d234", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "main", - "repo": "attic", - "type": "github" - } - }, "bcachefs-tools": { "inputs": { "crane": "crane", @@ -38,11 +14,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728525495, - "narHash": "sha256-dsI85smVkHkv0sXlskE7EzBT7aR2jZYs3sCKhLu48NE=", + "lastModified": 1730060100, + "narHash": "sha256-wTO5qAjMopgEv5GSuFfY432SOCiIHE12n6OPgADLF8U=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "571ca8b8ce27d35cb7be3442dc55d64814dad11f", + "rev": "511a714ed34e89a9957b657c38c39ff182fe9da7", "type": "github" }, "original": { @@ -67,71 +43,13 @@ "type": "gitlab" } }, - "cachix": { - "inputs": { - "devenv": "devenv", - "flake-compat": "flake-compat_4", - "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1724232775, - "narHash": "sha256-6u2DycIEgrgNYlLxyGqdFVmBNiKIitnQKJ1pbRP5oko=", - "owner": "cachix", - "repo": "cachix", - "rev": "03b6cb3f953097bff378fb8b9ea094bd091a4ec7", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "master", - "repo": "cachix", - "type": "github" - } - }, - "cachix_2": { - "inputs": { - "devenv": "devenv_2", - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "flake-compat" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "nixpkgs" - ], - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "devenv", - "pre-commit-hooks" - ] - }, - "locked": { - "lastModified": 1712055811, - "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", - "owner": "cachix", - "repo": "cachix", - "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "cachix", - "type": "github" - } - }, "catppuccin": { "locked": { - "lastModified": 1728407414, - "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", + "lastModified": 1730036420, + "narHash": "sha256-rv2bz7J6Wo7AenPiu4+ptCB1AFyaMcS77y89zbRAtI8=", "owner": "catppuccin", "repo": "nix", - "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", + "rev": "0b7bf04628414a402d255924f65e9a0d1a53d92b", "type": "github" }, "original": { @@ -140,53 +58,6 @@ "type": "github" } }, - "complement": { - "flake": false, - "locked": { - "lastModified": 1724347376, - "narHash": "sha256-y0e/ULDJ92IhNQZsS/06g0s+AYZ82aJfrIO9qEse94c=", - "owner": "matrix-org", - "repo": "complement", - "rev": "39733c1b2f8314800776748cc7164f9a34650686", - "type": "github" - }, - "original": { - "owner": "matrix-org", - "ref": "main", - "repo": "complement", - "type": "github" - } - }, - "conduwuit": { - "inputs": { - "attic": "attic", - "cachix": "cachix", - "complement": "complement", - "crane": "crane_3", - "fenix": "fenix_2", - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_3", - "liburing": "liburing", - "nix-filter": "nix-filter", - "nixpkgs": [ - "nixpkgs" - ], - "rocksdb": "rocksdb" - }, - "locked": { - "lastModified": 1728182038, - "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", - "owner": "girlbossceo", - "repo": "conduwuit", - "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "repo": "conduwuit", - "type": "github" - } - }, "crane": { "inputs": { "nixpkgs": [ @@ -209,19 +80,12 @@ } }, "crane_2": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "attic", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1722960479, - "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", + "lastModified": 1730060262, + "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", "owner": "ipetkov", "repo": "crane", - "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", + "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", "type": "github" }, "original": { @@ -231,43 +95,6 @@ } }, "crane_3": { - "locked": { - "lastModified": 1725409566, - "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", - "owner": "ipetkov", - "repo": "crane", - "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "master", - "repo": "crane", - "type": "github" - } - }, - "crane_4": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1721842668, - "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", - "owner": "ipetkov", - "repo": "crane", - "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_5": { "locked": { "lastModified": 1727974419, "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", @@ -282,75 +109,6 @@ "type": "github" } }, - "devenv": { - "inputs": { - "cachix": "cachix_2", - "flake-compat": [ - "conduwuit", - "cachix", - "flake-compat" - ], - "nix": "nix_2", - "nixpkgs": [ - "conduwuit", - "cachix", - "nixpkgs" - ], - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "git-hooks" - ] - }, - "locked": { - "lastModified": 1723156315, - "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", - "owner": "cachix", - "repo": "devenv", - "rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "devenv_2": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "flake-compat" - ], - "nix": "nix", - "nixpkgs": "nixpkgs_2", - "poetry2nix": "poetry2nix", - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "pre-commit-hooks" - ] - }, - "locked": { - "lastModified": 1708704632, - "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", - "owner": "cachix", - "repo": "devenv", - "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "python-rewrite", - "repo": "devenv", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -358,11 +116,11 @@ ] }, "locked": { - "lastModified": 1728334376, - "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", + "lastModified": 1730190761, + "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", "owner": "nix-community", "repo": "disko", - "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", + "rev": "3979285062d6781525cded0f6c4ff92e71376b55", "type": "github" }, "original": { @@ -393,29 +151,6 @@ "type": "github" } }, - "fenix_2": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1725690497, - "narHash": "sha256-5fT+96rV7Hx29HG+4/oBbr3V+yExKuLN2vcBcPbVBlU=", - "owner": "nix-community", - "repo": "fenix", - "rev": "4b8d964df93d1f918ee6c4f003b3548c432cc866", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "main", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -449,71 +184,6 @@ } }, "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "ref": "master", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -530,28 +200,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "conduwuit", - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -571,7 +219,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -579,11 +227,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -597,11 +245,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -614,43 +262,6 @@ "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_4" - }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -665,77 +276,7 @@ "type": "github" } }, - "flake-utils_5": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "conduwuit", - "cachix", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1723202784, - "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "c7012d0c18567c889b948781bc74a501e92275d1", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "cachix", - "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" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -764,11 +305,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -780,15 +321,15 @@ }, "jovian": { "inputs": { - "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_4" + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1728410210, - "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", + "lastModified": 1730248099, + "narHash": "sha256-Fl7BSdpLk0uTXF6ol/MR0q1EB4XQ8tn0ftig0pyYh5Y=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", + "rev": "c11bab124fc55a37cbd854ed28ea121ed609231f", "type": "github" }, "original": { @@ -799,19 +340,19 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_4", - "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_5", + "crane": "crane_2", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728199407, - "narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=", + "lastModified": 1730107060, + "narHash": "sha256-EnVVq1oNcimZmQYl6UlLYs0jhC6aLah0bsFMy2syEak=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0bc127c631999c9555cae2b0cdad2128ff058259", + "rev": "0ad4ce46649b390da8bebcc229917f9863c98fe2", "type": "github" }, "original": { @@ -820,94 +361,7 @@ "type": "github" } }, - "liburing": { - "flake": false, - "locked": { - "lastModified": 1725659644, - "narHash": "sha256-WjnpmopfvFoUbubIu9bki+Y6P4YXDfvnW4+72hniq3g=", - "owner": "axboe", - "repo": "liburing", - "rev": "0fe5c09195c0918f89582dd6ff098a58a0bdf62a", - "type": "github" - }, - "original": { - "owner": "axboe", - "ref": "master", - "repo": "liburing", - "type": "github" - } - }, - "nix": { - "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", - "owner": "domenkozar", - "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.21", - "repo": "nix", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "nix-filter", - "type": "github" - } - }, "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "poetry2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688870561, - "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, - "nix-github-actions_2": { "inputs": { "nixpkgs": [ "jovian", @@ -915,11 +369,11 @@ ] }, "locked": { - "lastModified": 1690328911, - "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", "owner": "zhaofengli", "repo": "nix-github-actions", - "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", "type": "github" }, "original": { @@ -936,11 +390,11 @@ ] }, "locked": { - "lastModified": 1728263287, - "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", + "lastModified": 1729999765, + "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", + "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", "type": "github" }, "original": { @@ -949,44 +403,13 @@ "type": "github" } }, - "nix_2": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "flake-compat" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression_2" - }, - "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", - "owner": "domenkozar", - "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.21", - "repo": "nix", - "type": "github" - } - }, "nixlib": { "locked": { - "lastModified": 1728176478, - "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", + "lastModified": 1729386149, + "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", + "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", "type": "github" }, "original": { @@ -1003,11 +426,11 @@ ] }, "locked": { - "lastModified": 1728522165, - "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=", + "lastModified": 1729472750, + "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3", + "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565", "type": "github" }, "original": { @@ -1018,11 +441,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1730161780, + "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8", "type": "github" }, "original": { @@ -1034,16 +457,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724999960, - "narHash": "sha256-LB3jqSGW5u1ZcUcX6vO/qBOq5oXHlmOCxsTXGMEitp4=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b96f849e725333eb2b1c7f1cb84ff102062468ba", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1065,11 +488,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1728565888, - "narHash": "sha256-PslcBWpcB0IDe9yxYosT2G/rrsXmAgxrTlEoVFolAPM=", + "lastModified": 1730280180, + "narHash": "sha256-/nJhORYGNnwU4zcBpV6szxceBbqsVerHacFuboij2Iw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "262f0e36d5e5fd4afc695a9ec368fe0704e5252a", + "rev": "a053f605262f05827024bc7603ee5040788fb3ba", "type": "github" }, "original": { @@ -1078,45 +501,13 @@ "type": "indirect" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-regression_2": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { @@ -1128,43 +519,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_4": { - "locked": { - "lastModified": 1728156290, - "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "17ae88b569bb15590549ff478bab6494dde4a907", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { @@ -1176,11 +535,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -1192,59 +551,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1692808169, - "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", + "lastModified": 1730025694, + "narHash": "sha256-Isj+5RY86+N+JrotqpaXqi6hUAABcF6pIOlIWy2leC8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1722264024, - "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fc5e08c73022f96cfeaefa2e087e8b713d47d201", + "rev": "23664a7358c599dd4f975f16cea0865bf423e83d", "type": "github" }, "original": { @@ -1254,13 +565,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_3": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -1270,7 +581,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_4": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -1285,13 +596,13 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_5": { "locked": { - "lastModified": 1728093190, - "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", + "lastModified": 1729951556, + "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", + "rev": "4e0eec54db79d4d0909f45a88037210ff8eaffee", "type": "github" }, "original": { @@ -1301,7 +612,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_6": { "locked": { "lastModified": 1728061008, "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", @@ -1327,11 +638,11 @@ ] }, "locked": { - "lastModified": 1727917089, - "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", + "lastModified": 1729710171, + "narHash": "sha256-2sVt2hbL+G0FzEESm/EZBewPOmNtZ6MTnYhsvHJW6Rs=", "owner": "pjones", "repo": "plasma-manager", - "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", + "rev": "247a8e677b51f053ca89dcf67059e24f85e47391", "type": "github" }, "original": { @@ -1340,52 +651,25 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": "flake-utils_2", - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1692876271, - "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -1394,38 +678,20 @@ "type": "github" } }, - "rocksdb": { - "flake": false, - "locked": { - "lastModified": 1725811807, - "narHash": "sha256-k6aubvLSJwW7CtIxBRSlM6Z8UiJDCdFUgDWPYLV47Qk=", - "owner": "girlbossceo", - "repo": "rocksdb", - "rev": "347d50e212b24d98b5ad9841404ff80c1bb873f0", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "ref": "v9.6.1", - "repo": "rocksdb", - "type": "github" - } - }, "root": { "inputs": { "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", - "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_4", + "flake-parts": "flake-parts", + "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_3", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1451,23 +717,6 @@ "type": "github" } }, - "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1725630423, - "narHash": "sha256-gNCLk3Zg7JlAwmWbVHTH6f3+iqdeQ4fheOotCZy8x5M=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "08c7bbc2dbe4dcc8968484f1a0e1e6fe7a1d4f6d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -1476,11 +725,11 @@ ] }, "locked": { - "lastModified": 1722219664, - "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "lastModified": 1729996302, + "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", + "rev": "a1b337569f334ff0a01b57627f17b201d746d24c", "type": "github" }, "original": { @@ -1513,8 +762,8 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_7", + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -1534,15 +783,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_8", - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs": "nixpkgs_5", + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729999681, + "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", "type": "github" }, "original": { @@ -1581,51 +830,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "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": [ @@ -1649,17 +853,17 @@ }, "zjstatus": { "inputs": { - "crane": "crane_5", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_9", + "crane": "crane_3", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1728141581, - "narHash": "sha256-+wg0Avbw/MC2x3CQK4LyJHCPf+oPllJZzU2p+S/B7MU=", + "lastModified": 1729787428, + "narHash": "sha256-kGSM7b4+X5LObd6AdgQZABU241ZzHGm24xaiy33kwBI=", "owner": "dj95", "repo": "zjstatus", - "rev": "6d13e481aceacd3efe583fb6c442f30e8909f555", + "rev": "c74e310c35fb7ec6b59a1c73720db4d6d8e236a1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 95a8488..3864b50 100644 --- a/flake.nix +++ b/flake.nix @@ -34,10 +34,10 @@ catppuccin.url = "github:catppuccin/nix"; # Conduit fork without all the fuss and drama - conduwuit = { - url = "github:girlbossceo/conduwuit"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # conduwuit = { + # url = "github:girlbossceo/conduwuit"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; # Nix index database files nix-index-database.url = "github:nix-community/nix-index-database"; @@ -97,7 +97,7 @@ jovian, nixos-hardware, nix-index-database, - conduwuit, + # conduwuit, ... } @ inputs: let inherit (self) outputs; diff --git a/pkgs/simple-completion-language-server/result b/pkgs/simple-completion-language-server/result deleted file mode 120000 index 5a7c687..0000000 --- a/pkgs/simple-completion-language-server/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/3l0wgxsvf5sz2q9sgyj0blc1ivzg808b-simple-completion-language-server-ff9f90bc96c347f284571bc6310bc31f95508d55 \ No newline at end of file From 1650e5a8a1e4b0bc10b37fcf62b40c564164b3e2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Nov 2024 13:01:25 +0100 Subject: [PATCH 003/384] update flake lock and change foot's desktop shortcut since the name changed --- flake.lock | 589 ++++++++++++------ .../package-configs/plasma-desktop.nix | 2 +- 2 files changed, 412 insertions(+), 179 deletions(-) diff --git a/flake.lock b/flake.lock index 63d14af..99c7539 100644 --- a/flake.lock +++ b/flake.lock @@ -5,16 +5,15 @@ "crane": "crane_2", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1725300620, - "narHash": "sha256-IdM+pZ6BnmD3o1fTJZ2BD43k7dwi1BbVfLDLpM1nE5s=", + "lastModified": 1729116596, + "narHash": "sha256-NnLMLIXGZtAscUF4dCShksuQ1nOGF6Y2dEeyj0rBbUg=", "owner": "zhaofengli", "repo": "attic", - "rev": "bea72d75b6165dfb529ba0c39cc6c7e9c7f0d234", + "rev": "2b05b7d986cf6009b1c1ef7daa4961cd1a658782", "type": "github" }, "original": { @@ -38,11 +37,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728525495, - "narHash": "sha256-dsI85smVkHkv0sXlskE7EzBT7aR2jZYs3sCKhLu48NE=", + "lastModified": 1730060100, + "narHash": "sha256-wTO5qAjMopgEv5GSuFfY432SOCiIHE12n6OPgADLF8U=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "571ca8b8ce27d35cb7be3442dc55d64814dad11f", + "rev": "511a714ed34e89a9957b657c38c39ff182fe9da7", "type": "github" }, "original": { @@ -72,14 +71,14 @@ "devenv": "devenv", "flake-compat": "flake-compat_4", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1724232775, - "narHash": "sha256-6u2DycIEgrgNYlLxyGqdFVmBNiKIitnQKJ1pbRP5oko=", + "lastModified": 1728672398, + "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", "owner": "cachix", "repo": "cachix", - "rev": "03b6cb3f953097bff378fb8b9ea094bd091a4ec7", + "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", "type": "github" }, "original": { @@ -98,16 +97,58 @@ "devenv", "flake-compat" ], + "git-hooks": [ + "conduwuit", + "cachix", + "devenv", + "pre-commit-hooks" + ], "nixpkgs": [ "conduwuit", "cachix", "devenv", "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726520618, + "narHash": "sha256-jOsaBmJ/EtX5t/vbylCdS7pWYcKGmWOKg4QKUzKr6dA=", + "owner": "cachix", + "repo": "cachix", + "rev": "695525f9086542dfb09fde0871dbf4174abbf634", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, + "cachix_3": { + "inputs": { + "devenv": "devenv_3", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" ], "pre-commit-hooks": [ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "pre-commit-hooks" ] }, @@ -127,11 +168,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1728407414, - "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", + "lastModified": 1730458408, + "narHash": "sha256-JQ+SphQn13bdibKUrBBBznYehXX4xJrxD1ifBp6vSWw=", "owner": "catppuccin", "repo": "nix", - "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", + "rev": "191fbf2d81a63fad8f62f1233c0051f09b75d0ad", "type": "github" }, "original": { @@ -174,11 +215,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1728182038, - "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", + "lastModified": 1729828262, + "narHash": "sha256-tFA1obQW6AVHEdPG0YbOtccRcmo3Qg8ncFs9unVgGmY=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", + "rev": "16014e15946132160a40fa057387aadbea1550e4", "type": "github" }, "original": { @@ -232,11 +273,11 @@ }, "crane_3": { "locked": { - "lastModified": 1725409566, - "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", + "lastModified": 1729741221, + "narHash": "sha256-8AHZZXs1lFkERfBY0C8cZGElSo33D/et7NKEpLRmvzo=", "owner": "ipetkov", "repo": "crane", - "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", + "rev": "f235b656ee5b2bfd6d94c3bfd67896a575d4a6ed", "type": "github" }, "original": { @@ -247,18 +288,12 @@ } }, "crane_4": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1721842668, - "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", + "lastModified": 1730060262, + "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", "owner": "ipetkov", "repo": "crane", - "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", + "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", "type": "github" }, "original": { @@ -290,7 +325,7 @@ "cachix", "flake-compat" ], - "nix": "nix_2", + "nix": "nix_3", "nixpkgs": [ "conduwuit", "cachix", @@ -302,6 +337,46 @@ "git-hooks" ] }, + "locked": { + "lastModified": 1727963652, + "narHash": "sha256-os0EDjn7QVXL6RtHNb9TrZLXVm2Tc5/nZKk3KpbTzd8=", + "owner": "cachix", + "repo": "devenv", + "rev": "cb0052e25dbcc8267b3026160dc73cddaac7d5fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_2": { + "inputs": { + "cachix": "cachix_3", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "flake-compat" + ], + "nix": "nix_2", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "git-hooks" + ] + }, "locked": { "lastModified": 1723156315, "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", @@ -316,13 +391,15 @@ "type": "github" } }, - "devenv_2": { + "devenv_3": { "inputs": { "flake-compat": [ "conduwuit", "cachix", "devenv", "cachix", + "devenv", + "cachix", "flake-compat" ], "nix": "nix", @@ -333,6 +410,8 @@ "cachix", "devenv", "cachix", + "devenv", + "cachix", "pre-commit-hooks" ] }, @@ -358,11 +437,11 @@ ] }, "locked": { - "lastModified": 1728334376, - "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", + "lastModified": 1730190761, + "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", "owner": "nix-community", "repo": "disko", - "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", + "rev": "3979285062d6781525cded0f6c4ff92e71376b55", "type": "github" }, "original": { @@ -402,11 +481,11 @@ "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { - "lastModified": 1725690497, - "narHash": "sha256-5fT+96rV7Hx29HG+4/oBbr3V+yExKuLN2vcBcPbVBlU=", + "lastModified": 1729751566, + "narHash": "sha256-99u/hrgBdi8bxSXZc9ZbNkR5EL1htrkbd3lsbKzS60g=", "owner": "nix-community", "repo": "fenix", - "rev": "4b8d964df93d1f918ee6c4f003b3548c432cc866", + "rev": "f32a2d484091a6dc98220b1f4a2c2d60b7c97c64", "type": "github" }, "original": { @@ -552,6 +631,30 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -571,7 +674,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -579,11 +682,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -596,24 +699,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1689068808, "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", @@ -628,9 +713,24 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -649,7 +749,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1726560853, @@ -667,7 +767,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1726560853, @@ -699,11 +799,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1723202784, - "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "lastModified": 1727854478, + "narHash": "sha256-/odH2nUMAwkMgOS2nG2z0exLQNJS4S2LfMW0teqU7co=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "rev": "5f58871c9657b5fc0a7f65670fe2ba99c26c1d79", "type": "github" }, "original": { @@ -764,11 +864,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1730450782, + "narHash": "sha256-0AfApF8aexgB6o34qqLW2cCX4LaWJajBVdU6ddiWZBM=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "8ca921e5a806b5b6171add542defe7bdac79d189", "type": "github" }, "original": { @@ -781,14 +881,14 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1728410210, - "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", + "lastModified": 1730441026, + "narHash": "sha256-xmZQFGeIm2TzXv4jGaQ3nfBoUbt4gKbIv/SHVWw93ag=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", + "rev": "bd1da5657b8903b293a0ff51eb896a91a544ebed", "type": "github" }, "original": { @@ -801,17 +901,17 @@ "inputs": { "crane": "crane_4", "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_5", + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728199407, - "narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=", + "lastModified": 1730107060, + "narHash": "sha256-EnVVq1oNcimZmQYl6UlLYs0jhC6aLah0bsFMy2syEak=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0bc127c631999c9555cae2b0cdad2128ff058259", + "rev": "0ad4ce46649b390da8bebcc229917f9863c98fe2", "type": "github" }, "original": { @@ -820,6 +920,22 @@ "type": "github" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, "liburing": { "flake": false, "locked": { @@ -846,6 +962,8 @@ "devenv", "cachix", "devenv", + "cachix", + "devenv", "nixpkgs" ], "nixpkgs-regression": "nixpkgs-regression" @@ -889,6 +1007,8 @@ "devenv", "cachix", "devenv", + "cachix", + "devenv", "poetry2nix", "nixpkgs" ] @@ -915,11 +1035,11 @@ ] }, "locked": { - "lastModified": 1690328911, - "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", "owner": "zhaofengli", "repo": "nix-github-actions", - "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", "type": "github" }, "original": { @@ -936,11 +1056,11 @@ ] }, "locked": { - "lastModified": 1728263287, - "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", + "lastModified": 1729999765, + "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", + "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", "type": "github" }, "original": { @@ -955,12 +1075,16 @@ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "flake-compat" ], "nixpkgs": [ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "nixpkgs" ], "nixpkgs-regression": "nixpkgs-regression_2" @@ -980,13 +1104,43 @@ "type": "github" } }, + "nix_3": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "flake-compat" + ], + "flake-parts": "flake-parts_2", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_3", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression_3", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1727438425, + "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", + "owner": "domenkozar", + "repo": "nix", + "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.24", + "repo": "nix", + "type": "github" + } + }, "nixlib": { "locked": { - "lastModified": 1728176478, - "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", + "lastModified": 1729386149, + "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", + "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", "type": "github" }, "original": { @@ -1003,11 +1157,11 @@ ] }, "locked": { - "lastModified": 1728522165, - "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=", + "lastModified": 1729472750, + "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3", + "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565", "type": "github" }, "original": { @@ -1018,11 +1172,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1730368399, + "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc", "type": "github" }, "original": { @@ -1034,11 +1188,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724999960, - "narHash": "sha256-LB3jqSGW5u1ZcUcX6vO/qBOq5oXHlmOCxsTXGMEitp4=", + "lastModified": 1726042813, + "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b96f849e725333eb2b1c7f1cb84ff102062468ba", + "rev": "159be5db480d1df880a0135ca0bfed84c2f88353", "type": "github" }, "original": { @@ -1048,6 +1202,22 @@ "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-24_05": { "locked": { "lastModified": 1717144377, @@ -1065,11 +1235,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1728565888, - "narHash": "sha256-PslcBWpcB0IDe9yxYosT2G/rrsXmAgxrTlEoVFolAPM=", + "lastModified": 1730462280, + "narHash": "sha256-Qnn3hlqkbwZcjxhlKYXk1e28ngb00blknRHgVp/ETAk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "262f0e36d5e5fd4afc695a9ec368fe0704e5252a", + "rev": "dea4abb8ba764920453cec83ef5d8e188f4c6a21", "type": "github" }, "original": { @@ -1110,6 +1280,22 @@ "type": "github" } }, + "nixpkgs-regression_3": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1724316499, @@ -1160,11 +1346,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1728156290, - "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17ae88b569bb15590549ff478bab6494dde4a907", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { @@ -1176,11 +1362,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { @@ -1190,6 +1376,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1692808169, @@ -1208,16 +1410,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1717432640, + "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } @@ -1240,11 +1442,27 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1722264024, - "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc5e08c73022f96cfeaefa2e087e8b713d47d201", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1730025694, + "narHash": "sha256-Isj+5RY86+N+JrotqpaXqi6hUAABcF6pIOlIWy2leC8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "23664a7358c599dd4f975f16cea0865bf423e83d", "type": "github" }, "original": { @@ -1254,13 +1472,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { @@ -1270,7 +1488,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -1285,29 +1503,13 @@ "type": "indirect" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1728093190, - "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_9": { "locked": { - "lastModified": 1728061008, - "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "lastModified": 1729951556, + "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "rev": "4e0eec54db79d4d0909f45a88037210ff8eaffee", "type": "github" }, "original": { @@ -1327,11 +1529,11 @@ ] }, "locked": { - "lastModified": 1727917089, - "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", + "lastModified": 1730366788, + "narHash": "sha256-0Ezvv4KkyFdLAblPBFDgZbiMLlJZtpHruT2i4KC2wIY=", "owner": "pjones", "repo": "plasma-manager", - "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", + "rev": "f634d5f6ee9be365b2ca08b2d00e0e3b0c240b9e", "type": "github" }, "original": { @@ -1342,7 +1544,7 @@ }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "conduwuit", @@ -1350,6 +1552,8 @@ "devenv", "cachix", "devenv", + "cachix", + "devenv", "nixpkgs" ] }, @@ -1367,6 +1571,50 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "nix" + ], + "flake-utils": "flake-utils_2", + "gitignore": [ + "conduwuit", + "cachix", + "devenv", + "nix" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -1381,11 +1629,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -1397,16 +1645,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1725811807, - "narHash": "sha256-k6aubvLSJwW7CtIxBRSlM6Z8UiJDCdFUgDWPYLV47Qk=", + "lastModified": 1729712930, + "narHash": "sha256-jlp4kPkRTpoJaUdobEoHd8rCGAQNBy4ZHZ6y5zL/ibw=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "347d50e212b24d98b5ad9841404ff80c1bb873f0", + "rev": "871eda6953c3f399aae39808dcfccdd014885beb", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.6.1", + "ref": "v9.7.3", "repo": "rocksdb", "type": "github" } @@ -1417,7 +1665,7 @@ "catppuccin": "catppuccin", "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "flake-utils": "flake-utils_4", "home-manager": "home-manager", "jovian": "jovian", @@ -1425,7 +1673,7 @@ "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1454,11 +1702,11 @@ "rust-analyzer-src_2": { "flake": false, "locked": { - "lastModified": 1725630423, - "narHash": "sha256-gNCLk3Zg7JlAwmWbVHTH6f3+iqdeQ4fheOotCZy8x5M=", + "lastModified": 1729715509, + "narHash": "sha256-jUDN4e1kObbksb4sc+57NEeujBEDRdLCOu9wiE3RZdM=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "08c7bbc2dbe4dcc8968484f1a0e1e6fe7a1d4f6d", + "rev": "40492e15d49b89cf409e2c5536444131fac49429", "type": "github" }, "original": { @@ -1476,11 +1724,11 @@ ] }, "locked": { - "lastModified": 1722219664, - "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "lastModified": 1729996302, + "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", + "rev": "a1b337569f334ff0a01b57627f17b201d746d24c", "type": "github" }, "original": { @@ -1514,7 +1762,7 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -1534,15 +1782,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729999681, + "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", "type": "github" }, "original": { @@ -1611,21 +1859,6 @@ "type": "github" } }, - "systems_5": { - "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": [ @@ -1651,15 +1884,15 @@ "inputs": { "crane": "crane_5", "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1728141581, - "narHash": "sha256-+wg0Avbw/MC2x3CQK4LyJHCPf+oPllJZzU2p+S/B7MU=", + "lastModified": 1729787428, + "narHash": "sha256-kGSM7b4+X5LObd6AdgQZABU241ZzHGm24xaiy33kwBI=", "owner": "dj95", "repo": "zjstatus", - "rev": "6d13e481aceacd3efe583fb6c442f30e8909f555", + "rev": "c74e310c35fb7ec6b59a1c73720db4d6d8e236a1", "type": "github" }, "original": { diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index b1f5c6a..d823fdb 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -88,7 +88,7 @@ "applications:steam.desktop" "applications:noisetorch.desktop" "applications:org.kde.plasma-systemmonitor.desktop" - "applications:org.codeberg.dnkl.foot.desktop" + "applications:foot.desktop" "applications:nitrokey-app.desktop" "applications:codium.desktop" "applications:freetube.desktop" From 39136e1877633a9dd2081402b24f3eb7101d624b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Nov 2024 13:03:44 +0100 Subject: [PATCH 004/384] update flake lock --- flake.lock | 1133 +++------------------------------------------------- 1 file changed, 52 insertions(+), 1081 deletions(-) diff --git a/flake.lock b/flake.lock index 99c7539..2ef2641 100644 --- a/flake.lock +++ b/flake.lock @@ -1,28 +1,5 @@ { "nodes": { - "attic": { - "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1729116596, - "narHash": "sha256-NnLMLIXGZtAscUF4dCShksuQ1nOGF6Y2dEeyj0rBbUg=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "2b05b7d986cf6009b1c1ef7daa4961cd1a658782", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "main", - "repo": "attic", - "type": "github" - } - }, "bcachefs-tools": { "inputs": { "crane": "crane", @@ -66,106 +43,6 @@ "type": "gitlab" } }, - "cachix": { - "inputs": { - "devenv": "devenv", - "flake-compat": "flake-compat_4", - "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1728672398, - "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", - "owner": "cachix", - "repo": "cachix", - "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "master", - "repo": "cachix", - "type": "github" - } - }, - "cachix_2": { - "inputs": { - "devenv": "devenv_2", - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "flake-compat" - ], - "git-hooks": [ - "conduwuit", - "cachix", - "devenv", - "pre-commit-hooks" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726520618, - "narHash": "sha256-jOsaBmJ/EtX5t/vbylCdS7pWYcKGmWOKg4QKUzKr6dA=", - "owner": "cachix", - "repo": "cachix", - "rev": "695525f9086542dfb09fde0871dbf4174abbf634", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "cachix", - "type": "github" - } - }, - "cachix_3": { - "inputs": { - "devenv": "devenv_3", - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "flake-compat" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "pre-commit-hooks" - ] - }, - "locked": { - "lastModified": 1712055811, - "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", - "owner": "cachix", - "repo": "cachix", - "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "cachix", - "type": "github" - } - }, "catppuccin": { "locked": { "lastModified": 1730458408, @@ -181,53 +58,6 @@ "type": "github" } }, - "complement": { - "flake": false, - "locked": { - "lastModified": 1724347376, - "narHash": "sha256-y0e/ULDJ92IhNQZsS/06g0s+AYZ82aJfrIO9qEse94c=", - "owner": "matrix-org", - "repo": "complement", - "rev": "39733c1b2f8314800776748cc7164f9a34650686", - "type": "github" - }, - "original": { - "owner": "matrix-org", - "ref": "main", - "repo": "complement", - "type": "github" - } - }, - "conduwuit": { - "inputs": { - "attic": "attic", - "cachix": "cachix", - "complement": "complement", - "crane": "crane_3", - "fenix": "fenix_2", - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_3", - "liburing": "liburing", - "nix-filter": "nix-filter", - "nixpkgs": [ - "nixpkgs" - ], - "rocksdb": "rocksdb" - }, - "locked": { - "lastModified": 1729828262, - "narHash": "sha256-tFA1obQW6AVHEdPG0YbOtccRcmo3Qg8ncFs9unVgGmY=", - "owner": "girlbossceo", - "repo": "conduwuit", - "rev": "16014e15946132160a40fa057387aadbea1550e4", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "repo": "conduwuit", - "type": "github" - } - }, "crane": { "inputs": { "nixpkgs": [ @@ -250,44 +80,6 @@ } }, "crane_2": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722960479, - "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", - "owner": "ipetkov", - "repo": "crane", - "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_3": { - "locked": { - "lastModified": 1729741221, - "narHash": "sha256-8AHZZXs1lFkERfBY0C8cZGElSo33D/et7NKEpLRmvzo=", - "owner": "ipetkov", - "repo": "crane", - "rev": "f235b656ee5b2bfd6d94c3bfd67896a575d4a6ed", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "master", - "repo": "crane", - "type": "github" - } - }, - "crane_4": { "locked": { "lastModified": 1730060262, "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", @@ -302,7 +94,7 @@ "type": "github" } }, - "crane_5": { + "crane_3": { "locked": { "lastModified": 1727974419, "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", @@ -317,119 +109,6 @@ "type": "github" } }, - "devenv": { - "inputs": { - "cachix": "cachix_2", - "flake-compat": [ - "conduwuit", - "cachix", - "flake-compat" - ], - "nix": "nix_3", - "nixpkgs": [ - "conduwuit", - "cachix", - "nixpkgs" - ], - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "git-hooks" - ] - }, - "locked": { - "lastModified": 1727963652, - "narHash": "sha256-os0EDjn7QVXL6RtHNb9TrZLXVm2Tc5/nZKk3KpbTzd8=", - "owner": "cachix", - "repo": "devenv", - "rev": "cb0052e25dbcc8267b3026160dc73cddaac7d5fd", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "devenv_2": { - "inputs": { - "cachix": "cachix_3", - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "flake-compat" - ], - "nix": "nix_2", - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "nixpkgs" - ], - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "git-hooks" - ] - }, - "locked": { - "lastModified": 1723156315, - "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", - "owner": "cachix", - "repo": "devenv", - "rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "devenv_3": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "flake-compat" - ], - "nix": "nix", - "nixpkgs": "nixpkgs_2", - "poetry2nix": "poetry2nix", - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "pre-commit-hooks" - ] - }, - "locked": { - "lastModified": 1708704632, - "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", - "owner": "cachix", - "repo": "devenv", - "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "python-rewrite", - "repo": "devenv", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -472,29 +151,6 @@ "type": "github" } }, - "fenix_2": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1729751566, - "narHash": "sha256-99u/hrgBdi8bxSXZc9ZbNkR5EL1htrkbd3lsbKzS60g=", - "owner": "nix-community", - "repo": "fenix", - "rev": "f32a2d484091a6dc98220b1f4a2c2d60b7c97c64", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "main", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -528,71 +184,6 @@ } }, "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "ref": "master", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -609,52 +200,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "conduwuit", - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "conduwuit", - "cachix", - "devenv", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -674,7 +219,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -700,11 +245,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -714,43 +259,9 @@ } }, "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_3" - }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -765,77 +276,7 @@ "type": "github" } }, - "flake-utils_5": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "conduwuit", - "cachix", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1727854478, - "narHash": "sha256-/odH2nUMAwkMgOS2nG2z0exLQNJS4S2LfMW0teqU7co=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "5f58871c9657b5fc0a7f65670fe2ba99c26c1d79", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "cachix", - "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" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -880,8 +321,8 @@ }, "jovian": { "inputs": { - "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_5" + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1730441026, @@ -899,10 +340,10 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_4", - "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_6", + "crane": "crane_2", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -920,114 +361,7 @@ "type": "github" } }, - "libgit2": { - "flake": false, - "locked": { - "lastModified": 1697646580, - "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", - "type": "github" - }, - "original": { - "owner": "libgit2", - "repo": "libgit2", - "type": "github" - } - }, - "liburing": { - "flake": false, - "locked": { - "lastModified": 1725659644, - "narHash": "sha256-WjnpmopfvFoUbubIu9bki+Y6P4YXDfvnW4+72hniq3g=", - "owner": "axboe", - "repo": "liburing", - "rev": "0fe5c09195c0918f89582dd6ff098a58a0bdf62a", - "type": "github" - }, - "original": { - "owner": "axboe", - "ref": "master", - "repo": "liburing", - "type": "github" - } - }, - "nix": { - "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", - "owner": "domenkozar", - "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.21", - "repo": "nix", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "nix-filter", - "type": "github" - } - }, "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "poetry2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688870561, - "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, - "nix-github-actions_2": { "inputs": { "nixpkgs": [ "jovian", @@ -1069,71 +403,6 @@ "type": "github" } }, - "nix_2": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "flake-compat" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression_2" - }, - "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", - "owner": "domenkozar", - "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.21", - "repo": "nix", - "type": "github" - } - }, - "nix_3": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "flake-compat" - ], - "flake-parts": "flake-parts_2", - "libgit2": "libgit2", - "nixpkgs": "nixpkgs_3", - "nixpkgs-23-11": "nixpkgs-23-11", - "nixpkgs-regression": "nixpkgs-regression_3", - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1727438425, - "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", - "owner": "domenkozar", - "repo": "nix", - "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.24", - "repo": "nix", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1729386149, @@ -1188,36 +457,20 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726042813, - "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "159be5db480d1df880a0135ca0bfed84c2f88353", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-23-11": { - "locked": { - "lastModified": 1717159533, - "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - } - }, "nixpkgs-24_05": { "locked": { "lastModified": 1717144377, @@ -1235,11 +488,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1730462280, - "narHash": "sha256-Qnn3hlqkbwZcjxhlKYXk1e28ngb00blknRHgVp/ETAk=", + "lastModified": 1730462463, + "narHash": "sha256-zEvTgoadqkInPhlBXR1hQrK3PJO+pxnH+H4OtNP8uWQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dea4abb8ba764920453cec83ef5d8e188f4c6a21", + "rev": "c034a96848b941fd334d33d5b1c58c8b611adc3a", "type": "github" }, "original": { @@ -1248,61 +501,13 @@ "type": "indirect" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-regression_2": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-regression_3": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { @@ -1313,38 +518,6 @@ } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_4": { "locked": { "lastModified": 1729973466, "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", @@ -1376,87 +549,7 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1728061008, - "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1692808169, - "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1717432640, - "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1730025694, "narHash": "sha256-Isj+5RY86+N+JrotqpaXqi6hUAABcF6pIOlIWy2leC8=", @@ -1472,7 +565,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_3": { "locked": { "lastModified": 1730200266, "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", @@ -1488,7 +581,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_4": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -1503,7 +596,7 @@ "type": "indirect" } }, - "nixpkgs_9": { + "nixpkgs_5": { "locked": { "lastModified": 1729951556, "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", @@ -1519,6 +612,22 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -1542,91 +651,18 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": "flake-utils", - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1692876271, - "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "nix" - ], - "flake-utils": "flake-utils_2", - "gitignore": [ - "conduwuit", - "cachix", - "devenv", - "nix" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "nix", - "nixpkgs" - ], - "nixpkgs-stable": [ - "conduwuit", - "cachix", - "devenv", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712897695, - "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1729104314, @@ -1642,38 +678,20 @@ "type": "github" } }, - "rocksdb": { - "flake": false, - "locked": { - "lastModified": 1729712930, - "narHash": "sha256-jlp4kPkRTpoJaUdobEoHd8rCGAQNBy4ZHZ6y5zL/ibw=", - "owner": "girlbossceo", - "repo": "rocksdb", - "rev": "871eda6953c3f399aae39808dcfccdd014885beb", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "ref": "v9.7.3", - "repo": "rocksdb", - "type": "github" - } - }, "root": { "inputs": { "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", - "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts_3", - "flake-utils": "flake-utils_4", + "flake-parts": "flake-parts", + "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_3", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1699,23 +717,6 @@ "type": "github" } }, - "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1729715509, - "narHash": "sha256-jUDN4e1kObbksb4sc+57NEeujBEDRdLCOu9wiE3RZdM=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "40492e15d49b89cf409e2c5536444131fac49429", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -1761,8 +762,8 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_8", + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -1782,8 +783,8 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_9", - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs": "nixpkgs_5", + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1729999681, @@ -1829,36 +830,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { - "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": [ @@ -1882,9 +853,9 @@ }, "zjstatus": { "inputs": { - "crane": "crane_5", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_10", + "crane": "crane_3", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay_2" }, "locked": { From 0c0c841b270f5e24bca56a5560b59a111ff890c7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Nov 2024 13:46:18 +0100 Subject: [PATCH 005/384] add ryujinx and re-add conduwuit --- flake.nix | 10 +++++----- home-manager/hosts/GLaDOS/lillian.nix | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 3864b50..95a8488 100644 --- a/flake.nix +++ b/flake.nix @@ -34,10 +34,10 @@ catppuccin.url = "github:catppuccin/nix"; # Conduit fork without all the fuss and drama - # conduwuit = { - # url = "github:girlbossceo/conduwuit"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + conduwuit = { + url = "github:girlbossceo/conduwuit"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Nix index database files nix-index-database.url = "github:nix-community/nix-index-database"; @@ -97,7 +97,7 @@ jovian, nixos-hardware, nix-index-database, - # conduwuit, + conduwuit, ... } @ inputs: let inherit (self) outputs; diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index 0841ff3..572d11a 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -18,6 +18,7 @@ home.packages = with pkgs; [ heroic r2modman + ryujinx ]; programs.mangohud = { From e8f1325d13917b76805cedcb24c5f02f1beac5da Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Nov 2024 13:49:03 +0100 Subject: [PATCH 006/384] update flake lock --- flake.lock | 1193 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 1111 insertions(+), 82 deletions(-) diff --git a/flake.lock b/flake.lock index 2ef2641..1c52611 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,28 @@ { "nodes": { + "attic": { + "inputs": { + "crane": "crane_2", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1729116596, + "narHash": "sha256-NnLMLIXGZtAscUF4dCShksuQ1nOGF6Y2dEeyj0rBbUg=", + "owner": "zhaofengli", + "repo": "attic", + "rev": "2b05b7d986cf6009b1c1ef7daa4961cd1a658782", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "main", + "repo": "attic", + "type": "github" + } + }, "bcachefs-tools": { "inputs": { "crane": "crane", @@ -43,6 +66,106 @@ "type": "gitlab" } }, + "cachix": { + "inputs": { + "devenv": "devenv", + "flake-compat": "flake-compat_4", + "git-hooks": "git-hooks", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1728672398, + "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", + "owner": "cachix", + "repo": "cachix", + "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "master", + "repo": "cachix", + "type": "github" + } + }, + "cachix_2": { + "inputs": { + "devenv": "devenv_2", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "flake-compat" + ], + "git-hooks": [ + "conduwuit", + "cachix", + "devenv", + "pre-commit-hooks" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726520618, + "narHash": "sha256-jOsaBmJ/EtX5t/vbylCdS7pWYcKGmWOKg4QKUzKr6dA=", + "owner": "cachix", + "repo": "cachix", + "rev": "695525f9086542dfb09fde0871dbf4174abbf634", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, + "cachix_3": { + "inputs": { + "devenv": "devenv_3", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1712055811, + "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", + "owner": "cachix", + "repo": "cachix", + "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, "catppuccin": { "locked": { "lastModified": 1730458408, @@ -58,6 +181,53 @@ "type": "github" } }, + "complement": { + "flake": false, + "locked": { + "lastModified": 1724347376, + "narHash": "sha256-y0e/ULDJ92IhNQZsS/06g0s+AYZ82aJfrIO9qEse94c=", + "owner": "matrix-org", + "repo": "complement", + "rev": "39733c1b2f8314800776748cc7164f9a34650686", + "type": "github" + }, + "original": { + "owner": "matrix-org", + "ref": "main", + "repo": "complement", + "type": "github" + } + }, + "conduwuit": { + "inputs": { + "attic": "attic", + "cachix": "cachix", + "complement": "complement", + "crane": "crane_3", + "fenix": "fenix_2", + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_3", + "liburing": "liburing", + "nix-filter": "nix-filter", + "nixpkgs": [ + "nixpkgs" + ], + "rocksdb": "rocksdb" + }, + "locked": { + "lastModified": 1729828262, + "narHash": "sha256-tFA1obQW6AVHEdPG0YbOtccRcmo3Qg8ncFs9unVgGmY=", + "owner": "girlbossceo", + "repo": "conduwuit", + "rev": "16014e15946132160a40fa057387aadbea1550e4", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "repo": "conduwuit", + "type": "github" + } + }, "crane": { "inputs": { "nixpkgs": [ @@ -80,6 +250,44 @@ } }, "crane_2": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722960479, + "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", + "owner": "ipetkov", + "repo": "crane", + "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_3": { + "locked": { + "lastModified": 1729741221, + "narHash": "sha256-8AHZZXs1lFkERfBY0C8cZGElSo33D/et7NKEpLRmvzo=", + "owner": "ipetkov", + "repo": "crane", + "rev": "f235b656ee5b2bfd6d94c3bfd67896a575d4a6ed", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "ref": "master", + "repo": "crane", + "type": "github" + } + }, + "crane_4": { "locked": { "lastModified": 1730060262, "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", @@ -94,7 +302,7 @@ "type": "github" } }, - "crane_3": { + "crane_5": { "locked": { "lastModified": 1727974419, "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", @@ -109,6 +317,119 @@ "type": "github" } }, + "devenv": { + "inputs": { + "cachix": "cachix_2", + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "nix": "nix_3", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "git-hooks" + ] + }, + "locked": { + "lastModified": 1727963652, + "narHash": "sha256-os0EDjn7QVXL6RtHNb9TrZLXVm2Tc5/nZKk3KpbTzd8=", + "owner": "cachix", + "repo": "devenv", + "rev": "cb0052e25dbcc8267b3026160dc73cddaac7d5fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_2": { + "inputs": { + "cachix": "cachix_3", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "flake-compat" + ], + "nix": "nix_2", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "git-hooks" + ] + }, + "locked": { + "lastModified": 1723156315, + "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", + "owner": "cachix", + "repo": "devenv", + "rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_3": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "cachix", + "flake-compat" + ], + "nix": "nix", + "nixpkgs": "nixpkgs_2", + "poetry2nix": "poetry2nix", + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "cachix", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1708704632, + "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", + "owner": "cachix", + "repo": "devenv", + "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "python-rewrite", + "repo": "devenv", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -151,6 +472,29 @@ "type": "github" } }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1729751566, + "narHash": "sha256-99u/hrgBdi8bxSXZc9ZbNkR5EL1htrkbd3lsbKzS60g=", + "owner": "nix-community", + "repo": "fenix", + "rev": "f32a2d484091a6dc98220b1f4a2c2d60b7c97c64", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -184,6 +528,71 @@ } }, "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "ref": "master", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -202,15 +611,17 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ + "conduwuit", + "attic", "nixpkgs" ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -220,6 +631,50 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -245,11 +700,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -259,9 +714,43 @@ } }, "flake-utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "inputs": { "systems": "systems_2" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "main", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -276,7 +765,77 @@ "type": "github" } }, + "flake-utils_5": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1727854478, + "narHash": "sha256-/odH2nUMAwkMgOS2nG2z0exLQNJS4S2LfMW0teqU7co=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "5f58871c9657b5fc0a7f65670fe2ba99c26c1d79", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "cachix", + "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" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -305,11 +864,11 @@ ] }, "locked": { - "lastModified": 1730450782, - "narHash": "sha256-0AfApF8aexgB6o34qqLW2cCX4LaWJajBVdU6ddiWZBM=", + "lastModified": 1730633670, + "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", "owner": "nix-community", "repo": "home-manager", - "rev": "8ca921e5a806b5b6171add542defe7bdac79d189", + "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", "type": "github" }, "original": { @@ -321,15 +880,15 @@ }, "jovian": { "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs" + "nix-github-actions": "nix-github-actions_2", + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1730441026, - "narHash": "sha256-xmZQFGeIm2TzXv4jGaQ3nfBoUbt4gKbIv/SHVWw93ag=", + "lastModified": 1730625581, + "narHash": "sha256-vFxtzNCxtUIrmv8tluquZHjNTwMkCGtT0NCoVuwlqd4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "bd1da5657b8903b293a0ff51eb896a91a544ebed", + "rev": "e6195c6bfc037617e20d6d7d4d6c9cdeee6aba6d", "type": "github" }, "original": { @@ -340,10 +899,10 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_2", + "crane": "crane_4", + "flake-compat": "flake-compat_6", + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -361,7 +920,114 @@ "type": "github" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, + "liburing": { + "flake": false, + "locked": { + "lastModified": 1725659644, + "narHash": "sha256-WjnpmopfvFoUbubIu9bki+Y6P4YXDfvnW4+72hniq3g=", + "owner": "axboe", + "repo": "liburing", + "rev": "0fe5c09195c0918f89582dd6ff098a58a0bdf62a", + "type": "github" + }, + "original": { + "owner": "axboe", + "ref": "master", + "repo": "liburing", + "type": "github" + } + }, + "nix": { + "inputs": { + "flake-compat": "flake-compat_3", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, + "nix-filter": { + "locked": { + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "main", + "repo": "nix-filter", + "type": "github" + } + }, "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "cachix", + "devenv", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688870561, + "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nix-github-actions_2": { "inputs": { "nixpkgs": [ "jovian", @@ -390,11 +1056,11 @@ ] }, "locked": { - "lastModified": 1729999765, - "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", + "lastModified": 1730604744, + "narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", + "rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318", "type": "github" }, "original": { @@ -403,6 +1069,71 @@ "type": "github" } }, + "nix_2": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, + "nix_3": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "flake-compat" + ], + "flake-parts": "flake-parts_2", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_3", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression_3", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1727438425, + "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", + "owner": "domenkozar", + "repo": "nix", + "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.24", + "repo": "nix", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1729386149, @@ -441,11 +1172,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730368399, - "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=", + "lastModified": 1730537918, + "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc", + "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560", "type": "github" }, "original": { @@ -457,20 +1188,36 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "lastModified": 1726042813, + "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "rev": "159be5db480d1df880a0135ca0bfed84c2f88353", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-24_05": { "locked": { "lastModified": 1717144377, @@ -488,11 +1235,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1730462463, - "narHash": "sha256-zEvTgoadqkInPhlBXR1hQrK3PJO+pxnH+H4OtNP8uWQ=", + "lastModified": 1730637267, + "narHash": "sha256-EBOSv3aJ88WitFtEb5XaIC0fNK/PJk1WoQvuAZGa1/U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c034a96848b941fd334d33d5b1c58c8b611adc3a", + "rev": "b4cca74d1b67f45b3dadf0f7e9a868645615251d", "type": "github" }, "original": { @@ -501,7 +1248,71 @@ "type": "indirect" } }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-regression_2": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-regression_3": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { + "locked": { + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1720386169, "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", @@ -517,13 +1328,29 @@ "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable_3": { "locked": { - "lastModified": 1729973466, - "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_4": { + "locked": { + "lastModified": 1730602179, + "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", "type": "github" }, "original": { @@ -535,11 +1362,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { @@ -549,7 +1376,87 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { + "locked": { + "lastModified": 1692808169, + "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1717432640, + "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1730025694, "narHash": "sha256-Isj+5RY86+N+JrotqpaXqi6hUAABcF6pIOlIWy2leC8=", @@ -565,13 +1472,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_7": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { @@ -581,7 +1488,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_8": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -596,29 +1503,13 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_9": { "locked": { - "lastModified": 1729951556, - "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", + "lastModified": 1730272153, + "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e0eec54db79d4d0909f45a88037210ff8eaffee", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1728061008, - "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "type": "github" }, "original": { @@ -638,11 +1529,11 @@ ] }, "locked": { - "lastModified": 1730366788, - "narHash": "sha256-0Ezvv4KkyFdLAblPBFDgZbiMLlJZtpHruT2i4KC2wIY=", + "lastModified": 1730635861, + "narHash": "sha256-Npp3pl9aeAiq+wZPDbw2ZxybNuZWyuN7AY6fik56DCo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "f634d5f6ee9be365b2ca08b2d00e0e3b0c240b9e", + "rev": "293668587937daae1df085ee36d2b2d0792b7a0f", "type": "github" }, "original": { @@ -651,18 +1542,91 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils", + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1692876271, + "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "nix" + ], + "flake-utils": "flake-utils_2", + "gitignore": [ + "conduwuit", + "cachix", + "devenv", + "nix" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore", + "gitignore": "gitignore_2", "nixpkgs": [ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1729104314, @@ -678,20 +1642,38 @@ "type": "github" } }, + "rocksdb": { + "flake": false, + "locked": { + "lastModified": 1729712930, + "narHash": "sha256-jlp4kPkRTpoJaUdobEoHd8rCGAQNBy4ZHZ6y5zL/ibw=", + "owner": "girlbossceo", + "repo": "rocksdb", + "rev": "871eda6953c3f399aae39808dcfccdd014885beb", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "ref": "v9.7.3", + "repo": "rocksdb", + "type": "github" + } + }, "root": { "inputs": { "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", + "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils", + "flake-parts": "flake-parts_3", + "flake-utils": "flake-utils_4", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_7", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -717,6 +1699,23 @@ "type": "github" } }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1729715509, + "narHash": "sha256-jUDN4e1kObbksb4sc+57NEeujBEDRdLCOu9wiE3RZdM=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "40492e15d49b89cf409e2c5536444131fac49429", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -762,8 +1761,8 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_4", + "flake-compat": "flake-compat_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -783,15 +1782,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs": "nixpkgs_9", + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1729999681, - "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", + "lastModified": 1730605784, + "narHash": "sha256-1NveNAMLHbxOg0BpBMSVuZ2yW2PpDnZLbZ25wV50PMc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", + "rev": "e9b5eef9b51cdf966c76143e13a9476725b2f760", "type": "github" }, "original": { @@ -830,6 +1829,36 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "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": [ @@ -853,9 +1882,9 @@ }, "zjstatus": { "inputs": { - "crane": "crane_3", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_6", + "crane": "crane_5", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_10", "rust-overlay": "rust-overlay_2" }, "locked": { From d61288b8c10a16c5f65a050ac261eabf32bf6729 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Nov 2024 14:04:32 +0100 Subject: [PATCH 007/384] fix yazi bug with 7zz --- home-manager/shared/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 07f7fde..1555a1e 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -27,8 +27,13 @@ broot lazygit navi - yazi nil ]; programs.navi.enable = true; + programs.yazi = { + enable = true; + package = pkgs.yazi.override { + _7zz = pkgs._7zz.override {useUasm = true;}; + }; + }; } From 382913f15ddab72ee155f0c20bac2a5c5a2f9dbd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Nov 2024 14:05:41 +0100 Subject: [PATCH 008/384] Update flake lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 1c52611..869b56a 100644 --- a/flake.lock +++ b/flake.lock @@ -437,11 +437,11 @@ ] }, "locked": { - "lastModified": 1730190761, - "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", + "lastModified": 1730675461, + "narHash": "sha256-Mhqz3p/HEiI/zxBJWO57LYQf6gGlJB0tci6fiVXLjd8=", "owner": "nix-community", "repo": "disko", - "rev": "3979285062d6781525cded0f6c4ff92e71376b55", + "rev": "380847d94ff0fedee8b50ee4baddb162c06678df", "type": "github" }, "original": { @@ -884,11 +884,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1730625581, - "narHash": "sha256-vFxtzNCxtUIrmv8tluquZHjNTwMkCGtT0NCoVuwlqd4=", + "lastModified": 1730652030, + "narHash": "sha256-uTToUpFphR9ywc+DQUD/8hmboOMFV1lBVFf/ztzdn6A=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e6195c6bfc037617e20d6d7d4d6c9cdeee6aba6d", + "rev": "e74e57a37de55ecfdc62f49fe5a7463b2a52499a", "type": "github" }, "original": { @@ -1235,11 +1235,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1730637267, - "narHash": "sha256-EBOSv3aJ88WitFtEb5XaIC0fNK/PJk1WoQvuAZGa1/U=", + "lastModified": 1730725329, + "narHash": "sha256-5TEPO7ifLaEC3eUXYQqhI85eREgV7fbgEXflN1jpGGc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b4cca74d1b67f45b3dadf0f7e9a868645615251d", + "rev": "2f45b7ffd7297dd721a747e8d8399abb84ccf1ab", "type": "github" }, "original": { From 99cd42ce60494db91cfc4f081f4b262b3e3ae80e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 9 Nov 2024 18:00:23 +0100 Subject: [PATCH 009/384] change the theming to stylix, set a background image, and set cursors automagically --- flake.lock | 395 +++++++++++++++--- flake.nix | 7 + home-manager/desktop/default.nix | 5 +- .../desktop/package-configs/foot/default.nix | 3 +- home-manager/shared/default.nix | 35 +- home-manager/shared/shell/bat.nix | 2 +- home-manager/shared/shell/zellij/default.nix | 2 +- nixos/shared/background.jpg | Bin 0 -> 161326 bytes nixos/shared/default.nix | 56 ++- nixos/shared/packages/default.nix | 40 +- 10 files changed, 447 insertions(+), 98 deletions(-) create mode 100644 nixos/shared/background.jpg diff --git a/flake.lock b/flake.lock index 869b56a..acc408a 100644 --- a/flake.lock +++ b/flake.lock @@ -23,6 +23,72 @@ "type": "github" } }, + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1708890466, + "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "665b3c6748534eb766c777298721cece9453fdae", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1725860795, + "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", + "type": "github" + } + }, "bcachefs-tools": { "inputs": { "crane": "crane", @@ -37,11 +103,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1730060100, - "narHash": "sha256-wTO5qAjMopgEv5GSuFfY432SOCiIHE12n6OPgADLF8U=", + "lastModified": 1730928062, + "narHash": "sha256-fXwp5vmq313QEu180EsPr0YT0OqVDlcebNYxxZ7mMLw=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "511a714ed34e89a9957b657c38c39ff182fe9da7", + "rev": "d4932bf0e32375451e7cfd4b776bb5c470e9afb8", "type": "github" }, "original": { @@ -168,11 +234,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1730458408, - "narHash": "sha256-JQ+SphQn13bdibKUrBBBznYehXX4xJrxD1ifBp6vSWw=", + "lastModified": 1731088327, + "narHash": "sha256-Oizjf0wXBTqALipX4fQdGjq9IBSCXz8wwcfCGRK73bI=", "owner": "catppuccin", "repo": "nix", - "rev": "191fbf2d81a63fad8f62f1233c0051f09b75d0ad", + "rev": "7bebd062df3239c005c0d600f5dfd8514f5915f8", "type": "github" }, "original": { @@ -289,11 +355,11 @@ }, "crane_4": { "locked": { - "lastModified": 1730060262, - "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", + "lastModified": 1730652660, + "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", "owner": "ipetkov", "repo": "crane", - "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", + "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", "type": "github" }, "original": { @@ -304,11 +370,11 @@ }, "crane_5": { "locked": { - "lastModified": 1727974419, - "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", + "lastModified": 1730652660, + "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", "owner": "ipetkov", "repo": "crane", - "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", + "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", "type": "github" }, "original": { @@ -437,11 +503,11 @@ ] }, "locked": { - "lastModified": 1730675461, - "narHash": "sha256-Mhqz3p/HEiI/zxBJWO57LYQf6gGlJB0tci6fiVXLjd8=", + "lastModified": 1731060864, + "narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=", "owner": "nix-community", "repo": "disko", - "rev": "380847d94ff0fedee8b50ee4baddb162c06678df", + "rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f", "type": "github" }, "original": { @@ -608,6 +674,22 @@ "type": "github" } }, + "flake-compat_8": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -682,11 +764,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -767,7 +849,28 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_4" + "systems": [ + "stylix", + "systems" + ] + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_5" }, "locked": { "lastModified": 1726560853, @@ -783,6 +886,22 @@ "type": "github" } }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1689549921, + "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -857,6 +976,23 @@ "type": "github" } }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1713702291, + "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "46.1", + "repo": "gnome-shell", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -864,11 +1000,11 @@ ] }, "locked": { - "lastModified": 1730633670, - "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -878,17 +1014,38 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "jovian": { "inputs": { "nix-github-actions": "nix-github-actions_2", "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1730652030, - "narHash": "sha256-uTToUpFphR9ywc+DQUD/8hmboOMFV1lBVFf/ztzdn6A=", + "lastModified": 1730962714, + "narHash": "sha256-Zi2NfnEqB+Xfxtnx6arIohSarXiJmwTqVa3nSpNWx30=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e74e57a37de55ecfdc62f49fe5a7463b2a52499a", + "rev": "93b525229c99fec0016db72a174f43b9d6237714", "type": "github" }, "original": { @@ -907,11 +1064,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1730107060, - "narHash": "sha256-EnVVq1oNcimZmQYl6UlLYs0jhC6aLah0bsFMy2syEak=", + "lastModified": 1730739295, + "narHash": "sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF+gIv/OyGtlBJE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0ad4ce46649b390da8bebcc229917f9863c98fe2", + "rev": "cef39a78679c266300874e7a7000b4da066228d4", "type": "github" }, "original": { @@ -1172,11 +1329,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730537918, - "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=", + "lastModified": 1730919458, + "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560", + "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", "type": "github" }, "original": { @@ -1235,11 +1392,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1730725329, - "narHash": "sha256-5TEPO7ifLaEC3eUXYQqhI85eREgV7fbgEXflN1jpGGc=", + "lastModified": 1731095917, + "narHash": "sha256-KMP/SvOmQsX1SQqi3BsOaCwrR2YofAPld5iuOA+ZTLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f45b7ffd7297dd721a747e8d8399abb84ccf1ab", + "rev": "bdac466cb9b2ff77f7459a3d68de9045a562bc28", "type": "github" }, "original": { @@ -1362,11 +1519,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -1378,11 +1535,27 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1728061008, - "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1730272153, + "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "type": "github" }, "original": { @@ -1458,11 +1631,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1730025694, - "narHash": "sha256-Isj+5RY86+N+JrotqpaXqi6hUAABcF6pIOlIWy2leC8=", + "lastModified": 1730642263, + "narHash": "sha256-UXqvGZOHUDeAo8Sv5A5oObiQgBPELVgHQi130TU0jMU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23664a7358c599dd4f975f16cea0865bf423e83d", + "rev": "650fe87347086b30a6dbcc32b55987ce5a23c6ae", "type": "github" }, "original": { @@ -1474,11 +1647,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -1629,11 +1802,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1730302582, + "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", "type": "github" }, "original": { @@ -1679,6 +1852,7 @@ "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix", + "stylix": "stylix", "zjstatus": "zjstatus" } }, @@ -1724,11 +1898,11 @@ ] }, "locked": { - "lastModified": 1729996302, - "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=", + "lastModified": 1730601085, + "narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a1b337569f334ff0a01b57627f17b201d746d24c", + "rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825", "type": "github" }, "original": { @@ -1745,11 +1919,11 @@ ] }, "locked": { - "lastModified": 1728095260, - "narHash": "sha256-X62hA5ivYLY5G5+mXI6l9eUDkgi6Wu/7QUrwXhJ09oo=", + "lastModified": 1730687492, + "narHash": "sha256-xQVadjquBA/tFxDt5A55LJ1D1AvkVWsnrKC2o+pr8F4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d1d2532ab267cfe6e40dff73fbaf34436c406d26", + "rev": "41814763a2c597755b0755dbe3e721367a5e420f", "type": "github" }, "original": { @@ -1786,11 +1960,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1730605784, - "narHash": "sha256-1NveNAMLHbxOg0BpBMSVuZ2yW2PpDnZLbZ25wV50PMc=", + "lastModified": 1731047660, + "narHash": "sha256-iyp51lPWEQz4c5VH9bVbAuBcFP4crETU2QJYh5V0NYA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e9b5eef9b51cdf966c76143e13a9476725b2f760", + "rev": "60e1bce1999f126e3b16ef45f89f72f0c3f8d16f", "type": "github" }, "original": { @@ -1799,6 +1973,36 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "flake-compat": "flake-compat_8", + "flake-utils": "flake-utils_5", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_10", + "systems": "systems_4", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" + }, + "locked": { + "lastModified": 1731090365, + "narHash": "sha256-ti3gXhgVpIUL/7w6zDJuH+hOnyTZqxrIX/yYqALmiEI=", + "owner": "danth", + "repo": "stylix", + "rev": "6863412636c8f2cb3b7360f747fbd020fbfddf68", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -1859,6 +2063,71 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1883,16 +2152,16 @@ "zjstatus": { "inputs": { "crane": "crane_5", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_10", + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_11", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1729787428, - "narHash": "sha256-kGSM7b4+X5LObd6AdgQZABU241ZzHGm24xaiy33kwBI=", + "lastModified": 1730748983, + "narHash": "sha256-72uoWm/34SU5aHgvUJgKqYMhvt4Y9X39bFhcDwVS+P0=", "owner": "dj95", "repo": "zjstatus", - "rev": "c74e310c35fb7ec6b59a1c73720db4d6d8e236a1", + "rev": "d5794fbec93860ead015b0beee70489f50cd87b1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 95a8488..c25d052 100644 --- a/flake.nix +++ b/flake.nix @@ -78,6 +78,8 @@ # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; + # Stylix theming engine + stylix.url = "github:danth/stylix"; }; outputs = { @@ -98,6 +100,7 @@ nixos-hardware, nix-index-database, conduwuit, + stylix, ... } @ inputs: let inherit (self) outputs; @@ -155,6 +158,7 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin + stylix.nixosModules.stylix { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin @@ -177,6 +181,7 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin + stylix.nixosModules.stylix { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin @@ -197,6 +202,7 @@ disko.nixosModules.disko simple-nixos-mailserver.nixosModule catppuccin.nixosModules.catppuccin + stylix.nixosModules.stylix { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin @@ -218,6 +224,7 @@ jovian.nixosModules.jovian home-manager.nixosModules.home-manager catppuccin.nixosModules.catppuccin + stylix.nixosModules.stylix { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 947d6dd..3cbb99c 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -1,9 +1,6 @@ { - inputs, - outputs, - lib, - config, pkgs, + lib, ... }: { # You can import other home-manager modules here diff --git a/home-manager/desktop/package-configs/foot/default.nix b/home-manager/desktop/package-configs/foot/default.nix index f1839dc..aada26e 100644 --- a/home-manager/desktop/package-configs/foot/default.nix +++ b/home-manager/desktop/package-configs/foot/default.nix @@ -1,10 +1,9 @@ {...}: { programs.foot = { enable = true; - catppuccin.enable = true; + # catppuccin.enable = true; settings = { main = { - font = "Fira Code:size=11"; }; mouse = { diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 1555a1e..239a06a 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -12,10 +12,10 @@ homeDirectory = "/home/lillian"; }; - catppuccin = { - enable = true; - flavor = "macchiato"; - }; + # catppuccin = { + # enable = true; + # flavor = "macchiato"; + # }; home.packages = with pkgs; [ # System tools: @@ -36,4 +36,31 @@ _7zz = pkgs._7zz.override {useUasm = true;}; }; }; + # stylix = { + # enable = true; + # autoEnable = true; + # base16Scheme = { + # scheme = "Catppuccin Macchiato"; + # author = "https://github.com/catppuccin/catppuccin"; + # base00 = "24273a"; + # base01 = "1e2030"; + # base02 = "363a4f"; + # base03 = "494d64"; + # base04 = "5b6078"; + # base05 = "cad3f5"; + # base06 = "f4dbd6"; + # base07 = "b7bdf8"; + # base08 = "ed8796"; + # base09 = "f5a97f"; + # base0A = "eed49f"; + # base0B = "a6da95"; + # base0C = "8bd5ca"; + # base0D = "8aadf4"; + # base0E = "c6a0f6"; + # base0F = "f0c6c6"; + # }; + # image = ./background.jpg; + # cursor.package = pkgs.catppuccin-cursors; + # cursor.name = "macchiatoMauve"; + # }; } diff --git a/home-manager/shared/shell/bat.nix b/home-manager/shared/shell/bat.nix index 2afdce3..8658a54 100644 --- a/home-manager/shared/shell/bat.nix +++ b/home-manager/shared/shell/bat.nix @@ -2,6 +2,6 @@ programs.bat = { enable = true; extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch]; - catppuccin.enable = true; + # catppuccin.enable = true; }; } diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 6e154ec..5ad5e0e 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -174,7 +174,7 @@ in { enableZshIntegration = true; settings = { session_serialization = true; - theme = "catppuccin-macchiato"; + # theme = "catppuccin-macchiato"; themes = { catppuccin-mocha = { diff --git a/nixos/shared/background.jpg b/nixos/shared/background.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2ad658c36b07fc29fa67c0b790f30fa0db2541ae GIT binary patch literal 161326 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
WMXFPo|`L zuUpIiDnF*T+1hCC&Ag`RK`Se|YK@DFK0gtk5^SKfUS!5ouEurezHvLO+RL=2*B63!ldZEQ!vLd(cExZ`9@wRnN_?lfe7|M7!l2p=^-#Ga6XVuz%UpU$OSNgBN zl1A?qI0)uUYIQjpFP?ecQ821dd3j{Ub)ThaJ5nmRe&pTwwe+;buZ2_J_*SNVo9De` z^0Th1Dt-#yXQM8Ksi#ddS?%%fuISAEdy{7VE)+I4RMya4Q|t9L`MAff^MTLP&#YeJ z^E^1qhDW65OTyf{o*l((%(?odrGJHA_I?c6WbJX}ZVKGq=W@%gWbuTEvwttH81{~!4)`V`i*&|nKeQLPmTT!F(1XdN1xb(jY z7CtFl3mR{24s`YY8r>o0uDlEEm=%vxo^PYu9 zhr+rF`#GNcPS}}N5%!R$=jV6z_U}oDBAi}*4ZB?skfSEHcUA1a>kV62UQVhmdip%F zSKaTA!>&%rCfjLK6Kldm+;|pV5xsKFL&Vv+c$w)mj~>9Cpz!YE7?GutwE17B^K{?C}~JH*ff~iEYk&@v2Y%sNkA@ z7Y(`TAupcxpMAAFc5}e|)7dNY!{z+X{|b~k?<2Zy>cf&<`FcCHK2B^-3Kv~D+b<)0 z&c9i`ZoL&JzqNmPGKuZe_B$Jobh$r#B@&UdY{gs7o3iPjpDe4dJCdytTX_8LBzfBk zwlhauet!4s+V-h{q7=Te%z=(|U{d)}r_%mbtE9ccrG4?Ek8H;8S~m%ABv>!Sh7UCSIDk!D4b-j!^K{ zlh?PN?q0UqHtpydA14LPq76w(25%QeKHAxJSherXVg}_b4{N>q5~fWj|Gwr^jGr9; zWv;{IOKX0#PV=dnwBU4~lI(hc9tS(SNlIm>ISihemG6%%d$!$U#nw{3c|T{BXqPhfNpr~N3DT`r?jQ&pm#nJ0UyDBot~uT}NlZFgSHwc8t2VihWR zdRorq$@9{MOMA19%t>Y~h;{Um4Bb6r#d*0f9^6KpE9o8q%$epn`Ubn?Q@-+YUQa_{L;^3z5fG_ zp9ZR;&PfZ!Ci5?QSJbUlx7YYPSBJ4QehozF7Xdsko-`VEN@_rAI%X zf6!7Bw`W{-u=$Chu-KRDS6><2_M9hO8(>v8|MJ?)D^6}oDl_V3-j&n!h3&+ftOIkd zOuTmfFN^YFm%Q08N=whYQ%;l#SKf7c%DK6d)TK1O)m{bg09c! zSd7_y+;+t6*^pA2%`?Nna(32*L%UwHbTJ8E5#wzM30b@{a=Y)_wy!+frmkM{Y)Pu1 zs@Y1jCEPOvXfdvjis08v40I% z=wMYPEX+OO>bH9BBU4i2D<7XKtya=n%VV}qr;X!n8{da75{9}EshK;E@M+%fPSl)#Jzg^Ha_$zN>3SQU^Riw~otE=--M6rE zzu^3@+$W<~U#xKWTK2hAC#dtxj9c+#duxkoH#U7^cxSqC&l=kaKD`ThUZw9(G~KHG zfl-8GhU3QTvQC>P7M@wMTO%lAZQ;YRC%0OAvez~Uy?k-=yi}^Af33;<5l;-sc;&@lsFZt9UF|qvuv_5B`>ennJ&~US6kTcI3~4@MKm~m4{y!83dh7 z43OvbnxdGsba}SVfeAhT?(xLTJY1^hZR;rT_Lk`&Zsqrm2J^At<`wyyoJ+F;!U%l=(b@w;%ON>oB%lhnAd$9h^oM&}D zGV{Eff!3j1KH@tDfGt{@n+VpnM)?=m7dSOo8yxJ*I zEC0IY^D}m;e)%_1JiFwViraVdWsz&c1+Toh?lM#0`-?B4sj-fVaksoPe=PHky>fm9 zd*B}D%83g_cpR*g{C10Qg=~JiP-5%bHwVA+A2VicjA=AZ_~ROJb=E_fm-{MWuC22d zL{v0)jD}~RUXIMIjC^tXo^vTPUQXhhw`@iF zBjvErFDGYoblw&IC@;k1d@Z{na-+_4o;*8?man@q)~!0%^(HG~&O%=qvjgIJSD98_ zvHT)*O?Y6(n_UjM zv2SiotWWp^m6J1O{Qjp<@FcCiZl{dX3Zd-C%i)&}W`4MpcJo$PQf7UquT;+~arvxy z$Ai6gJeTRLESM4#u4iWZT)`_uXyLU)iIr;0!ncKQ2!9cHKW1x4>|Fm9uHTqW1YfpV z5fvW2Mt8OCs;_Qg%a^3qb@=x4X|0_rIbmV#mTNwxtGQBF=k9p6W!@FFxLbd#s?*0N`xPMw*Sc&%~j+Y4GZA3j;NZFk@lKk;hU*H@S6?t3bB zafXt_*3-wcHim9gUZSez>CEb?Ee8cRUwP2B`rctS$DZ@6RT6A00#*h@lvRpeUOji! zccoLu_WZQm6Y_Opg#5Hk7f$?}FWm0cWS zXiDO9SS2X4s^_y_)?InW9%0W*(DY{DSex zsfpfY9jkX`)m7!F&yPNMQ-x3SFf4tf34Gq2(G*yG1<}9D0|P*ds_L| zL*~3QP(H2|lDec)WO8A>|E$mLANHMGeS$SMcv|RTP1~z)8m-0GXm3Aexu;cdR@$Af zJq6B}lRFD`3Z__?*&PU%+!J(h=c1!6ydRB@otWj99(n$ivDVv#d==hesdH^ob0*9; zF*$DIz1+O#;oC`ne>*Sx)Z49mxoGR&?^d%L*Dxixcb3fz?^0ftVRAcDfHP&~mAj7u zXC2!Xxj<{nnc_UXh^ZSoCT#g@Df{I=L$IBx`?1V-^^4j{dlZG+0z8>!znXdRKf_gR z@A&++Q&K6Ojo8V@%3?OdO3Uh`6L_Tuu|jh5Py$3s`# z$c-r3yzDj0+)W1>=0yEWT~e{maz4{N?~>U8d#ufL%(rNZ$hgg2v$W=^bV|15^?%IF zVSgVlx0+YXtS!4+(jZuHSN)>@4EZO7G*VZcN}loPRIJOYb!*lM3kW1f=PuiwvT4F& zL5@R7Gba=tQ&w8)xN))2wernBwSIi^e`dTy<&2Aik-hjUt8b!0cbTQWy7~9SK8iUy z`_h!#Yi8-_KI1m?`sF(gJj*sa3biT&1 z&9FNg<-<5C_BWcO9gUoF@MdbG+Ad|5C7gE?d;BWe3PKm0W_)0I?r8Fg>?gU)92XsS ziP#_?)V^U&%M7d4%-SmMayOYG`fHDFmzG*vZ|5oNW9zI|()v%Ip3r0ytKb}-+|jxykchbD$6g4&~}Rm=MaAsc|LZ}%eOfl zVSh{iF>lB=ySC)D#jK>QrL7!Ro0kSXo@U}+Xv-e6BXYsDlm{0ReSoL|MYN8=jL->=(6JK|bi%QpLZ*_QNZ zNc1_+czj(kaEX6%ik@`xB*XhtyKQ$&pENt|iNf-gk0W`@8iKw4mZ*KaoKfy_E( zp2e$-7;XL3a(2(XyZrl)w^y2d7MZ#)U%k>baNX^i@Vv`6PgSaGps zhmOjbbjF0`c>+aTd)Ya*9XefJIY0dckC@wxuk0$5zvs#e2(0>i&*<{gfNtxD;cA}K z%$Mm3KKOl6aCy2kL*IVIr3@X_Y02UX6Zs~ulYD=|?M#f|^M{`-Yq}F0*zDBYw=bJ) zY!}ADll}4!Z&0`Hk&w{nRAn)p(n72AQ@vGJ&zksY%Ivct7V$;doEx8=QM{1xpJ8tP z@>ge;o#?y2T*J?^>cOAo*Y*as*?Y*{dLXaiwrHzClvMTZ=?~u}?{TU4+}9}T#~hGit^80s(SO~E*7u_l3VMD(#8+ePOHM>`6M>-Ul=ckJj;AkLkE%ozoCo?Um_rf8dY1(z~m&_g4S-%D@p(w|1>=uJ1ne_&TEleN~&BuiF_uQ=BDj zSS)QHlfQSt2If(C!_2$!?kHuZjAX3UtsW%UsYv0&Y#md~A0b^l)aH}tJf;!{iM z+RAcGbIvB48QOw;8x2IhPrEaJ-jt8CdaEvo>r~8U3SvFQt0$l~VGVcH=c29OW@Y;? z({-unWwL0wQPt7Dv9|TGMWsBC?t=MYNpF@P;}A%2c^;6h`fAscrdc}C3H_#1XH1!% zcJ6Zjp+hVW1SVul&)XNO^l)kChTPMJG8__VZZCCa&bb^ITe`|G*~wC4>dWqa&u@lv zmNzu=C?4S5cw=Xa#C#$wA)Sj4YSawUojdk+&AB@4Pyln4!-RXT=I@RO$Mzi=k z9&LW!F&%H$O$uJ;e=huR+8ySrp4$puuW8zt_U3Hs{p73(%~yW&zdXObRxC->y2IQp z+CJ*>f)veylRqN!#1wN+i*?pVXQ zG9?O-Kf~Y9gjkg`LUT7uIm~;bc}dc)A-c`DZ0Gj3 z`yMDZ9LU(nm18$^Rki#1*?~8oisd$bc-|UQob&JZ`m1uS(*wE}zS#DyW9E@CYl$b5 z_zeCth}Dz}PMUY9$aeXq_4z@k%#_y7l68vA`gH7AO={lKM9KJ7s!uKL1D6DB6uP4l z<>@ko;p53D2hRh0eI=)Uke(Xcwo-gaip#r*w{H#Cc)rk*y`bygw(R8W9yZB6+n62} z@OIo_iC%N;Ls%EPc|yZSjV-s7U;RC_>(-n3G4nn?pZqSE!8jq}#)oT02P)iKAI`db zm0!(L`K@DyU80eU@qPQfSu0{*nOsghE5Y{tx=+Wo+^|{8r847Ah95JSRlQeb>u|y48$xm+Vb$ zk0{9cP+;bLsCVmqS+6{p^$W~~FI4Z z_bV((Ex#kdvpP%ia#+MIy)Yl2dcjLOA3S>=XsvO|tZjGtN|Q6}xjQ2G;tkR?wn@EJ zJ(|cEu{L^kM9QOro|#?S9tH<)JCY^#%JR_GN!fM#B-W`NE#jL$#q`6CyvAP1tfO`Y zTNj?bu}#X!k2hwwp28f_!-t-B%P{j8xTbzw`km2bbc^%VC_-ta5iL}i14SdM0=nnn|7n%KdgGhv(Z9m$I3cs`I~>Dcx?gI+pjntX6fm{W5de zz!h(d61!jd^jzy*W0miwzhaB(To)yd6Q@rLu9@&w|KSA7$WN-r4&7!+@H#OgyPk9X zN)hKg%fpxdGn_vw)jg+qx6;Lmt^9RM|D}a(lon%}vx8UjGxrPuhCG9arG-*yKaQ{P z7LCk4dR|B5ZAZWFF1~C7g_woAxj*!8Q!0HgxV+pVK=`UrRr8anS3c%NZ@MdCGvDv^ zhAU5^e0%22VP_Rm{o}^GXYJJ}v7eEBH!m;;WT)=Dl&$kz@7iqcr&gjDUQ~G`Z2mHD z*}Kq9QY#rIeK@@JYRmGwk>7NRpY7fH=|blvTkjan3(s>>j?EB=I5b0a-cGv>#oHO4 zm$_scODa#W@+sS%-*7e8=j0}ab4ym5mJ3Z#`D(Li;+CCj9?CuVrma>w|KX3`%i&8o zS}v@LsMXqdxT{DaS z+H!rV5@F&c4NEX&7)tHYU`Fo9Oy4L&y;;;{gw0DJ+&+AL~=Sd za^HOt+^e#0P=bn81t#qzNU9hl%+D zg$DNuJ$vuI)8(1>DOhXIT{~YRqdTwjH${0`n%oP@UU}fEQ2$9`Wz%2N7i#T2Q173# zzwO(!d$-QbovmecS1;#S@b*XTTfcF=TscwXk?FLRowmImCBJUnd6hZye9)}dQ^QYQ zS21S2 zh5fW;F3Yk?Q7(&^cc)9!cK!@{?74iU#>cC|S(2Ww{zZB>ZeLNik7>VZ@5HQM`?|TEC1>{ht-08}tAH`R;d?$Ghmo1z1*XLC^+(0xL?7*4 zSXTe-v!C%jotPDSIyMWKJ=|^cI&;OutIE=$Vn?q^^*_w`S*1`kb?Wt(TXhcQO#N~+ zHS{@`b<)PG&fW*Eo@Wg*&nQV*cS!c|+6ukB( zZ8Tf$H2qeQvig~1VQY1-M5Sd>^E@`G+SDBTk=5eU(DCTVgcIkkR78D~jx7jqo}P2c zq06f<-!!$dt!z(+zKKuI#O}p!)*hSWA1riuY19$(r3QsvNy~p2HZw<`6kPLM=Hs^) z_aBzYR-ZWN;?VUc=}G(N#V21FX8qAveOGLSg!*(H&4_D7+XYiz3(Mr`Z#90$mf4=z zG_m(+zDHGzr}-UeF2&26|1Rr4zd7g4S#G8^#t&k*vv>wK%UyZ%VdC^vHCwl$&bd=($lhbYk#~^l{o74@!vXT z)wxqWq*!=QZql{BooFE7;&)d)F3D*3wn=y2@3K$Kd3MQ&GEJ1lfzxkBpsbW{A91^~j?jziM^19T* zqBB#&9F|TIU}3B+)GaM`bE!JNk*j>9xmB%Jo(P$FCrny6{LJPF)*FS= z?X;Gu$Hi=t$^XR6S>gNZ(8Gi%S=m4Sm(qVbZc#ZXYaJESxo!)`kz>;o7^|PBdiL2U z-dC1NS+U*i!h7a-mt#Z^ocNQRp}Y1=(CHP7BEO@=LKBafzI|G$7kVY@W~SR|>qvob z0?gZs9%QP#-JjsoYkKq8X{|?DOQtymI2Y|V`m=G4p+QQH{ufXkkvGkHb!!6i%r|98 z((5K=iV2$}ZVgn8QA~VX`&jOVZpsbq$?_gQo_+1SE4|la`P81d?y>6%KSd|3)n2Zt zF|i;z#KGmn2^Z5Mm4zIdvB$hTopfVA-Ynkvt9_Qb=OK++ldM}M@&>`{V#1~OY%~_; z`>NX8c-j9^-sFF3yS|6-JMvOVb&Ub1R+~828-a&M@t&?k^X~{wQb=zFNRM30;glzh}Uc`8rW>>uw97c?i%3rv@KyJ2Sfj%hPLKA&_&d*1Q&zq8+P zga;&M_Qq?>I3YeWXX?adI;($7>pjnvzi&m?-94MGo4|7TbPYuHaXT$1$G+hq)9TuUbkk;kdemKRsAOYHEyo=Jz?%)_uNq zY{y!sZ70L0Zm??qInRH_Z!!0x$Zcm`1q~xh>+VQ0clN5Ej5@O5U3jxh*K_5Me>^Ym z(~S8TV8&H7JwP`;Vo6TqoIl5#1Z7T$jy1+>o+K`pxB88`Dl5o#^GW%w*P6gH=3_HwSEw z-}^5qJ$v5CG?>sy7EhX#Rtz(-%79KhkE^{EX z+c+&}#)PoW+2VECziw`@)^T_}@pJc&nRo508a;JZcZ$646uuKanLGW4bH%Bnb#|w! zg>6o3=3SB9|A=eiZY{poBKyz2l7IGXUFu@>u#yXHX6t`uf93YMQ@1nNPlnB1#jTZD z(6VgP)!-G!rtVfN$$j`MbFOUtpK~9B)R+AI<@cy8Tk2Qpl=uEO*Ztj@wq;SZ?y)tK z*b-M9{!!PzI-n+R`M>nQUj4EK(sw@Isx|o*>AvlTiDSC*8LeqahdZQS32oGPe`Wu{ zR|2WQ8>(b4HwD#OuXLNX`OA5cldGS0T=Pg#WoJ0PzH?qx|Kr#j-?VeqOIZ8Axwe@} zKb*UI<+C*cYqMm1PyUmAxp3c2m(Gy?4B9JAq|>*GIo;1G(VPAAqqY9Y*RvH{iZmi- zp9|kVdrR4?_y>1tdhHJXSf8t^{(0A?ZS(I)eiZ#PEtK(&dSG*V(1N=~M%RDFdCXO- zS-jm}Cn6>7t2N)wo_gMr`JekzdfAUXo_qX;ms{?%7pslg?Vq^?bIh3#rSN9T=JW|$ z&n^AOd|&?)`+8rWx8>oN5C1)&+n$-sdS_9r^A^8J9Y#6tg0(hJE!&%0S?{kEKmKgY zm?vNAzBl-uOwzj7xmrT+md#*#Rl2orX`J8P z1unZ+@vLlDtADlT$Ias8=CgKR-p%ZPbX7&lX#di0>T!meAMIC5f7LtIsA$K(x%{L> z+4*0ympO0h&y#qgua&0ob;|S`5%2XMdCjpt@B5!2sa`dBb;0q>_#gUyv*!zaD@yKC zslOq=N-ko4X5W{xsFRbGmrwD|jO6&IH}hAZm0yI0xp`r@t^Ja+nKS=0WOzBu6I?!( zr*X1ud($VDpQ~Q{`Yh%Dv2k-z{k`RjIbLtzK2>;PzVE)0Z9%6`UD!YQSc=D*EzeI! zC0Ft^*7ggtdjDs5)wVwUGfT~F-ShwAW3rC_EC0`M5Og-Dfgl4D6C(>F6Dtc7GXpaN z0|Nsilb|BAfRLerup^67KwyHXfl;D}1FKU(QqcnNv7F3|jP{Jb{{H1#d*jw>MUlCS zc(1vw@pVoAkn5@*Q`dEWLwDxIh+9#Uo_k#D**~d5Q7`ld^T)pRXD;8|rFin`U%uR> zjbA5Uo0j4p>hWBztn;A8tn8;Z|1qxqD5L7py|p^~=&`Jnf6AS*Ax{ri|7WNQF3_+1 zl+9YRMP-*uot(DvYqfcsrmW8X^*T)L(rWO zhbsv@{&)Ll_^FIne*VvH2Tw1s+^Oom;?XLX(oZ*ERdsjS$=Rq*JgcPlZ@;GIDwE|E zDa#hE>3MXGb@j>1nz7TjHP0?XG0539^1)w`QORQ4*q4Dek!c{meicUh30n0 z57}F?&D#3)*o#ePGi!dx-gt5|SLvizh~NhPi_9XEp+nbE#WKtY-D9ur>mF^pDELpifeo3zW>^J^gPQ`UAvi*C+))A z!~9LM%r&EpLxMz-%zGw;oeaIXY_;{#{|u`x)pku2pSI-3vEwH@jr^`R-_rVR;c_^} z&9^2L|iZ%h$ZnR;1i(woAcoyT_B{}!Cj-uUsYRLNBtujuoEt^!wr z<6qpov1m10-kwaOi5~@P>Vh9G?w@h(ioc-6I_qO0C%m2%o}HDYCUz$&{F>0hE&hQk zYnHDR%c|Km?f8nBnp*nI?m7W8IWKSa51;woN#)qznKCv~Rdc4j_j`J});&_c&bz#{ z$;dxX``g#As&6l}eeaEPxvsmA`^0q>RgZ_CB|Fi|Rf>EtL&k!Y14b1tfH zQ9jM|Gw{@AVeh~!GQYmTdQ zW+{1^CUvRYdU54Vx!|{8eG$iKV>a)=P~$Mui+`$=*;Smy`pnMFTm4(yFEH9k>5_>H#bM@yQ7K_K_F>1a?pk&3Mc-nVr+F78Zfz3${bv4T&wkIFvZnIfVr9`0zi%G3o#{N+ zaF=pxa?CVVIor8MdR9)It$Jg^hfeRen{Qc76+F53%coDC7B+mof7AXmB>VAie79%v zEq|8i)c!^MId7ZqRDTk9u>0m0r9ht-Q`PieOxl=m<;wnBQ|?UIw>nPrX}2Ql=}g`0 zuJ7M(&6^};5TwoYy2Q`d_?p;~NGG{-mKHN_^8|WSs9XQxW*6FXQP{71yU=$3G~LZ7 zVy~T@x8TW%S3!%cdY)#p?Al~C^W>`cYbQMW+p+E3#S@Vq7A`8z|KM@iVvdrHJQe1>*Bf5EGXSQoonKXl|NT({99?( zS6{T~9Q!hj;Lp(?+y!sl3lu4^c)uic;VNZ`tCQB}Zn@_cEBNBUs&77ozL_9zFkh) zb-wFUWJu=sN%?QwL#wCEvNi6uG%50#6J_|Wa9>w_#M<@WR`jrL{*W}yMrXCkCE?%Q zn>Ph6YI#vq6u*7Z@lU6jujJ=iCUxr^Jf^bLr{q+|-t`~6^-rDF*}MMGe}>DOPT%^^ z@aJq*-kJw%ret^>T~fuqpvwN{i+K~a_&a=YUuMzmcYM*`b}oxatyUt^w)S%DjF~sS zMA-^ouw}k%t9)7GL09zJNy**uO_{EC=ZoqK)s^(S)vZ(1Gg52Yj<}~OF5OaD-K8lK zXns`oo7Z%w?xc(9EGDj8mNygMJc;`u6BxO;S4KY7Wlg70*nXC_*=fORCuexhNp@%b zZY8W~yf8mHV2{e=H-VvzP8x9QYm zPv_}8IdNae=wxb_PwvLjy&_@ven%`#t+3u0DZXW5-RUyjTPk~A{$u9aGi%a+hE>W- zR;w@SadKJm#LeK5W?}V0!H*l?zDoHf=v}Ur`XKUlpSSeQj-(Gu{Qd7%7N;)%A#^pQ zs@HJ0=J!V}=X`qZ_TJi}8^2@8jNNyaoGMhZy~(#NUtK-*?K^u*uRfpY;=j$mUip*z z?~tYFyKvEzRBf3RS0-gMwkJ<4*%bTl$mDEhUoQ94DuovNk4!uJ_LSQEGixVK z?OEc_&BFE}@-$PrO`wQxq)gp$=Q)0cwS0O?6I0gT|0r?v#Fxm>d*>IsFFbx%?#TPw znOg<7?NPqp`XuSrw&Kh=YxB?FoD=*abN!JmPmgxq)N9|8-?{Ae%}JAerkd6T+}+c4 zs{Enex7{-3!N2=7|1${9f4DL}sV7QtdCr$8<>e|T|F$kUzU;QLlyi;CTP{&;Ro6v( zDg(uvCyC13?OeWhQQ+S9NB!Rw`Y&Ad$K3OIS>GN@y|xeLIXkY;*H8L9DgN5YiBlJq z-Md(!wm;SXoyD=Wb&^Y7xm(OzwE5~u%Ok@@ylI#wR`6d;HL`iA~=(npFQd z7UH?upd?Q7$NnRAs(;$m98dO@#OzkPzF}?mo{gt1M3(4AE_IuKrYN&4bN`f0Cw*g$ z>JPIOKKQNhA?r@cjJd0CF7iBjORQexNB;w_y&X{%diOlScRYIXaa+X1No(4*4|1$~ z;l*@go)+VOQr76L``T3dOr;3Lu zZnB-#<@uy5t0XJ)lz+z-sY=rg9rg0+7ydo^87Y3ULhaGZf1qjQ)txU@Zi;@A>ilqE zp?y(6VZEV5(TQ7L+uY_&E;%k2n$#54{&(9fU(TS<*ZwJ&WqAMF$7iOKI49~w(C>fB zdYvUF>V;~B{;?lfy|89QW%AlBDIcr7e=7gG?Q4GhjcHcD-%_VMqmNlf?)#V8AAbJF z?~!ZJBCm_{*cPdLb}rq2_}I0}kv_B6x<0>r%Wu}LLequ+8Io)(vvqV zEGwljW2yV0{nImf^>1gaDHM;3sXej#!}=qo)wc>yYD}ro|L}KbvYk-(H%t3`JInn? zq}NM28eew45a#~yL4B{ZBFE9>@5()OW>%r_iHY%xclQ|+Vy{{ zj$Z%A`~L`o9;j{4zzS;GGl5(7;I=)pfRLi0LV~b?gJXb*l2Kq{fm0z%!vb*2o(a^l zf2X}faoac5@NJ=;@<7ID^*igKY0A7dzOhFd%N58 zB|ZBd)qE2%*s86vTE}eGC3mjlZI|}EzOFJe^4OZaZ*uzuHx_w`tbcytlJbs?GG)?x z7N0v5nzlW3?o+9~XMDArg7$}PPg7BvcGGFcghi80qHk1GOO;p~#x32j=-BG#kLHxC z%a^#By(p}E))f{Rnd>SZ8Nb?1?#ygIXQ#kIMXAVBW=Y2;Y_;Dqb?v^QE{&$&<$@kd z0v5H3cyW|;TF1@39yH0T!#!9eNK>Ti+>zdy9j~14Ketd;`Z96al7e3*dHE~mY|g%P z$ZDp=%i0RV@270J3qL2BTs$$kb6a%y8P_GQntj@h2L(NK-aff2xJz~4&HY}pWBBgd z2J~(W^In*8S8C?_U#6Oy)^-yk>qEUJDsR>vId$)ps&t5-=qxAa z`;!XSe9etKyl7rl+iLB)IFX|AJ&_)bM%guse_06SKV1_fvSRP& z;DyO570-Lq`)o@7_RH4w%S2qMcznd?9}dTuBXONPyJ>6S-j|a`u$_q)9rfq z8fk04JN}i5>lt@lyb*UR_4-mmoS->qfA8q0z;r<^@|_EcSN**X3vfhw)iW)C_y)-NmwGEsXo?U3i> z=qUk%HwTjxjyQ^D&a-CEx@bH@$YqZGsH{XfB$EMV??9^XA#qnad ze9fEHZ+$F7dNU?G+ac{F7QW9TC8Kmn&!jsah27*;cD{C3nQGUyHG9iS5!cH$ZpZ#T zvY)t0X;OAl(89d;mVVvqczut2JEdQ^_t%G?f*pH*2``>|G5b#8ThSApMeY;p+yuTS z-Q?EsS^Q)E<0;uE{ARAYcbM^w_tzI7^O&WF;Lb zv5Ay3UKEr+-|+qI%%4I!b=haT7kS^`Rkr53S9S2eYxNiI|3AXuCcwbR%*@Ef%*M>l z#KOwL%)rRNB*-kJXec18pZnAV|Vv<-|03dom$Iw*v_?FZvV_^ zMx4=~-iDCcwXYVj2ue>ANO`kD?sTV&`XU>NdXw9ddB$@?roAd?*6dzwe@QH1I{#IZeI2~z zN4U}@Bu+e=`*yv^gY-`dvvMW~W^ZsityXrwbn!GnS+U9Qy-zSz)vucIe9MhXFJ5kJ zntW3InsB`0g0IoD7w$JIHF%lDVy#_P>{0xpd*xM?*I#^6vywi4Tz~W4gKvNIxl)g< zK4<)V`^U3ZX%kZS3%D-NsWgx0IaPgN<^}a1U5$G^=1vz?-OkssbqR;CDnGYJ)Wi1q z2i_&mG@hewr{tAwAM$;!l<+DmndiG=x__30cvsFd5I((5#DD3gwI2v_TQ`7 z-*X4_qmzi7g%81gZ|=tWj)S>iA4 zwS2dkLyKoTuv*q|PcPN+KSM;GB8)fUIHcnYMPjPRZNuIzH?%Tr4j{TUG+<2?6TPfmgNV`y#Q}LX8N(EIp$+sMo zSCzV3cg*xRIdVf~!LR(LC$W}cv)pbR{;hjA-e375+ve}N|NeP$-jrUI{MBt|1@i<4 z{eY4$PH!!jafzz-{X6w+&o^tI_Ob*Ivq8 zSaQoRvyRh>g*)}rhPeS|GH-)xJo*@?dLIoIh;G^*y@*ljl+x6|;7z$!CCB+)_k5fo zuOGT|(Ftas>?fNa-s16pTpm!@?is%Md)~j(QaQ}C{?2pE(CBzrRFJ1o?6-99of&6Z zYt0MI%|)~s|(EpihTrD zU#W}l)R?4Oen!+iR=z9Za4TXO^ZpBIygYBoKKv#K-Sv+ugK3rF?#w`Ft11XuRH?blc52wCRiZ*u6?_7l6R6rKgKSa?rd;r4cc%amvA0(`6eckP6C9J(&_zN5rPdINXm*Bc%zZLj~WG2GsHdRPA~Udewix7-Zb{p^&|>=sMAxn41$ z#>JB*E{kf)@|!&P;LY!HOGK*TpHg##lFg2Q@C8cGGXzZ-8Lie7Y!Ar_`NHGit5YU> z;wS&(xwm6<@`^-e>8N}QxOO~Yv*+@a+TVTtGb}CGxcG&L<-)_edJh}^Sz%)Eo+C8# z%JRlV^?a=c8Gc^HnVX*Tzni-!+jvH=;N2}TA_A*IbPu~(ugY8QyPZFv<=GB~(kai6 zc&RTtd{@Xs>OaGh6Pf*$qWu?2{Y!gO7qjrLEzGE%qvrMZvi-~WUFmXZrG;x5%0BI4S-4@|i-)OoFXw+*P(RC{;lo#M^?-oYVN1W~^dH-M`PFX0m+v?1 zTsuK@y+DY1@JzF&K;yoSO~FfQ&ALl&XdYi})Vsd%iki{PJ-q%Q+*wC?3-&IF@-g*{ zz4~^ETv&`0{~@y(Kc<(?^Kd&SH~)p|kH+WOcJXEE?|Pe$W-m1a@?~Q9r+oo7txiZhur0sB@@=E{I zvUbxOlTWfW`g%0A^DdteKE2@8*5IeBZY5p1a(zp@=Gi4Y#Xg0*tM5;0FEsz7c!b$< zeR>;T*7NLbBK3F2dyb>6sPZLK|fLO{MtCV$7jE@`Ld zyPdA`OUbmzTzfT#J%rcI!Mbqkv64Sg97dkq!OdrE+yum)6yLbjD=0Jd%Uu5d44*@z zx^Hn_e$i`Y6vwmR@psqDEixrHdl&a^s`NXZ{BFT#zw8)}#6wn$7sa+;+3s&unb*4f zSMcqUkivf_x4hgU_gX^vF1uK}yV9IjIlON-{OD?m^#8NSq2rSm`>EiHM}p3)npZfy zJ+|6vo$_DBd^YxDZLe0E%>6rAYg0bE=9+DmbC)^I-S}gjlz^$0$t`==eP1`;I<9K+ zO7N@uOsh%TzjPc|ZHvAa_N1b+m@jVL_l`LXYpkZGc|;zFT6E}=?B!KknAY;Ke3_ym z@b1p#8;oMgI~7izDi=7UBgr0md|~+J(BiX4@4x&IEbrSmts{KreZPBO40lb@II=bB z*nv;{#p;uGvk9zp`S6*;Ibn??w}#a;u6x(7KXjXW&EH^q>aC2xypIc)hi2+IX=SzB z{b%TryOn!-=M?D${~5F%#$7AfX}InrW7Oq_1z~1?g%@;kDcyLsqmA7}#%SU3SP_@L zjOe!I64P1U-c+#U>Mz++;+t{t6w|}3f~7k329=8=ZyLVjiaW!+NNo4bFTnxD$A8rv zGZWi5lf$5AyF^g!wZM-uTe4V>iE|&kajW>)6Eisv-kQb9vjT+~)-m_a;8tXMp&uDH zPcAj#L+hjvyBL9jP(2AHCY`eVJ#sQ9E5FRVoRHJb_psoW-H9CzQ(m4ZTVeb?F%X%N&)-SH&s9RSfBDfll7)i=$@;GFJE8u?Ht3`SB(oZpHH3k zt4ce|W`YRQ!otk!36r1BFP{Hcd4iAW%EuAWr-IJ7tkask|5<=(V1&f?ux*PQeyuF- zw7t@l>agm?uZ4l{_APE(CH3j@iB{?B|5hElTB%y?)p{;6Nbq5A!y85Or+z94%XL*b zxV0PI^;LH$ddGFoOPRts>HYMNl|Q$c>{_>{NpX_9?sSfcSL5%>-YAY03MeSLtZ~m^ ztu8~6Td@BDwlEp4Y8fSycf!7be6qrMa&yhNJrX&X7ld7U*b*H$^XVqVD3eHQ)kPw6 zCk5(#S$1&iapqk*6-_qNGyWy7ySHK8mfP3wC#N;MIX_S0rq-`3>l2ROHEpPNdK(g2 zdUS{HF5?Y$MN59)Et+-Qf_=MWc#Pf?5uP1uo-MrcW}e5yC2xz~?bsT5bMCe?npbl8 z1h$+qx~VPSlX+P;gXiV8@J(OmWz06d6!>OUzEo`R!xwXdY9oAQCOn&?u+nOgis0Qm z_cg2M9;s40T$z2b+F0}0yqH<97I(UJUC&rHSx+^%@XH~U3D@{it8J}T+?=~J;G(LD z_^k`83|#kf#&5o6ccCh#TTY?hB-CaDzln{h0lTp@v-C>W<$>FpcWya8DJkSgF7FTb ziG9^7+3d6QMZVXcS`~5g_|$7v=S{=rcvO}A`&77@t!Co;<|x&po@bp`-psg~n&3WT z{Ja zr|9Fm-w3x!doFe@ku#x8&P>yPBA|xc*6t@7nXri%e%q zd^IV$&68R9W?9juqRP4J@@?MS|6?rYkuhnt}D+>%$uiN}u(2 z?zUU;ou$})-^sK)E$Q(kQWsTL+`aRkp<`uYgwt}v^%oP9Pf1&b`&hEIO<$R}J4K?E zU4y~m@6n6>M|Yfh$Ze@TOVs2=L*a#$+^<$KynH9VD(3CPlj%7o>P|YPvNwNK>N*Ka z9Ip5=?Sb9p+mmvvJNH~}?p@d8ZW6h|>dn0?Up~o(9>|#UpJCJ93tZ=IR4jjja(lSa^^UR&-?H{+e0bdcDE;*2_GO_FKPQ|k+dID`QgZ5VNtv>H3wlGk$4)D;3^%^Hf6=x(-{a4%E0ZwQW@0;k^E9uU^+VTn0>Sf@ zW%l%muAFZ3^LcuG;l66lv_=NDN``f1St7r;PC0ElcMpqu?i|0?HHy*}E9_rMwX<0- zc(~BPWr5%MUDICKY*?G&mnh$Trr2r1;pf_Ad|s^?N|rinEIIugUH6w>(4Wbf!M(_~ zO!)H2Tm#l!Q{*0}hwj<;lDn$jC4yszcI+wIi$hI?_` zYvrC_6DkvS6uW*cy8fS`g>#wQKS$SV+ZPvZm|$Rf>yo8nKvfp^gyhhMXx|;&T?=9N;SJ~^Haouk*B(lFmzt2|6pIc}BT<*S8eSCuuk-V(WXse|*{fy^^gH2&!Pd(|s+ zlTUt8sZ~RSKbL-=a_i)E9r@A*eTQ$FZ8g-jTEI5j?ev@kO{*fg=o#UB{05E75+9tu z>g#qpcy;iK5c4fE3dcB@Q`GKUNLa(UTO;Nh3j@RMnSP~Wr}-667Mk?02u@zS>f6^F z7cXd)WClEtviTBrzk27bzPH<2WzL7PI67```>yfcxUMzoThpAg3CFJAH~(X;D6gX6 zbZ%e4wNBNTH&>ojX>y*syz60Ej{!nn_>W?z?!s%lDjP0Oi_3| z@1V`K*XETfb1T($d({drd1^L!$C+1wHrES+=LT+=b>qv6CcU}hJat_jk0dlM{g9oo z_UTpei$=fdmVNcD_TxKQb*|a*X|1_|ZQqT|Er+*qPUq7&HMiZGdvfyn$y0K+C2PIv z(|aSZ%tG@MZ(ue{)|J247Zq+`DtR^QW~ae+)@9L$Y~4Fz z;sUO9s`9@4c0BG>REpk-t+zxT7fx>2)%^GB;mqFf?O!W%e~2(nO+Vrn9Obji?4`8C z=~`=!6?u&<4!8H@xN8RfSk1Y3lDYdiDCy9QIcz-dijPqHm z7JJ2uQ(aq5aO9m@@#=U_W>H~B=H=vdA9(~+G;Zrj1aqwW_rP?KXV9A~R`a@^S$I5| zlO?lzl3Azb?PpQxT$Zcjzd261;a@u8lHd`+Cnp)53Us%Lugsjc+kD-Rz=B9c>9S)h z&h43AS6yBfE2Z>!(iwcNy$(Q2X>n|kl3@|P|YxU78Y zX@ToH8;^F$tW6&^qJD(D-1#an|t|w zYacw+w4gZl-0JqUK&~6n*B`JJZ+T)>-JSXP*HpKSmlFI=M0`rfId$y1_1mrMcU?Mq z>{wm*cb~t)-BD7HFIs+$R|?QwoSe+U8~BL#UBH45QhKK+H(W?Gy&9>nRO)6alEv7{ z=a4hi4wS~3zBdNXQ_Xw(&`P#(&xOFV@%FiWc{?tqTE3Hb(wFM(CRqI?#K!R!^eH(}7_{Sqz=5p=rrxt;y60U?|KWB};qR2loSf`5Jwwg2Y#&(8T~uPv zKkA>nAoi@#sZE}**0af8WqLL{OqQe7x_WKJzTL7L*I8!msB&8vbNxe({I$7z5C6-U z@;x|rjXEROlyjlRF8qHT>O@j6Z?aSpd%5=E?9^;)73K278<;nl1llAA%<=0g@7X?K zC);%XRoiC2e^qw*&K3O?r8$|Kq*RveJiCL>bKj9WRw6Gm^Tll!pRrPWs`fs~Qe(q* zn=7o$E_J0-laC2(+`UWJb<4s0O4qAeTUTzcDEfS2Yku}FnK!rYd6*yW)AQUced2NN zBAdwzZZn4}ob_9M>s6yvi#n^EWYIfQj>}ulP3k#&G`L_jk5ns12BSq}r62E)$yqhL zS=k#{J~S@~iFp1Y`1-EwS&C~9eU#pIqG(z0o4h&aP2?UjPfE2svZypTKq}$$HNm?Z zb_wKqV;jX{8h`XtUD)&dau0m z$->{Ie5#J%`kD7`Y~kgQS`%B;Rl@!J%3H+@w-aR|pFTZxc)rcd-Lz>_*@^I-+xnbS zXPGGdi&BtLpH<*`%DJg9&w1))y`N>hGh?^0ZSmCB+4($Z33uq%{godMI$X&;>r>2f zr?;?qA;)1y_RxLVY?X_+n`2K#2CrJZZ}`Dp5r)=O>aQ` zvXxIPSG6v8TVvko+_97C1GgK~bo00_Blb`qpQfiGcUh{MYVQiJj$Oap^Y~S6?n>Va zB^?10c}0^apWtm>TgmYHM~+o}W2TkYS0=Ca5XOh%bGdf8=-qQzo8o2i>Vt(MR{)<8 z-}#?y7jDfGi3(V8c*^y@L}wpOOO4*X>iPXso#r+QY`w{MC8J6^#&~N_F2f}|eU;#x z@4*rGs)_vg2=WTzti9fxM_xXeSLYr3O=II>JMSn?)!0Y;e-=hvYp~+C zUMOVJyT`lLcHhhk3vSMM)^+OPMZQ&Lw;X+SPjh9@D0$Mns?d@{+OTQ=Os6*+S{2W$ zdK|8rqIs==IWknYa()YI)4X5j_3BRve&pfHPr27D~V(Zrqw@(UY@!o@3r| zlh?8HvSi+Tky`P^c)<;+iz>@5S*RQm&D?qHe&|u7l^yl26$yp!W``+Ns;31jU;nWp zWaqk?s>(x;6XkL~`&MT1mbE7&mugp=o6pak`AI7MnyqSh@*MA~QE9hMI z>1N~&nY&JMsyCLo+`j8@AXvLIIng0UTP|j`?5ij5IyNmhcY3eRtMJWvmGkOeb8oU{ zbb2TGdc)+a?x8Ja44e8Y`~tE|q@^4WJl(vD*J^5so?pZv)uY~9t`pqG~-&njOck;*L;PV;91x|a9cdrte_lE!7 zjOQT*DjC~zGk5MNw7J@J-F#R3kHl{p`xxH-SoPe>tM{Su!c&hHUH)?D>X~0p3-+#y z%)FVeaw@N!yX1!4T_=&lx%qalychfxUnAS_H8M!#?7II9S}u1_9^?vDc$Rn5@2#p$ zlz}SORrk$LtbX3QzwgX)5WUdx@r=3c`6XiCwjW-! z^G3efmrr){&&s*qU>Dl?PS5twO@mG*Yu(%J3#z7GNqYQBHZXgud{4ongu=nZjXl zvv;q*D`@y6&LrZ7j7b(x^25~F4X1dPrM>GsSGF{xztnO{pj~*7u&&VDo9Ss?QVL4H zDhsc!?uoj3aV^)!w%nEtm)@~2Vq47HX`1CBfwjzVA<@`VIRM4J|pLOe);mBH<>@qlL;4g z3_9JsOSWgVlKd9VzJDIkyB7Vb<=0;%nlj6(p;XIKaYLoyS;i+1ub*XiP2OKptG;Nu z1m{6>O|-gRAEbm-hd3)8jRtXBGFJ`)sYNvRcXyt4k;jYpO_4PDaAdu9Zl zPuU&9q{^jZ@VxlNoRfQ(vRTc(DLehWwB}E?J4zc@P0x8)-1u+FvF6gdVQ>C;&WXsp z8gY7^Ricc0s8+IVh|;e%hDaM_$3NDqtY#J`sTBFIkj^N){88ocyDcW?b6OAb%b(i( zhkr%?rU#1mT`qj=JhM*T^J0Q)z=Bt;QHyVWk~h2gxz?<~X2arXm#$}oJ=?H@-+Sso z!K?Cob!)YY{#I(9j0h6QE(oY8bUVN>ZO23Q4c>vz!rty%muflZxanM{_Z;U?Yl{fg^4Boi@l2vh>()GO?Ds^n^U+s9QQL?olgjG27Nnc0E zv%7-3F9n#qd{JbzdSyueD&3VVUu7;txPFyc^72HzU{FVL%=NE-{9BJ7vtF@h`^I1) ztA4Y0i&a7QS0*MFq!Uh4AcMwRkaw_KeGF#prN#T%Bdb3{fh_I=Q>!_oQXTN;@|WK zD+-#QbROT$m)Ru#R&ZtWSEt837De}d6y-iy?#}CWN#NAQjNMZUFP~IC6&PR|dF%j} zWY~{c234(Z z_W0CmU$OtUY@Kky+xJ!Wf0kcbWg*{u)44@K;&sgBrsijISL8D@Up{;ErIm~AhO|mi zRL+L1rWxlhJe#vZ+2#JC{M_kITOY?|Uiu&seBjlbPnFs+;t3miEspv;^;#db&e!b2 zGJZbphOb`lE-J>bs0#-KD~F1#>s!heS~7Wo)Yd$SLq7%e0-q$`yFK%Q?rA%{uK90E znF~ApYF_p>r}hSG$K;&5lQYv%L~z9)*1`i%1ls+d$ZR=wGP7yT>faX^|5_(eq`T6; z;T0GElGh&BMD94L&0hCr%lE28c{;>F6G>+05B zDB-$gqdqG;`(x}%j&9~z_m*pE@!ot=sZ`dxCrT%0ivm}JkK)<k%*W6J06b*Ba|5dn0R?&N@MB#YJA- zKI^@9p3C6+)i+h-;};IUn_2z33(Ie3oze?%t5WzlBlcoS%FDY9{!)CI20P|>E%$i9 zm$`=dQsYgPLyc|PTc&UbT|DVOU7Nvlv0HDG+iul-t*Uvh`}`C+vRkAT{Eb?SJC_Rk z9$sgucjsE%>s`x3_nxg=b$yr9#FkfL+ho#0FIKC+vpuL5>+5jv{gWDPbJ>^sUX~`&MmztPwTV|9;TddjaZrE^j5*UoA)HqP^tw;iusC#Cads>+%NB@TBpxo$5{ zjuF@)8E$w@ekS|f#NmgqWB0vQ98Y}i>b3lKX7L%mxwSX9J1l%+{Bt5t@hZ7p{6~MD zdXT$#`L07>Mfo!doK$MVQ{Nnn@zL1#)-osY$4SR6DUWAO4=&*HH{L8=wes_gy4&T+ zUww2h&zf}StLuRnF{$^LQ;*NeWRHu>zPa3B?UN-uYHgo_S9~^Y4odV*x^S$6L8q!p zIem4+jn_%;dMg4i9$zKBxp?;al2==!*&m*};I`2F8hzoNf=Y|$*CV$!YCT&cEgs68;hq-g8oxXDZld!o z4%aJpqTbD!%$)h&CV0!7MYkrF+iu@;>-@Vg=eb`sLYA5pzkQbXZt{BWZr&I6GOh~~ zQ+`(XXgstJ=smlAzv|SNf5jKot!`Yn-*@9C%bY{+pSLz`DzljQC19_kgI2P}rjqa& zA7!b^^?9u(Ww&xW0%{r$2Q=R@<%pT{;Lf3yA=`K!EO?e=>QjC6eV+B|TPbrGnq@vk znaD*=?D0{GxlwQ^@6F5~OADC-J4C@9&cL*~xW&Mdpr7nTzGIJvz$| z3Orc%;g`(%jEh{)_P6gl)OTRh#+SE)zI)6Q`JVBX(Pgok)ZO6RLY?PYmN|D!PWNp* zeR6(r)8_4rnesgcxSr4aH}%aP3;8oo%9<;_Ts5^;j`xL+S0|-R__z-ZEbgI zmR@kP-}7qK1a5B4v-vJ@ZtPQ>3T%b_^HuNK?4JJMkH+k6AsII28I3mA-ffPOH7=A| z#Wcs_^NU$gN)IP)5?>*FJE7t$i+}8-$JVUcJM^aRd|?o)&7mxcH; z>zB>^s-a|-cXzp}j#8MLS;3B0exn_Y99MR?mff6?yzZ8%);`S_PS<+phvv5}IdFd2 zYMyNWP_@O&U+q}6=kK?kE$4kFxl}5ornv8D>pwC~8WT#&deSm&#HLrm|i#b7ooGE5K*NT5axrF>_CPZXmDai_IJUWXN>&S_y9O z>wV;3dV72J&DgNrkvDDLzc1JL#Bl7Xch91i61NpSZ_X8GPX1^iy-Lk$Yhgu{`kUt4 z4{uzuo+6vNG_~-G?r;4+@&AtYi=Dsd{#Io1nsxHRK5H!7-|ZFt9+{%;E%SY0e*5+p zSIXzf%zL?{qWD`xuG`LpQ&;z|I&JSdPn6d=N4xfVzU?}rwMz`TnNy}7X`Z|;|6;*5 z>#46w7E8Q;W-&u6$!@iUcBr25dzq{&bMMD>o?Ghid_vGimKS0*+r`s8ZYn41f0?|w z>~wVTvkR*(F8BH#^6%uu6NmOR-_DHCda%Rq-E!C7YVEB4UAq|HEt~7v=NETvO0D=h zyA@0acR%@fKJ|=2ux#ihMyJ(Mx2BxibNShwUm=zYCoWz5@y^yIy)&xY@78_&&#>z6 z>;DX)domxzU2Z)s^nTNhz^v2EUV@uBa;+UBzsqiOJP{=3c0zMa9^2`dXFHa?o6Yb! z=vmA{#!cX;p zjjX~B)27^hSj#Se^kCZ5_O;Fnf1gQ&T`M1FRW7+{=?>@C+`2K-?w@7 zhP`X6cN}|Xq7CQ2$Ny=>e75A24B%50cq}Kfv+&{^N>%p64J3hw*@Lw&E2r#`lnJaMB`@6?P*MC|0qiWr$Buj=Z zhaMSpZ*z8;+gtHuhd=kG<)Jd?KUm(X*2v!PlCwIo;89kl;hdh;uO*H97a7eKIr%SP zuU{sY%(dOSio26|w3m84O3-dRy4vCWqDPq=7Fi8t?5SOoH$^*1f7Zy3@iKW;$UpU! zeUaasLkfqJXH7SMCy;t@$yc}8Te-Cx*Uh)xz3p$k@acukKd0rbsCQVqjMea_r|};R zUG{sanHypoc2rEB^Xx-!IJZGyLR!^|fOB5I&xM&K3TAgt*x!55rg6s9vsOzy>bhSw zeZCewm8o#m-8q-T-?OgL{IET9sXLB z5Tld-VzYeWwwtZL&mY+kBYkIWY{0+90%!J5YyLB^cIDZp{$5_!#Z$NX`sFiJ z$m^@Tz3e00(B95dP{5GG@^TZ~iu6vgxlSv7Eqd`}&cy|GUZp8w`_vJ_sh0TXZx=GpFt?5erk8yr|LDGF(xzYcTKxx|CA&D^%ar-3{z9T-u)gU z!ufA`PFq((y;I3HnY)1*auK&1w`ez=YHEJIYoCa?x&zmR%%d6(}-seF( zUfb;6CV0p0gQaYl*|UjdPRrBpzgiV%ksB&enmx_o_JZhBy@n?gPL*x=&tNp`oc^yF zTpGbUzAU@)s=DEr_3SRw{*FB_7+!BGu4?CwKIvU#R%p01`BKTB3KsqnhAWHDKG*xc zE0@tK@crhNBd<12Q)F>h)vsY*#JY8su&cf2j|ulUsucS&ZTn7{T5Y@kpTRyf^;?6= z$`37j4~L1ShDDXJ_c~=%Gh{ru!YlLr#fo`}_m6F>3zp{Dm9E|XNXRLpc!{~I$z9nA zOD-xexL9~?zhH(0_hro+hiv?WHw53gvdUlKj-J}(C00CB%$HuZU$KJ8EM%FB^PWl9 zogQcW)|F}QjmU6ew*3~%@He24C$L!k*M0@1+1%59?LM;I@Py74zBhMPEcAc(#Q8vP zD(?iFM@}W$tFjuUb>~dw<0zQ(V(#ZxWt?BOnq6j5G%fz(yIf_x&^7*4ubKU;_O4Sr zJZouKkz3sg`OaklD}9fylezMvt8B-sXUi@wV0C&|xTtyCuk=?|tES5G7DrD!BRl18 zag3b0{LxK|`GtKJRv%UW%=e#Rmw823`ioS%g+IC)_HGy6x9XJq??AqX@0MO|DOHuu zGI_r0dRkdbY-{u8-kwswppA-LQ%)P6Xo=m`|MJGm6;cjIK7Wp`>|Z}+V^5mp>R9&K%}REATikJa`j!<;`{s4t^U)P~yQSrVnAf?5 z3=g%A_xrUu{3ov9 zv~*CueLnK|WKLgpSLSJljz780@SkC+z%V4d43ka85qgN%fC$vlBR@*!Z7?S9ERu zJ0&>rH%Hi|?8v{@x2$-cyR}zO!}?fwuKiP~#k)Uz<#zw$E~Bx8dG5vi-vb`={B$zw z;q|B-x1Y0(`INLcfZQK+DbF? zM#Nh#9h<#JK~v5zxQ<;a`73focbR?Y+gSUc#fP`(glvDY^qrpVH|cqjOd%#h)tYys ztafwNxYoYj=N11wdOy44mYG*$BjyW-ziwr@b_5!@_j1eZwol0= zzM1U;R*HL9T>I;FG_3y0+S&y2HtCr%SbxxiwcMC(fJa#FY2JN0045 z=!b^~DyzF=6n;i=&w4%EM*XjV*RJ%;UvGZIh%el~Nbhc|^UbK|X*JtT4h9Cdo@TY^ zSDwvmyI<05-}-X9F3Gp@w_RUvDakrH-|XXBzNb@eRWUDi>%O(W>OaF2?OL9n(N9a= z44W!T;`j6~npD$U@g#gx!LMSj0Od(L-!(L{Y@4CAV8^@1yfy~k;(E?nJ6LLG3rl3+(seRj$!7{*&YgE|qVl?~rLv4Rj;7n3 z+t$5WzufoT_G^_oGec}F7rp&i7Pt0EM`=I;cjV>2Qj+Rg{85VLxkL^H^5x+{z!@0ZfepY{KKan?6 zh-=sE&nKlyHGg}~-d1q#!>cMSKZToRyQQ>_So^O#v*1C))Je0dL{&X*E?f2VBKs}w zTNYl$tA*mvmA!iz+Wm2=cis1}>>cwg7ls6jXoT7bFDhlbQk=PaxoPR4D(zW`hn*H5 z-IsZ6LB=Y}&6$Nt!4 zzStW#C0ZlyQ2bw`xv5fZ)=oPv=}0N_D3qN#Sbv{O>&K$l3!2t`Y3KXRuhyE%{AXCz?o%87?rJu}>4~L26PF!& zX2bu~U5M-9L(VN5neFQTxCJs^zJET~OW{9*(ccT@e^%ez_}0FC&a*8O?p9a-`MraS zPvBe90*mdda?|!L75}q7XW9OWtj4Pwx?9!y*Oi%`UwOdgamcBXdz>r|T#l`Qe-;Up zntOlIxZ_c-a?mpBQ=}!I@(F%}g#{0CGG0o{MLoK_Ok~-QWtY1W4mB^l89I&mp_bK~ ztV;_xHMYLhEqD@Y7eaC9?*)6kI{%1&KaAs@H-X6-GcRlAn z18?*Zn*)c1w@m8|F`RU7snoIs8&cz6bH3Ht#?-uR@xQRi8@^28Sn>X9%puvYuIm>a zc)$Fyxam3t>$v|62M=6N-SO8=UYFmBC1)l@HzqD$?emhR}sfZUe{Ldg{ zqP5j);nsWK4r>+3rySom*XYv8>QigqHcQ>vR;POSkX3cVNwdEAW1B0_#MHgm*~4ok za`_)l{W90&laJOm-z;+wp1fiE^yyr(Qy*!D zX6PqAWM5SFj`?t{wc;`^#XEDvH!rVbnEF=xwv^e;u$bJJPk9ggT5;QVdThW)i@w-x zY{$H|o%prJ=3aMflc>RuZI!ELKikf$Qua@3uKbL(2fLNT-gOsjI?3IVv&;B;9`Ey? z!I2AoIvv&DJw- ztFF7mF?;S5=|Y89z2})kw%n;=?MR66FAUov6x?5*KCZ>(*ttaIJusubNeY+7(Ad*($czYib3S}pT-;5+p= zIg%l9Uvjc%&)gQ~bt?>e^$MSeuA7yAQRaLpBk$XQ>tC3HSM0oQ_{Z0pG5OsJ!(QQX z-{QAt7g|j<6NrDcGxdOO`VR}AWoM&b{aVRuR@5RLY+9$`w)E7k2=)0!>(_AP*LwZE zQ!DbZZuR%#uWlFSWVgTP7rxIq#l}L-Q1ebqx@*ss${9`(kG};6t1oIhz`369YRW&` zL%WacdHf)6Y2J(N#qLk@?bq+P8&aIvJon*~4Jp+fQx69G6<%e3C0NVlR;t}>E$f0x zEjiVusG{Q2sisrS9*P$2c^JiZe&3m_O#-#Eeod7McU9Zny(1($AW=8vtmPmqMp+(*DtU+Wv6sMEmruhao2;73U5^`I$By8^C~i)iEhd4e6{H*Uxc)N<@4nsnZX&k=1F2K`&aE-yir@? zM&1hbMUP6?{B$b(%XZJId=aa(f8_1FM>Bt|6gg}+zjsZZef#3DbLzWdZ!h|APx|1F zm}94BUdfrNS};jmh&RHo;41el6Kf_#mo>KR^(AC>#^ zrZ4%Uadj>KisLDQEzc_ocQ1ROx|p-6IV<0C^0I@o-9ytgW8xQ;rZvj?sY;bfIkzis zdNot;jMh{i?+uL{S61Y2D7hH);mWfEN}sP<9y#D<@=u^*)#B+4{~1bRo{NjmVU;;# z6L9au<)yrZ7rp0szO>+06P>d3X`x5{i{1-yg2j%@{Z|=0a6hxAx@T?-n^%3C?zS0U zwl6y|<&^&Fg3jx%J9q4yxXJmDZW-e(IVG+wueUv5j7$!H$Ef{1rB-I2;@|7M&i@(w zpNOu{%=BCBb&uE4X=zk?g>iAf8rhlC(?cJbzx(!;Px?Yp%ctYsY#R~-*ZOV?S*9F0 z<-r4~i~fF}T6om9I$rhatM>jW@-E?lGUw)1r^H_DSR|OdiQ`nRmcLGFjOl-dH|_r! zj&E8ZDjoc0e&okD$5*fV@NwB2-Tw?72@jslduDWOa@(70r;@LHnsq+dHuBo?{|p>E z-||*(PWTZVVf0+WcR`engusmFb-yY?ctfrF*6-PJM8rSj!sC|$V(+@6POVE_Z_^Py zy-;GJ%#|yv66Z~uTAS6nol{`d#kDGp2iy+d|H1J5#dgR0CD-rj=NZkpE~nIcj6G;} z;?Bd1+O{s<)%8zh?|%l3L-Y0*tyyq8{cCuL`A(^DwqCEqOslN5j0@*|!N4 zt!=mbx^pR07_Kave#CmYDsOc|^yT1KiFaAoj5w`Id@4#0Jop>JE`MUJz@DA&E+_^I znjLv6Bqe3Vx-a1YoAB(2oeTF%JLxVBTk3G-dfS~@V#2<@o%JN;Kf|Vzla{BL zbL?Jr;z@Jm9*5`+3cc0ZGB4kA2Zip|n;Y`^#v#e0WqYpj^L?}8=Q$>@;Mm76J*<3d z%Ht(N6}NRZh;7@FdhW%_kP4-_ii&&v|6cqUy8k2pX~|D4G5+Evw|WeoJyAOy@t&f_xQ`7tZpmUWaYWBPLwbCHMP0deCE#fOG~WQ|Mdu7b|brl^Gh%L-e1vq z_MtBsLly@gzMa-OOQ1b@bGOR{6W0^pgG_y`M68t@u4eY_W@JiD73(#dCgk#2X5xo^ z%10Sp=j2xJQ+1fdUo7?Un2UePbK}DY)o$h5ONPovEj2UUS(dV%kNbi7EvfqN{`H*& zc`vG^QeIW9%Ukhju4kLO@zo&dZFhGa-g!oC&z82`&R0FIrk`~EDs9p|)oXn@zbfB{ zM{~^|Xj;W3XV$qp&O-ZJ*Vo(1ZkLU<%Xc^MG@sAk62)3;FI2u?r_O29 z(!f;Vc~8UA+lswcZf0CjkXtQ>PTWo@a0V-skj< z{n+HG>5I+^n8ubC{@!4+{BGT)_t|0lw##~nN*|9~vHSghh7`}~wnzDeEv#;zPF!@n zyZ%tN=i!o1p{paevpq1iobu&A1Bd5FrT zciNxW&}(<9v^R43t?296Vphf;J#R$_@3;JG!mVndsU8P?WxbaDay!81WOD1Fdi=7J zOFkW5CZH#z?)pX}c-j4zQ|%|lZ+`Fhw(c}f?lJSZ!ZW?Le*Cz3meSO4v(l!$YtwhX zD!aU#f${vRl{+)G9#U9tAp4X(_1zP$hB?a2p{*Id^{#%>%9bx?+n8E9u|DH>IVf>e zD(9<3*8DvOta$ruFHZ~UUAlBZ^GWu7OHBHt5|pyGY&||vpy5^68$OBcT64V;44)j~ z%X;j){)qGB^4@I^6@#Rg?TS{JxN5~Iw+LCrpyYX%E9Ng+m$7%>2K99-ugbqFTM<^c zZTfe|MKcro11xebdG3 zON-ktXj=U==x$C~9dYpsBYV$|?3RZtO}*}?v*g-cUO#9^(0gSku(a@DwRuz645x<$ zj=Q^8?!T(JRa0up`xAVeec1}8^H(}o8db7n{kyzt<)5R~_QGxp-aI{Ysjgee_Fu;3 z7~THkSMJDNXYV|eQN1?j$(PWX54+Kex*{>{^6G5nNN)-iYV#^c2fK z?OXHF++lrxriFuB<&@`^o0cvzOMbO>ZkeaS?i}6y%BgH^>_L3fSE#tV{Jra8wqk|v z;?C!r3Rb!pO#aBDpBQAANnQ294XI@+Sp@LxWni7~fUSp1M`$p?|oES~ZjZ(W!o!yq9-B zQE+6D>79G+WnWX}+RJm~uevGP#a0x~S#g`!DM~S&(ZuKgW&TnN+S6->Ki+$#Dn;V?DIcTw-&G}H?==t2=EB$tE z`jqz5w=$!GE!XDqJn5X7{if$HFS{eJFkQOis_7)d%`tCxOo{O;i!O*PS*gZUoEg0F z$*-s4_D63VdvYhh+G2}EoZ?%R>1M*N7Q1(4`&E}l@2b&XxlXjFQswp25BH=moMBqA zv6o5u^qIGBqxn@2#?Ab_-uJ#MeWG2*NB^}6m7 zncDbOyfV5{46~z;TrPgRF2tI*aH`j|_UWnncy}(}7p&1g(`>EQOqs6yxBOkPeS$f6 zq}Qkmo>?ZHV(uC6Hq2()#!UhDp8U)!UZAl>r^+kyg>c-lNy5%s`_(`7>$V)aYc$Vo zord_fXJ33u4wQ9>7hlkQd8LY7Va}`eitjZxO?!73YwTL>>b+4`%rU!Z?lh}j^CXko zB?7ZUkL6!k&X#2oWAeu4^RtK5?RQh3{0$dodMIEopPzjq@k`&zDKE{U>iD{=A8k>R zsAMs(c-iU7MG_SgYaJ4bUbQ@2 z?5b-N+)>tD@!eVAZi+@wsdMISK89A_+@)rdSMFTbzwOX*kAEqT-8(NH=Bf$3*5|T1 z;(~}C8$;E~l|GhvH(x%nQr}mxs>t=-y660p7x5+(udLY{xN^r9InS-p{%yuwo%?)u z`pyq{zD-J%{YQKKDM7|J2p?Q zu1gp-W@nqJ;X}jG&#YE2jj}P{n>w~ zJ=t|D_vJ^?ean?*+NXH;?Uwbs-G2DSvaMUAzGoGm&Cm;L*|EyeF&nNxuX-m|N zmNcwUOElecclm_r-826Q>eg(%r5&*B*~}}}i%gzZ*d?wycJq_mJSVqFi+0y8FSQd} z!Tv-wU+KoXdC$`ddc9l(?1aSLO}M-N&+_2=cJC+txv-4=-A}cxk2p?#inII8arXX% z&9j{v?$pFyopQ4;>$v58-^Rm%QzEXhO@P0b?y4pq)zE$kvrR63!E-&KWoYc!pMHy&vwM^7z6{yu ztC6k``&>d-d{0Wzzk8>Cw&ub$@+ln8mM5=!wV;#La#8R6GY#2=27U+pR`&fYdwRO% zgm0<7zgdoM+TJqZGwXI2g;_`~-SKYM+lMC|R!`hj?Nppq$avM^#@m}m9vaNpxnC$X zZHvGg(S7q&-F0B(dr=|^VB6d zcdxHFz+URNRz0m!&r*0vYj%W!;!)<%9VcY3y;mvn%{*S3c`AoTwqe3D<;)wwi%+Za zE>DiJl-<-?z{yd_vux*K-OFi4J7#Ne9G|dDO}M*Fup(j74vze*OwH;lxwgRxhh|Pq zwvU~8bMAzL%+IuC+*dt1chgEcdfDO4Q@)1Rtzfvlb4~E^tKzpAK1G=Q4O|-79_yCM z9`LZ{W!8$=#Xc+fwv=$`u-**`6}+SLFJ`~O<_(s&_din&S?)Gx+sl--Ps^D260(GS zjCSwj>paY0=^<&YdSuduM~#`=Ov@T0z2m!F&wddDD-tLG0r)r%8d64{upL@2509(5^~CV^$|uSW5RSbe>r+Y!X$HLo_roH?zGHP_Jg z>N#_fe2W*0r%z(rwXD?IaQm+FQzv|QDct8}uXr+(H{)5bt|1LXR;sn6&E~kp~$zS=Tpe?Xa05HJ8$ydh$yu# zc(~n4-9YJ9v!A!btv7q%9g z)9gFl_~38Bj+sB1u1(aDEHZ02_Nvo{b>6gNtFG-ZJ>W4VKJu;bO254=Y|Fhl|K)XD zVYt2YgjK~Hl_{@u9;*wVWRUX@ylDD0j+w7;)hw2sk0(BB-J>TvIZrs`(S;6WMdpjn zCV^_=V%^QYI}4dN?Oaz_^yn*V!}D4ueku9FY{4a$kK9`==kv@=dP~6bf)eg4Aq~58 ziq5UzJbC-Bn8)r##j-D-G`s6g7yqz0Z^Ggfb5)^Imz?((3k$X{Vkr8QepWF>Q!Ok? z^$+V)u1EWv5RZe6WceGJM$H#jUL6xpxX#C%+}wf~@tq-x#!-)oG2uai+S zOLomv3fYlbU=%LHyEEvDVDQE-t=chldMl<*iAXWX5M66zy}(iUBHQ+NVNRFKScF%H zlymXrMTIEcnfp8JKxX$&77t}(R>MHK^E#}|G*K~iTbIZmPM&(nsifiy~{m-C1ZNkXLod3SW)9N)vEFjc3d^~izF zd||Wa=a-Am(#?zsH-0(w&1=)UTY}~L4qL=rT(a10|0Z^K{_k!tDx`gi+-@8X&EA%r zD7=mBvdo`NtxhWHmsd7?)_v2yZE z@e^6NUO7bbs&PQE+vHWekGtmfJ)U^c?XZU73`Uvdfh)saT;`hZE6(d3)$=D}ig`hl zAQ#g+aUoOoQ!6hstLxoJwYsPkqcFd+cj>tcO5ZKt+D_Pe@cmyd>FJhI?bl4X+hzy9 zI_>`H_a>{KA3`3#{c*$a{1&Z+?;qxMp3R)V$3KNdD(<@6iKi06TF>=8V)kB^-mG!( zI%`mRxPp|zhOCt_j-|$mcP?vR{t_nq-E~p&w_<8X!dt>7za?kkss_L0*v>T1DitTVd{@ty6#xv{b zrO9DWZ@lYv_lQbl-yX2}fP09N%$3}URuk4q-Vh6wQuYt@(_zbD@5-*arX=ZogsD_q}y zmF@pdkl{V@6R_wd?a(2A>By*$h zpBiR;H;#>;T7d^R+=Vvf8{ReV*7J`6;Vw!rR$*9X@M(H`e#y!@}T#-`Y`^yqecP`SWJ^ zwAn{GjGD_8`{mZXTyMGE<#yKXU~`>a_nykF*dx66$*fxwuDzZc_RaUqxlpUzrTmqr zf9Zs9nC!58ptDY6-fa#JZj0U8mb_w5XZ-Bq)8&)p;=3Rht}#LE-xo5f~&;myg5G4=HfPY?q991(qAn-EbDf9md87h z5XOg@yUSm!Tky#}H8)Q2@AXY=|CT5{msCH?(SLHm!xfHS=Xn0ut?ao~Z@H0hbc#js z>kav`8CFvdm0YZLyAzmM&iKP=@zR{E@`|0)woeQ%y;Z*?hqv$%=Y>y> zXG((X%b#yuub?5Rb?o(-H(Kwq9=$A5vj6G8_U7D~7Fp?(HMz%b&)MkxRV$Bqi+;xW z9Wi{Y@gB~*N&~kyJ}C=)l-W>Mwmvo7X8A0ISN59B?k1;W^)%aN>$ZK=>?!pxZM}GY zk&LcjkM7TUVgBU_+ppafHM5BM{C7fyQ<(?v_NTtpC0dUz+6J25kx_rK*GAp>qQuj` z7kW&JzVpB6c)3YAG$&`$?iJR>@1!o=w3^!P_#$-uv~w*lnvWlTvU3?%*Wq_!|JwWw zmRv5WwV9(ARIj0sweBNR?58jBJF^bx{t}7x@7)`{YIpFJ#np>S{T38lN_i+{k|A7f zJ7ufT7HjU9n~rM*cCA_TX6xMvOJ1;V>pa-^WzLEf4`nZA6i%Cwqs=eee)O*Uj{cU_ zovj7N)+sac?qqLJ*daaNdUwvoN5ASdgCG7~tCv%@(3^SY)jp}p)V|iYk>9f(cJEGD znJ)2mYeO*amZIlBt*xDBuQ-+Kc>ZMIxh-)irz)2E-@M=Mv~S^bwI9o_Zu3)k>h&Qn zw=nShNqMb}Yp1&`crGVDm3_O@Zr*Kji7_Sr88qLens3=3a-QdR`wYJbym;^|oiLQ{qpR za$WeX&FAj4wxapzgoM@E^;bl1*dChpar>vd*FL4Ur8C7$Oy52%uY0xZ*`{}{dWJ}U$?Yw37W)|8is=XlD|LIsb~5w4Y1vY<6$vbhTlAzfG8&)j z{fIq(I{ReuPusflk8W}Pi2ba$#;S5%V!%JXPLYzn7Ha*aQ)T2VLz80K4qzUHo5ech*!1a$><53Z&n6xy!|<# zu=cWa8e3kdw{&r$>BDuKXSzMf;`~(-aQ~`Q@DZaj`^xkFi%k61UVgDw$ua!)wDNZs_#HAHmDPSd;L;wrydcj*bLN}ldw-1TQ+&64Wr!4-#^pWY1<5B|@< zxx9MM;*<9tMLZG-6}+SUa-wb2raPtblWsoib;`G4!^TC|!nf$j@~gak z=B^aFdFq7ghYm1`TO8oLz5Kc3#>T_CQPnG=wAUTDYCGljkt^Pxth8lrr7_FH_)!A3o7F4wI3vfne4JG5>+ekXdi z|5eufV5|O<5pzlcPv!tMVViIE?Vhb_0>iq_=vi}Qo(jm8 zm-c&HS!TJ&Qoh39C8l!a^8XBP3(YPq+%+}(OxuffnN3SCT>ttcM3B|@c&(M<-eqs^ zD_>+cIbqEl{iNnRT}J1#t8ebe{+(jm zx_i_7Ivm{SX>g7A1cF8~0CsgSB=kS31t1CYq&JT%t$oGBH ztZTpGCoGWk&9V=1J5kml8&#rlJVoY?Kyyd;(UWVd*XD<0N=$osm+4uIx@&n$CEria zQ`?Vh?tXS*^^E+y1II0H{u6uq+@?R|dhOn0u4kWJ+P=m2%72F4bt{hR%s<)jY2H2O zzvd~(oq|dBYFoDFMQgWB_#1MQ zIseaXj_pmRL7Te$&e=yXsm)0h6a4aN(j$g&X5;M@7t;SIuz2|DcRNniGZ0?zcS5p* z;rT_Ee=lQXwyJEVu=dYp6vs=FPGWwQ>r=R6o-d=um!h*kChA%CpxznQF zf7>xuTcP1d|uxnq6$p~n{sC5!kb#S~mySZ_OF!=~2o?pd|k)#Y2Bb;qtU zbLpAs@-<}E{rz(+vV^nE-8&urj;ltoU;VaB>izXbs3CvHU65%ZMTq}d; ze`1>yUKKF$*ZI3nTkyeJ;n^!;`Hwd042eh0D_{ARJouwwA*0@}Q1DCMrnjN~$nt-p zUh(<@(Tf*eOq96r{A>%Skh^KEeYpRr;=gh3J9@d!b#eOZJ_;9{I;UxqaC*e2bBDRD zQ+L>g{bx9meL^=pVK%eS+Kfpnxl_;Hyj1G+U061>Jv?=x?RkN!N^24KIeeWtP zn&G>hSJkO`RrB)++qe9Uwb$(FOmx_^U{dRahgWj8R0Zt*5@WyUaS3a#P4ijLFUt&g zMa|E-t=0}<$XR@4S*%f6!kU>kJYA1FsG3g9uopVupTQz{HGQ41)IWtc>Oo6hWc#qz zKE2ze)_iy3QIGi_)~-n2#lOY7fUEM;@tw=VA74D>zDkwdI$`Cvo7o#G<;_3Mb^5z# z+MI7O7YpA0^bXj4>CAEu#A%cvT-*4+*+z!U9X;(sjyhuec<`ChvPCT6lH-yL~77Z0@X5lY4niW8=+a<1a2^mNuQQr|uT= zwD8&O>C#)N^mx6c8~c@&SGi{kZs7$lWTj?vwg%6i zq1F4e$aY#;>_wr<-`~CXCihNQm)CyhiFajdwXyFl**SczZ(I9+Htlh~`Puwa+lK!P zmo@m;{|MQ?GUV1Xe$SJxA(_t(&HQ>Z?WM*({~1!aD^||syC<&8Ec1{Z|GRDG%gt}vuNG>zMJ=lcQE+p4%2O%-?LUK7^SOyzYD3C>eyv~eiA$b;HW$|; zq03DjPfy=*bv}IJi|?Al6J|a8eBQ+Er@c-LzDYwrsU z+j;FzD)pb;U9jj_!FzEh(NoK>-;25%B3pCmxIp;U-1cWlJ12ZA&3|&Dx>T+z{!*jE z_nS9XIzC*|5Yn%b^?r)hbQ6>0`SrT_ucS4%{IUCah5zdQc*SM>oS(Q|EO$B|34S@{ z+qd~uk8>~eYyAgpC}5Ab*)kz~TZ;V5RZ_p(<4?Y-_wBu9s3HF&@5%Zni;OnyO3>kZ`2BNMsrV1~r!DR~dG>SL^ys^SPbX|&`}cEg?0*K01pb2i z3jCKRHFdAq@>8pJ|M?FK=4IPWUNyh=I?hH1rr2CwCJ=I%)g=vDp^aL+k+`K8jpXYEz7 zO>+z{-#PwN^L{4B?dAGK_g6+*E3Arlb-jD;+J~r_vi6}Fq ze+Ib>d-wkgQyxTB)EruFcqqKSKu%!QeeeGaCMsE-de`F(m%aBsqI7x1ckAg{CjS}U zE!}(Deh#DDjXw`E-p&8|pW%)6|04{#0*nkyOiYZ-%*?EejEsy742%qdiiVDXi2{X< z3KJJ@Jb2L{q2S>MhmQdb|8FsHFfuYQ+AIG1xTaR(dzEHy?*2CmwuPTaN?IgRxlheb z?{eWxsjJ%j8ZoB|yI05@Yg=LFvUqjfi-&e>dxeVcUVFv0cITz13I$I+1*N^??H^>t zdt7~_u+epg*b0T>mMXcc$5-jNg&flExL}Zay8cG~$5nTo`Wu$M3t*XWvTfnyEeqZW zM`|zq$h=wN+V_tdT!PoG?|&4~a{2JLGiOehPg;4Ug6Y=QgJOaaniKCBi^WK%7Q`r= z3)g>ZSY6>_Ica;(F{Z`sf7qrmyzJfftNO{uk3rMB*BjfdxIAN-R_(G4)xP#l>Ply? zMR%=TSGT9Lzv1qYWlJAz{Lk>_N%G;HPDk%va@i%cNBwVs(M|u=eNV5hNf+QXyH?_K zBsA)Tv(4T0f$FD@kK9v zbj}`Lb$5x#y8e}sN1k&X`*@dKpf@~d!Iq_K^PU#4zMj&%i2dE>i5#Emk6E}zF4pb- zaW3>qu4#i!^YIyd_djr4{&G!SOXG$^W2o}+g)5HnUQb_reQxx+^q5sGYZoQ2f7xp; z%jzR#|2OcSRr0h5uEa*g)-Ahcbu?FUE${eot~z{+_~Rne?&<3Jhcza;y$)JfCcL@r z?6zM!iYi$n?K4CITN0`|HXGWPoJ>peiNDa*`;|9CltH zIU3qCYrLbsNBm9Hv0So=<6x;J!{I|uw#J+loUpO`N#(P>PtV@7|NBdA-J*@}U!8MV zwE45FVdkR3gl&8L<`n)Ch}C58TbdC*UviSOV%|dLORAsFERCpIEbJJ!DSDE{=Kl;8 zQ^W(hUK)xn-@mZ%S$O*?g>pScz5DMMJM9X5F>%#{D?1#FmL}gad!(JMre9F-%Y@_f z8IhRyX^yM^E-egPP;h8Q_Kc^NuP#2|Iy3FsI?bfQGn}QmIqN=uSz&egsz%l0>;3;3 zyc!nnh(El&kRx~6)&Mi12@?Ame&tw5Tk7eCyXx-as5o!3yQ=F*fS$;cU_W~g&wnqj%%#h1Q+bzJqcr?F)GsILuQn2^1_ z@2^olPsV?SRf>DwHZ+Di8nke&DmIX^uxz|`%=^^K-b>~+>_V*>PP2*Z)YsK5fPqV7{7BJ2g9kiriENit=BJRKR@Tib87WvV~+iGTUH4Ix^>hnsBBONl z>A$Z`Ro1_?-*P6qNVQJ&M|hdmiG);(tIg&ebA`|EdDYBbw5CYs@``YkI>z!9VX3=B z_8fYA!eYh&-r2v8a+W<@LXa47zfpgw?|8)G&SXs*;Dm-%zvvk3A`;I9d*R^L( zHoLlc_3NEmq~euJt=X^FJxa()pCd5$k{!qOX?Gw0XSig>X86jnVMYG3@9)kC1sJ!m z9;DXP2`p+8kNT88&0Q35JSFp-l5+B#eJ3*C_ukvPxWDHf zmm$k)E77S5kq7?Fn!n_NEW6A4t?@cpYqNT;rA|C?L2B>u<|(IRYb(CjS9F>Aq)Yr~ z*p|+IY;O1w8Eszg?{*ijEq%1M`TnJ+Gs3Ey4HpOAU$$UXZkTgf*mc8&Kc`g8xh?cw z@cfm+Ien5V1e+b-6>eHT=RZS+_}iBmw;#?*Zdf3vIjv;%gX#Yn9!^|onc32?UP}H) zrr>SOV8x?)H$=lOPPcKqn-Dv@Uws|p4yMJn+S)u`X)3$^ZvH;?ZVJ;urk@u!6u;-4 za&Ye-uZ-2DJO-N-XP#Vra>lgIg-`x7tbcFBET-#PEGiH+S@D;_br6 zvX}pon@?Ek*L}8>sn!=-rCi&lmikGwUw)6WLYU>JQ+5}aj!)V;a}iT>`5hm|H+`I$ zXWgB;uD&u8-d*;ieb?30u4!I5k$Vg8gui_mH%;~A;@?kO)^ckVDRbq&=UDOHRnX7j zfN0bFZFBCtYpR&X^k|lxQ^qWjtCdp{qBu9-Gh_|n^(wQwGUvmGgHclsN&8H{$gsXc z*~7PU60_oqwF|3+^sM?#BUs}*re^Ck2lR#*=Sbz{PCa4DzVz1X{|tw-ML&NHNRnRv zivN#CT;iMA8k?`5+snP8fT8VMf&V`%oqxBO82qxePf0IQxm~;EV@b=!SU+1UafTVk z7H_}Wvii(Am)&w69Xh=F226~yJ?EQiI6bruRiy>)YnY>7G}$!Xf9W3idpjOy-|tv# z#wJ~?rP4d|&7-3VQCl4Ip6~HqvD@O6e8GyV2SoE82Ar1s>F@CLN*%&BxaanfWv(wHyUN;1lb{=2aC2@03^SeezjY8qYw%!}I z?48VPwe)`dKMvW=9y_PKuKLO!Z5gH=-B-WV`K~^{;54zM+i8Ud=QRnOT(3EC={lyA zWaE2#MVz)g%2}7V^2m9+>5<7E>lO-R?_1E+Qq^l37B;I%byn){>{*W_mUgBr7t*!3 zX{E4dch5sD-4e&uA7!q8UpalnvYhV?$EGcugiPOLcQu zSB0b)Sg7USOYXYWoD(u_uiuj$G2S_bqS1SfhTZ?q!1wZj;OgTSI3G83^D|AFbNl)i zhoyTyRE76Dgl#)4daCmEgFJ4WGyMT_;W3HRW-~qJNiG*1XedeY2nAkfDUe!q4YY@9fStmlfSE_v!u1C*@xj=FP4D z&v0tP;RR<^Tf?q2_g6&xXK+}5fr&M5nc=HvE8Um9TwvYiGR^&B@SKCZM&}u-uKtpq z(cyYeaetQ7t#F>pCj|bc-_uZ^@r>=S#P`0?Rk?AG9x~qCX6`comlKaj+@FM2$+~$G zzxM0re|!}hUF&`8>aMTH#m|3_i=D9jpsZoQ6^Z0|)2i$)Kc18)V!CF(-=g@;b$^#7 z2xJs%moXlGn`65sqh~|V<4t0-j}=`x)?jir;(6p971m28Z`wkRu4j?sy&>jp^fR+_ z|BTfohjn?|0}dT|Dr-=-F#Gn*sA;E!U6$G!cwdp`$d_P$>8%wb|Ig{p!YyAp7e6>V z=@83>l8;8GeCi$aXMN?@%}|ZG==XrOjl<;&3$N5aUsyez*2X5w~LJ{5c{JbUl4$?~MC9<>LpCdqG&L$2f(yl;mzZ~8?e1yICAg9T3&S;zm}DhhwQAfNb~0I)vF>?FWpOs& z-;16C7Zx?eJY8(E)J{d~rNKwt9K#Fw_fngux&~QaIoWhtp*QM|*pjd5%frts`NbHu zezDj3zh0Yam#NMu&idVTYqn+c+E!luTVbXv3-&2pSXCf!!s*TP_=~HW+)AYUZGXmS zd2jfYc!WiD&&2~3bI%nQ+cZJKp!r`p3+hxHdWM`@;bY_;T{q2sR{_{nptAxj?56;WNAbHax> z+mF~={jkMV8;uE^1u*Jhz zb;r8p%q!u&rHnYD4Hd7-g{m}jM2S^FH;#W7Tj5QRQ0fI z+w3bB#BcvTa$>E>9hs1`7k(cLxF-4L0@MADjM--5G7tLhsm=*nb>XvQk0^fz)0Ww( zA3`itS$Cdjow)7JWB&xsN2Y!nNB{72dpISv^X}3xH?cI_ZOeE}1 zhgfu$^xV3V6a2!F>+qYYB6StjeN#79gqU+Jw4KQ)zXF7OI`Y?yK=d1vYCOH-yUG2>xvlUc5^BOvdS_hy0MX@3O@7I!Sn z=~GA&37R*fIqi4zQp;+$W9Hg=*H?7~_I#Fmw9mV-B3ve3{;pz9!Lc3M7fW|t$W5|3 zpX<2iu>ZZquegs|&5*xT{e1>|yXB3Fl6@T#jb87RSuZ?_ja$UC{@;{+U&LqTu3r=gbE>+>+uPT0tz>hPIl+>+%p>pJc&|JH!^kWK_U#Yu9Mu^Nh zXwJ5Fqh=-NQ)8iPnqTic`Na@i_4rytx&U*umqex1XVI{ut$Pkj-Cq%UMQTdX`7gmt z2Eqjm8?QGN-rRWey^vM(k%jBN^i|ew7ie}VGJ3{c)fn$y6UEiqW~v)8X}Q2tiylUE z{h6U%>%F=6tV{bM!%}NvnR@ou@7}7oJjW+7SC`L(-ExM#0Y-j*mMXFZ^+8b>H4G&DvY{Y1gXw zl7wG(Tr>71U+B8}RlxRx#;*3_#mf5)40@a{>+E~G>BAI_r=4jQQ~8z%U#R-Z^I7xv z@%b^_XSj+^968_jbLQt;Kbx0EXq}N4YUsKp^TDM;VtuGq+qn~;+NJYP4}$;)hg41%Zq>pt)-TVC*iq0SnwZf*UQ zakHOZ7g+X0Vb;>4wbfG#5+eJ)9e5hRI(ok|_jb(+r4JLsvR{XB75c8Gv^IRWwaCR(GZo#w78l@x?Anf#LunM%}z;A zn)>pZ!op-xiFJ=vy>s`8C3r-Y__|tsTYPzW+~l2EEmDe?7c(+GW0~=8dHQ>9W8Z?A zQm?j`zG%EDw)PNcwo6 zc-l7wbuj+Ac(I{p^__)@d;3{->c}4vc=&Lg_W5Gr)!Vm)?0e?BDrB+kgqJV%5n-~uqE@FSv+revhT^2hE3$&-OlrGtbLYJ4ouj-V zmw7Kwt@W;V*r8v@Bk=L*X`|ie4OcmRST10)BJv%RV%DCSe(Mcib}5T43c9niZRQjK z`#9^4MK!83ieJv%`)t9f^G~Pc^;w-?Y|PxR&iRZh``h#%Q{8*E#!1Fxq-NVM*7m$~ zY_Gwoms3849?g6PDFf#RRME}xP3eQ;k%^!F<( zw%zal($Sx$cmGnTbJ5c#@7%4zD=d;5=FV-|5!zeN^mg z_i65~8Tk@BJIZFay-nS;x#(aQpB^{szQ{5r=Zofd_c+!&8HF+$tmJG6DdJ11fs(C$^R*Y1i?&()sboADIN_0NBP4mLx!U;Ux zU%h9~BvCTe@HR`)ozh$4ED%GI4 za8-k7QJTcXbnbu&;WbsoOs5-HO0J0)W{mJ$^5Nim8L=}H_T<0SJT?8IMuR)E&^dv< z$roH-AJ%wf|CV`2bm-mx3=y&$f2bNeZ4KmNmXcd=;y;6Dr)r<(>_X$s%edC9*})Qc z{$7+oE3<*R;jydp`-OWBd#}Dy)z!9o#^qkuw~oh)-o3uXzhr*jJh|tFdGa^o7Of0a z*q6%WBC&Th!`by8C1-DD-zbo=ky+zz`W0o5=eJ*;`K2QB-0Ec0iqwK~{VlUr@YiQB zyr}CldYS8^wJ_af`68y-G0JxiE zqlHJm3tXMO>iY2u)4XonI@J`-b-{&W(S@BW*aEe_>K@pVx9t7K7bT2OiY;3cH;6sR zI@}TZ{IaChr_{DXAG@Y3{m)SHsOZsBhFhDugEhsXC(FH8Ucqv(XM60zqsE2=!}P1uk;Vx&rH2?B2aJd!5rqW zjgu-04wg?@!nCL{O3V2of2&@K-7V>+&hs0!16xuE;DRIqWBtvyrRyjgrn>u6VD^M{&Z-&mLMOJTzh_(0&N2OS{)~0UG%Q{f z8{Ii%UDcnO+L{#=WFPb2{T4*R6l;4^}bH>^Ss~k!eS0P0XTZ zi5*(D2?nvzvRYe;%|0KBt9r`kk;k6DU*{W_$syL`kKUd4Rz3CRvFq;CxEC#J5AE)f zuoV}0m|@6ndpJi{Zf2mtXPTuH6w4Mi8I$zC$0%QYJ9?HbRApv*Pf?U zMs!)S%jcVH&W$@eSy%1u6?ImPJ#t9z9FM^nyKv`KEfXr=|7@OPd$3+Ed696!p{qj8 zE8Sg=Y;k(klcg~8io|2HH#&k1MuJ&-53Y$fu&@^HVm`t9_pg-bgab=75;Fn?1s|l= z&-nQw;SPWF(OL@y^Q`^9r9N`+iL2$?5T9|n)oZ=ml0`EElpoayvR+#HHuQ^0nzUGt z>ggR!uXW1ogre4c4iaYJ3plvka%qzE?>E!k1GlEOzAu=(hAd~-cYI)cmbbAzSVyN&O1G}%#VY2RPU6*5FN#0l%3VLh zv^be}P1_VrqEVipgYN0q4tF<2Y>T&>-||;7=w0D~*GKjy?BjH3 z-gv3xkmmJ?^PfJPvBF9_Zd$m*i$+yEW|+#TZL z6c%+CZfaQd=l3Cj1y84c?7by-_pngznhlQHE0>EuzV^X**0wKOeu?!hOm)5QbNm|f z>bJ%s5o}oaaWwgnhf zdkLJ^sXVLe^4->pjrqOcy^l8y@-y7uotblJX6v_(B%bcd#&ZY4er>pH6!N-Ev4n}e zp(U(PVuyIsQh^Oe7H6K>Rh%O3kvM0AXqK&`>{@{fyhjf{=+V*HXd0ZDI_ZEuTdGwQsAHS0|MJWwJ=QxfYU0GFi<50(? z^&VlZ?*amPQg>%D^(|Og^v5}%%k<2x!&m%goLSZOY2W*gT5ET1a-O_Rxy9~TD36KK zezw$(U1xWwF1-h@>m$*Efrt7%vMXE)Z0{08wz!-kF2dkJ870eQ> z6t{$(;+@Qx+99T3C869mCrP?N$ZC;Ad%a-wl=xjqHqkLRR~)D?DEWOfT=3$NY2FU; z{BrG82bvzWJ4bi;M4RlNVdK}kURwVnb7hr5W!$n0Ir1~}GDEUwxceH!J=`$u+=Iu_ z7e2IaoYbdqOXece_Rx(Jr*2|)KQCxuwC%@{tGknocBX7R?sIJJme`*=e+37=T$$Wg zzwNHFR=E8SpU{SloEsxfGx4@vKcX1J`6zp%dEv)|7r$6#k3@;?E)|??RjJm?p)6SW z(Ij4~Lw3UQJQtf^oifpDKH4$;UCMA=cCG{TJ{G4WSU`n2k+PpD|CZvX6QR~LFcKcgT$^}Tvve)JW=WXBt;9=6O*QeRrQ zCbM>tibjCF(8`_8N78eI-mI|6<2z$q&UCB4>6c}tV8g#FBJ;#puFtWyRQ?{Qr@_Nx z?vr?@?eLMXbqXhb?vVI7tGM9nR_(<{qMxdM_SsSC+JBp2!e*T#YkH5J?#<^F>P%tH zzPQpVSwbOf{vZ0;a>i`e8Ih+4S8G4(tiG1m@dF^enw5p zP5I!kf?!>(W8zQ0ce@5puAcs-$<^f4qIK)d7JZ3bUyxXrth;yNr=Hlwt5zJdSKRr7 z|6;@99pc$$3#OL&x>rX={|OXa@!9jD@xMv^N8=Z;Dm+WgjVtHd=*S@TMS;=L#bkrj zl=TsvjnnN`WE@eAubC1gKl!rg^9z2n89CO^{kQ%jC+7>hNurqs+t%ll=7?LAF8cLU z>Q3IOkFtDRJo`Sr-5R>>%-0@=nJ&*BuWo%MxAu*jJI5nclcPI)mmDZO>hmD8w)*%( z-t8`mA^Jj_ITLkuE1b)yOWm9^b#>!5-g74>{bzU>)GibA@3Q{P)|=wVpBvwuu9WX; zxwO}-oIOd#?B@!_0#iYSR+H6*;4^ zX8%<01TT~6&n!t5x-~`9sV(pV(|uvqqhH16yE*2q{QXN%g5hCY-yR0x9Vd=fe}5;` ztfL+HruqH;jt6%Bb$^f9vjzxPPTHr|BdyG@;vUHtwdYEDK;Y$DWns6zTse1l_Uj|- ztj_Gq{=M?jfd>gk{3d^@by}i!OzqN>841xwB2&Bs`UI*(FRWj1G0p$R?0HFfTQ;rD zxLLG!*R1~xk9k}jmMt=#^!dfdpd^W{;h#@GvRpQYQIly?%7O0+9A#DUmKW^}{FJyq zT*=y8c}1ElByXeOq2QN}EgsGH;*Ts)yzY5_(IK0%zq_Y+nZ_kVQ|XJiX zbO~qA4__GCsUsTsP)~gK{_=wG+-Kq}T&s4+vkQbWGn7hguiXE%>tP8W|GQb9*>g9) zJ)nQ)?^k=5wb?&Z|1^8r?rLFx8&A~P24TAES%i4Zd^mV+po4F&i?(&I` z0YX8UGk<=XawTB(t*b6duP!Wqe&K@BOaDiF51eFu!z}%OcP`X0kgW<|%Kg2;<6+zK zyC$K}IKq_-J{Lw-{@q*I&AQ@KRbZaYv5%?satb#@=O#b>r;w@D#<6Dm{snQnKAJN# zynKF9XT>T6kxJV3pfj2aV&>Z%+Hmg)M@HA= zMO?ONg$JI+uXGPMdtOw>t8?OSgX_zk8rK`Jr@EEpJ)N<+y?s(#oWP^kIzkPvv@S5U zTlBQ9%rEbpdM^2*(c^m?!!$Nq_Oi%qoqQ{?*_3t&Z;%eQGFf6=%rkXqT zjoO0L58r(9S^btJ-`c=Ys$s;II8AWN`C|JlZl&$k`-LNUqvRcoJ?-Tkzjtz1thji5 z>R0LD-e(LeODy^~oxW38yuh3D(eFdE=1u;6AULk0|C!0kPj1^k9JH+0{?VCO#nj4l z;@g1($(N4)l00sx;Z-YI5O(VLqrCZ6PyaJWrSDTxVmFJCdd0>qk@xqXlCd3o+_c!@ zFBOV2@}}n5F7=H*%&YLQXyQ?GfwJB4Azz(T8MC=2ZBjQnB$#zVWMTMzXGi@LsF#VtD6#B-hO}1xZE;uTzZn{%7!QBl9z%$Px)!xYUf5xyVthol$Q3`R?kz_ z;F4e#)oeV!^j{;lO+bai%D_lgp~#qD&hCq@Y}W4GsP&^|VaAfC`#5QS@mn?}t#I6)AJKQoXLY0hj2>;b z8`aB{f1h&aII6hZ>|dfPYjpcP7M*q8y|Z|vS1w3Wi2kkQvGSRfZ&ut5Rk5`PpBC_O z&iprV!FlGJ=PcXvi!@vwsOxW&>@`dk+7fOknv-zwcl)jQRlC>N&;Rqv_lAJj8vb{# zfuaS5W`EDWFc&}dN$l@-p@#lRs)cX=CM{b!eezp@^Ey#9q6K=-9`l@F z{-`N2HP+|G#^ZYevzGr_I(ymXgRR>``uy^j8@jWeKe^Q8+mWg%EL=(rs~WZihw87r zvvKYk_P1iK4Qp3iGFW$ElIVMBP9LqE&oAiSdG_hx=KbDhJ2yC7$!z@-mn@dvY9Jf_ zJlwwUh-k$3mUjg)Ub;OlOE+?@oFQ)TlAW)2%E`|LE%JY2ysmd*zYc}~_T=ZvH@{XU-rk%NS+2SHWsKIQ^Z9{uj)vVm z;M;d8A#7hDbIPITuO%L}>Z$%%r3K$8_FgW%l3Yv~82ho+`<_-42%17W}%alk7MpJm_hB zQF$|0qH@JKj(mO7F9)wBXdV_UJay&IpJR`Bg*H6(cx%9!weg`I^XzGJZ|21dU0=O) zzK#)JK>YgRx2a1Gue>|upPJb`N%8j#tGNp*=5Ap(ablBoTs3<~JE!^C{)3E;i(-vz zmrl_tD0|9@>tQO&caAFgg|b-{Z7D$>F$sO1iA=sUyGh&u?Ep`$VeunzPym@5z18-N%_W zxskO{=DJ>5>d$%c;UEP4yqDA~n z<{9}lmnO4?T;eQIYz|;vGy4w1?}X|Hf79)q7&1+ch;8uiIaub>RZ%LQYqNH~pqSLu z)r>!<9Bk!!8h?CgyvWWDZ>3w&U(&dfrf&QGLhD%H!j34frA;TFbTlR=B{rBV9gPsQ zj4PB{@X1CnOkMotKZYo~>nm63XMJ$9I+?dlF?t8%=bayXH-Ed6!SwI=^PmG~Dv#+M z{wMWs!Qzzt|H^+Dm}_0!&a?CA^ObYL>{Ti=-)KL47oCw?ch7D@YTG+0&UC?*zm80= zXxkhvJIA6Wr}MTRXQe>S44D<%59)nRDtNCSFokL2lc}fs*7)uJb?(B3KL_*GtUDIi zuq@(O!y98_op8GU`u$hROS|WNlulW=<5PVSL-9@z&xnU2H=e~Vxve+taceW1-5-Yt znfJS=^-om_H9X8Oy}yI!xNeVn$e!dgJFh+CKeCt8KW-JL(Xv-zBB6m7FKTKWU3B1s z)6!bUv%ge6pPs_}EcLTf*gco^HICdq1!vF53Ld*A^GoW@em#XnFXlJ$+6zuy_Imp* zn_~}tD16b03fq66?7`NQ&6RgHHe9moe8-xSQu19etWK)lu)!++N!!M2hIN$KOXS;?u$4_-(4aqiIrgcj$A%5B3kEW_}5fSpDX^%D}PiKhQu)Ax9b?TAr zMZ8`MyaJ3>ns@roh+8TphSq0ji`t&;IvBFSXR~PUr$;}OS9me)-K!t< zF2U#h>Tgs0Hcab1c<7bO?X=r7d4YNLP3Tkih4{_x9+>B|=$QFiLs z%G7->OUdlTuGXXCMc<@Z6q;|zyZWEEf4|_A?83j^hqWaX9X;-DHQ{TDaP^B4Z9lR* z;+DGLxfDL#^Q=0nW_Zl@u|1hLGs<(n-(q$4(j8rsmd+^=wEmOTZf*OK@#kH>YfEok zlv@5(P=V{1vKWKZGwI~u5H9QPbeCw02VXs(r832S{}Q|-FRE1N!51HuK%wf^a&ztLLC>xXR_H{eYkD_<{6JIWM-q9#@KajbHeWF~y0z9l*Rs!KZ zi=(~t-0{CoANl6|bw5;=E_m24>G#K=xvL#37Vl70dGvH*&{o|k(PyTbvM!Zx-o(*l zR>fj|&vt3Ph=i0m@99Z;%pFWeFS0mlDy}N+JZ~v}>zVKBJN@SO7jV2Ql1xm#$m~kCF^aMxf;)qZc%e|iM;qF za5Ho8Q6BZRlcZ;H-<6QQUV7$rvbag*QBw(l_NH4|Ka!f&K2Mn=BlDT3Iow~y$?fu{ zrFX;?t?s>vnx+%K>rNRfXT03jFFVYWub7GLQd*}acjwA#)r{Ei1yf#WuaA+@Ocvg| z>-ohs+G`dR)crZEA>uw!%Buc#vtDY_gNJkY`Dz)X6s|{X@Lqo_n$_TfJ@4^-+Tl4n zj;C+@%=@FyxK=Ic%+H?i&Gi@me3aUg{d<4fm#4q}GX!>jGgAvHz5jcPj7`pu>Bb^w*t`oISFPTbI`iW7 zMNh)pxaAErf1iKo`+XM2q;1C?XZ~lfns+3*wCSDTf|Z3QgWdl#^n2}_dc}15_6q_Q zP5-0}HMj1Y^8DNaD~AgX&w9^Bu{9j|$dWs4YgT(s*4ewA0vm3Y8`wyT38j86e?LX_ zunWVTM|n$l<~lr+++Sw8M9+5DuNSO!YNm~$yL!~F9dgO?PPfxan){CN)yMC-A3Hsd z1Z~~#%$|9mSkO$!m}j@%#p;=oGmqv!QoW!T@8aBmGyh-Qq!`%r^IW9 zZs^jIl~C2VVQn?(Qm0i`*Uj@@1MS0wotN0j?v;=9z4>K}((ZGe^DE+~WH4^qs5K*hg;|XDUd5sZT?!uq z0`=Vf3a*^=YKCifx?ID;%fhLB^;=e1JX3vS%JjU3N#fA5a;-|Mr-DsI`ENz|*m5Uu z$?xG*5fh)e=j^gutFzZHH?d|HX1ie?U>BUTGVv|<#wT`b9TvXVGL00AD7a9y-XP%W zxA#Z9ij8}vH~VkOpR;UM%k*=6nrFSH1RUSKy4^F`_@DN(uGwan9^Rea+;0%JlWBj5 zId`JdkC;LW*&NBBNrC?v9E}2Jn+7`=SYBaT|3qzp9Piu-v$wn{a4ZhFJLzh}m&e!6 zp4q`Cr`UDiC5uU#Mz<6DH~IR?`A178{cCe&I5H!nc6qLb;QH+=ci-Eeq#*nLhoWw> zYu^3iR~E*-+x&D#-k0p~E8L5eEdRaPnrHUlmkfjLQC()f<#lcA1*JnDHWm8+I8qX) z=)`2Fm@sMYgx)FNc0BmT>bBzDX2B08Zqp0RyieQ?Qd4H8r9W@>!wUSWBF^+kJh`o;>$QDYOPo= zeWxsE>izkd`;PSSFSxVB%{6{rR_wBr;`h8;7W46UIz@>^Ms&vI`Wt=iEq!G8MO8bS zNlR+6bN8ztt)SDlW6rRKMcJ}@E{!>myVWd&C-la&8jUqg75jO@XMNVXJJCaJ=_K2S zVwq>WjpO@68lw9;`#NLRe$?(*xJ^;yTJLX{dxrNvifmvwTE!{*ESLZOOTPaM3wNE& z3j4L$ov5sxVSx=A7K*0fURkp63;{tU4-JEl*YpZV>G=;TTJ zI%_uy??~ddIb!h4==J0aA-{c0o*WU`wc_Z;o{iy#IwDd#Hf!tNIa>E%T0lQj)QT!? z%}sModweqc6?1`w_1vzRsZl%Kx1KIkE#+-JF(b$8yxjuFoe%pYYJ%a_dhtHR9jne}rTC*(rE8&>EBE$M| z`{L~QIZcvIQD62x4b5N7HfufKIyv0{yP_sB6?T^pyvT;A`)zLT<>c6dg{Aarq2uq%F17tWKKVJ-$(wa*om6`cfP!ldfJ^PH}RL-7W4jliP^4} zyL;A#ubOdw@6%bor{tae?&5y`Kf^~Ro&7xgulye=#%Fk)x}G&zL2yZwy`VS4h54&@ zPIph#3T{gL&+sg%#&A{p`O;7}z4<)F%jYa8__NgS^wwvg?K7WWn48&War{Dd;Ax#( zk>?^N%BL_i?B4y?FkavTuNybsT$Ow; zLV0n~)tR0<`dSUcUmW48J@utv)w$DOWETkvzx~5U)1omN$euF?C?5LusD ze@{{C&TAf@KY5|MkBA69Nqm#qvhTS6p7n`$E{o0jS#)Tkh5SmxyoN(H?_%S3KE9VM zQ_hev&v5F=Ij4W``1Zx-@+GGgMjwweqP(5Mf;k8c0HbwS#N zgP(OJCx2_z`sZ_7efOLr+nyzw&*YZ$`{rsNp`i77Mr^se!3wUulMZYTI(&8KenF`~!z!=qB~Qo;qKBp7CSHyljfS)g=$(UxL&=D;&Q z!DCVL>m94ZZ0iceI-E9q3=~yWzutIr=IooD38!V9F39fIH9c0y;I*vvm-n8$Xeo|* zeYfBcO>3{6{B_s4{%BvH_?Q2iip7XKQR+6!t{|DHE>h3P(TkG=OT)_;~i@_qj8;7VHwyZe_m89wfq)MdNy zg??J9#*g`us~XRrNj~<`c4D-SSdZLPt?bLzXZBB+wyN)B0PANXlTA|}XX~$8&Z2DM zGjD2wtlP1+*o!ZhiJMGxDeZDt8h7>dvMDha7a+NySgyJ=Dy-%#`?t=u zoT@lu)6;#&!wVvXBTQ8C9?zBTGUuPhEFo6W`N*TLS2X6po^zewUWR{JQ8wwR!Zr3a z7N(ljllIMCS@T&mI<-jL`jHz$)D!bK;j&YUSvWe|Igb=^ER+pBCb9g;qW=uZ?!4}= z<(EyZWEu zVNs?|!XM|p^+pfhzYIETm%vpe*1@`7=mlS@=8C>cmnJdJ(0ghXu&W`R(SL@;w6*-k z436UIM(@~~SQKX@=b{hsQRx?uhbJ8bpsx))zGXD`~hqJwMYBVk*k>|ai^>K23w z#wz`>n=Z&K?Gn2^>{(jme$Ime93{-ZeCB9f;pVO^Ikj3Q z6zk%A#vjjWJdg3D;6dy7Gk@*~N-lV3tZ!7T?XqXf!Aqu_ch*hLk@(LLe8`e>Wti}; zX3mSbf0xGo>Akr@uZ(VXZF~42U+GUmE_nVDX#z zf7Op`pT9f($nNO>45t>(F)7q^_rLUE@6o3bk&?NmrYhRZ=xNssVfx~-`O{(5>U5Sc zzQqE<{F4i#W?!vHv@UrU|3=`4~&tH&<_o{14IG%`bLM z+q9jpM}C%jZ^|^w*)#0bw|oxRdM36$T_-g6%aOp^W?`X>-CwqTSz!>Mxx|BOY3Zg! zhVLD@wkw`p$F*^s(jeSSsnnuk|5+}O{g-BImy zqV8MQgWBe6ZQVtuOZ870Ub8#@T`?eQYw{1){|vV>_$DlWzhmvvpZ^(-{y0>;r}iTA zwb~iIv(it6*)u)=+I6PbX}@4*Ljvb_iO1L7x3D?~7iTtw)jnK%^m>N*i#Zm3Q&Un( zOT5W|#jWK=liGIN3VBBQT*X&Z9n9$nbKWWfxD z{m;_A+NNcxv`A>3Sk0c1SSz?NtSM}UkLizwR#lb#UJI-48)q%C>tfRVRPvwU>6L=J zw_|?%aZ`w0U%vf?Rp(lPtpUwtlQuqS;i^!zUwbH0XM2j*c8M2Satn?vFlRiRf5g!4 zXqexM-@fYm{xfhE$fsPqezVQ){f7zM=2@Mm1Vs9J|9xsU-u->*SIzt17c}0_X-r=d ze^-I)ju+$a(+z#=)WWCafAw-$uKvN{&7rq5l76KA`}FAX{zo0=t}-DKiU;^F#dGbG z%AX`5Y<)zbAb-WgMG6I8R(6*fWDafHs_|k*LVU(y#cxw$1GV{smNqKfICFCmU*s(Q zJ(^+Lqk28UJLj%#N||vdc=L`J!B~Nro#DR@UWnYp!MM_|vn}za4y*T+R~gKUSMRoa zth4+NXZUmtjqO)<%%A6{$avLcpK=*{d73Ka#iG1dFH6DquuS( zuL~RqJ>92zH{i2uqHfIjq@{c-bf>9LJuj%Cf2A-k$wxGCv)vQxncwcz?PEwx*WYZ+ zw7697UgyLQCuYxCvcjv%@L>JM9X_Sc&sHef?pXS}PjzR$&9B68RV#l_>1{?$`tmi5 zK^OkafBl~!f9~I__2MsU#I~hAuQKQHYFPBaH8OWi|B*KWZtYVWPS5I`^nF`)_$D=t z&yVzbTeloo;KgkhezH(nVH5k4D;m{q#c#EHN`zA!!y2mg)QX2byu&8?TrzRtx8@l$ zR(be%JScu~OrSuO>uPFX$JB-o{}~vn?;dP^#`!AY&lm-_Fb7w@X~c70vF)$95H?OGJz@QN>1{IQ1&`z+Cq!BS<4 z7Y_=2((Wi+Jnb%%K}cBP@zcfzYx0@pA9*P6c%ZmKKK+8ns%;B4RL*iT=ilTn^!Vb% zP%-zEno0M(!gxx$3kn6LJg4UJJ6#R$U;OdZ)h{bm-Z4#0s3($%p6Pir%_6Jz3D?%)-4JndTbIJTdL} zJAtlgs&{5i-&m16%|+lrg!gN)-A78&9&tK+*O+coGyhDk2;01;>~6<>mR-2ucz1{B z_FT7ZjLVNK{q)4<{(pvqC(~|TNod_D|4S`Sp>pBZT{(BQuH9bm7P3fl_o>B8bNB22 zyVSY%l+>JG23t}NrO)1;ve2JhV(F~SAB|cHn(HeMZ(`hhJ7p8YJ~kckq%VKY=53l) zFTCWR{IlQ-6^%M`15Ku$H~%QmWu}+^{L=KW$m0wDGt?;TRjxlNd*RTkz`xqH87yy_ z-ruX=dFb}~m!Xms3R^5A9X~Jl*>y96dH+ipj-xY|?+MM#o&I=zy)&0DW6qN0)20e- zczWaQLxZn*27iuPR9^VcP`EZ#`0CHaD=hpTi_DtZdTR5|(1oRj3nj%LiBA?Zy2*HY zWmD#krmam&MGW2vw~FhDF#I*$9qJq7|7BH6?UyNALwMxcqyJd{XLu^46r;CynaCxM zB@&*YXV&|`=*Am|r`CB0LydVFu zhu+6UIor&uUGop<+1*eYMN>{;9v`z)?|UEDg4 z+^ZMmcFA1kynM;Y?A-Ccyd2E_bAGMfzBDblXnp&Ch9gy3OWAj*U0<+KjrH=EtxJ5Z zyr*4R_`+G=Vc&uiy4Me0fBtfxJ&Wf1Irc{w6Xr?IbU6Aw-uc$v3(LPxlbd&MU;n+B ztuZ#X_aEuq{`Q~Y+@opTTYqht81a&EMOP@lezA_mG394roCiC;Jid^*|S%1rF`}g zuM2L=Oz#Ky9qn5vyX2PfM9VpbA`A`x88!z-uDpJMS!<>HpYw~uo0i|ykMY{$xIX|qrqojJbd=HwS`Yj=m)>T>xWDq}kq{(Z#?@ePlEInA8axN^_5{g=+pl2a=< z>GFc&B3~b8*p)fe3x+uXJ;s5GPN69)RX`U>;Ju815S#tgFN|!q=%!Vsh1a7k_d^w|VcEIn=EnF9F ziZHY*|EQSxzE`!mGq{#ZubS^z+4qktlUTo%^I0jx$uDGClYRR?!_j3Pk>9%I7i{fH z-%)mer9g$-X2r&<#mARKIeYBMGQ3%O*_;2CnrXxSm{Xw@ynA2%s?yNE`J}1X^q5eb z$In%fVGK{bp6Of<_R^J`+9AE|{10aB@Yg=s&tGzX3#yo&$<}$s{?5AB7s?IG`Gs0k zcio)TlR6>v#HrZ%OP&N4UV2eI<@~Ct0dKSE;_9sGMWbb(NSZ zqgeQe|zozmW+~xUR%PTDVfY`?1tt&!rPFtOkxW-MZ z!MLx!evLC5Z}n-foHKVPJ-B+q{Qd=l+>8e8Wvf29Zs7}hx^ix4ea+N{!|q=Un9hAs z{mZ6TyT|*--=)9W8dpDUd3B)cz~`a`qAQbwjwgs6{m*d1J~-R>HpiZgd|Z#8ajn_# z$6?!+x$A;M8$a$iV7ZN7IB}Xf??>ELKA-iv&^sYBrniagSuO9ix-fFt-$fr!nfzyn2xo}ib^c#B z!-kWOo(8_R=sjjg{GNJ6TcQ83p7^`&`m7l&%euX4iZuhdx4Sn^ zT{e3=pPpfNpq1}@)dM{54}JMD_fKcrl^y=#w|;N9nP}Ui$-}v|g8S>H*E94_bF6kf zvhl+aF`4yOwRr-M9u1yiKKZgp^Cq=r$tSM)ZPaXB!E*Zk%BAZiu0vNW1l{yMF)kLh1(?ePU6 zKet5NZ*OtD&1=7YXT48E)E2>$D~fEqF3*^GdU;z!+5^#=a@J#J0=f;NQ}p~EFAYt2 zSt=v0n!>1hQ8(gT8%JpB;jYeaj)xx^76=~wSa_)=bVlXvI-nzvN$b!XIp^?VZFv(H`;v~gIKxUTo#@>`Nc3Cue8C-6-Y z@ls%w7d{uS5|!)pA*}yJU7-HM+lKpY{ae8GHF(CV+b`a&y4U~b=wE@q@mHGIn!+zX zE12pc9QK|*=!dVi*U)4w;Y6}DiG+IJ}Cx%102MMujyb{u2;^_~6T$}}h0tH})i z8FtS5Ui|vHN)(UU$J4W`k8reG8D6-YenqNkYSg~hfuE!Gk5*c>&))U2kNNAIgq}6o zr2^M){^bvE+}Y7^P4!&yBVnz)y#~H57q2*%fA{fw`F73uX$|^|)KZy3=LPCJaNnPy zTca+eRn^gR)#=6GlT}s@2BEWJG}nf_+dNNm+DEgwd-*GCo9?#PUkDW!i)O#-dHi2N zQROUHsIT}}H|FZ}56`KG*B$yvTXt$%;yzi>r{NA#jZoil4yVw}$5?``5sYgVcL zWzBf~IoLPMa;nHhbKa&~4;bD0z4?;bp6;0_!*_XsRD9UZM^VZSrFpN&!B38T;-y6EFMd;MJANyAE zhpm)&+mhe>Nb3oM#f9k;Eaq&IC4|d zfBU}scNf3hcdaR=<*DuB{T0fq;)1@eGI4(Dsv5`d9DeH+_hDI;8o%3@m`)sK))C5; zE4|~faNE3pT}MLN*|i_(ES~FhVwe7tbYG3?LW!m~vLRBrT*o*6XzK3Z5l&tue^PT< z@NuI(^MrOVC*Lw!w?8R9xQ->ju5h-%u7AlTnhWESa^AZ(v_($|z6L`V3qc-IPSHV z)ysd*goqVaOWHj?ga&I0gw1#;ute)_{nNsi+n?TlD}6=gW}x_+X}!HX>lMX)&x*Z1 ze1ZnFAx7NobIx_e$SiwNn5J-cwcyIwxO!yhmE{z z@k`%(MJLjiT#GyZS(a%HV@YM#xi^9Px2W@Pnjs;!eEQ_)*MrWTF<)EPvPNNw#F|t7 z-mLR%7au&`JiF__`6Rl-n0JYw5lsumq{U7bCqfrus+$bwCKR)djk5t zsoxuTrk<%-x%SVsL@tr?{|vnhl1XWy@87Z+I{m&sH)VT%H;I&8p3; z*Jktg4HM&!&N7?#=->q&mK^q#sn(fSy=q+L7&xQ_7gv4ODo$FM@kq)1wnNLw7cc&$ zN_=UG>g`qdBfOW6C?3ncppctrvY!I<@(lp@xXu({=aPPYDm_ zSG6{)UG%^@NRv@k)|9{T!(sM-ZI_v~|1+#eY5o+lv}FBKsb=LJ3Y7<094mIVISN^n zYnDe&@x1VRfhL~Oij{+A{3_r)i zX|css_kJ&bDQls(i$9Em>%i9FMN;~4i_{vYSk7};{hy)QY=O12{`t#o`#;qDie;{O zz4)_S-5;k_ydQUD329HNV?F-aQO{MsrKOosBjLb{sSUZVr#W>4vbT0_zOJUX0xM^vZi@~$rj4{nX(pK;Vkv^cgddD0=z^Kmyj4}RiR{?@;4 z9V64(tH%P?&8|s*#4z#Xzntn*6Ha#?KEC~*dBZB^8Q1tu?PpnkYM=WaX8E1vQeln# zEH_;*HKm`QzOun>su7pb7VnT6tKY|N&U2byR(9u<^A72Dn-;l0T5Cj~X-n<6*p@rv zvw?H?EWuA7-|Bveec+V&qP^k$#l32er#HVA(%K^Y`A2xB*r5*ZN*VYM{8JrNbIH>ubVXOJ2o0(pxHI7(Jt+Ctda60MX z!q-KNcMga3eoq&y{?D-Trg8q;{|p?_iZ7SH|HmlCy}I0{L}bO}h`T<0%6VD>OCO!D zco)5HY1!e|dmHOd3+9C`X-`Q%v~;1&vsm$vycg%6F)8!pE|go?Bq+A4CH8pA!I`Ns zIea>My>D!>GL%lc+QIT}<`i+hBo9rADPJN}nx1a3mS{}0no+h&>4Dh=ZMFD4IWuc+ zY0hH)I?K22xPkD?t(i98xxX1{^{HOTZExde&skX=Wc=bd^Uf9Cuk_ZR?`)VXe%mnG zh5ueyA6wqe{elP9n)ujFaY;Y_=r0aluKEw5Ym5YJSQD%{=Z9r3WJmSbF{r``7)`Q4@!wZ87o`6QO5v29DaXRPdFlW-9Cnk#jF&mDuU z;(s?Ty~Nm1|8CLJN3#oL1tZ!PHyo7J;k(!Wck#^njOFR+29ABslNAt1JGGue(_i9sj&9TZtgfs% z`u&1A1_$H#pZ(>|zADSRs(#HI>HiFE`e%$DE{)AC7Qb^@>z!(p)$4}>!TELx7ua<+ zJ&-#6?CDI$l3hJpio)4hTnwTGG|Ehc()Ff2{m)ReJ#xnLl~Y8YJh}O> zZGZ6hQPh<+>nHbjc2B*h6=yEZTlV|F(a>_MZXT_T0Rc(NcRl~!yrkgTb>8ZuqH%KU z>0d&4;?Dm4&u}2Z*!ROd>kyy$t8^~~e^>2jkEj>wXKIR5@Y$X6E&R-Z3{giTu{Aeu zeM@XqEHXT(uQ_?&!c6{a62Ao-4|Gg%IIN?f?xi3iJMU4-y|g>${A_$01VWf&Rc~?b z54gj-wO$rmF!mU{J}5K z`O|At=lOW!^+F#-mIQpRKF!H{OmoM(Q-VUPBUW9lQ=QqSAGrFUdw^s{+^jnck9JvB zaURYpv9XPD`=k>gbtS{MOYhX~Kfm}KGNq>H{$~ig5O6AI_TRrIywAn86C~OA1w(n? zUa=6}@L=`UIWfsgj>XFQ&NkWH-RLSX%in%e^i_=skJ(KP`S%7)4c__dl!C`rk$T)Y+$Fe}%_xVcxq{=>$q+5BMFyZna?)!s{Ew>NxKo1C(7 z>9kkBBWK=z8uV*w{>uKDzL_$bdpC1xTn_Hw`Mauf`|aiI&r`c0YLrQzZG7yX@VX}tSL#2mM2pB_bt zWXm4eFi*2RaQCal5^lR5=Pa+_*ixMQ{+F|ZWR0NH&ZMLJE06o`bPrrD7=2+{!L6*T z*`NPfzgUp`pP~6u-!eh1py{SiD7j4Sx?jB`O1 zN7v46VS1A7U6pQr^E@ZFJXq$LwA6p{{EV368F8~yr!SOhTfn{F?*s$e)@Sqjqq+6g zOx=6vc6zXS{DGF=Yxaj`AB=ynYRl?S*X!ZCrsiA`6MFZ@ivNo2=zQ|q zv>j2`lC&~zS=prpDQmC0(HPwk5*DGjV3l6nG{p}>*A^LW{A|v|5^-eytzSufoRbSO z`V6l;w&IM*O1iYw;zeuI_V{m4)wCa`X$Yq5RAMleds43Zle^IPc;eGLb%*Ze9QN1| z71gd9J2P}wgVKZfyFQ#+!MrpsFLq{wto?0W(c-Fn`MxOW=-dAp@-Hwjz1+OGV|z^0 z&A!!#E&ug?O?p%_|Kcl#9&_`9J6dE`MfG$|+b$;l<#lL9(?add9XA>GEoYxG>*9l# zXAZFb>s%M|`>^2|4OwlT1to1k`V)=i_oy6sb(rznXHAApi}t@ap5^_={MTufU7`HO zT6r%_AO4;3_qRsfnJ5b>aoHuY>R;d7`z93i;%oi=qXA1kemI@1EPMGDdy$dxdv!T= z)(zoLi%yoDE1sL!J-vPJk+XG@^TpS%_5Jx#M0o@Ellq-)o9n0Uadk2l>$nqPP*mR$ zcJt{DX;Y4~>kB_L<~@(Uu2U*#qc~;9jX0|aR}rbAGm9_1ZfMxL+<{?5t$r_a zDMjy^vkcr{)Ut23?3r}qj?VW}*$>|`32Mrpn0mOL`OLC?FUyTQ+^&AttJITwxcBqa zhXqWRE6y)J`La1)m+{v3-_9*!V)0zlWL~qoM;cmOIFL~)S9q({r{Z3?^VA;8%iQV( zzR^)UamJdN4uO|$R^B-o5U23XG4b-(rb7>!=l!lVQTF~bA=+yDyu=B~&mzO8d+q2E z(_HU(;lir#X|nG5nc*w6ZeBFztZiejpJ5!4^L_gH_pGdWeirj>m+VfPI)~SbOLOC_ zyli{lE018zcz`G}m$NLsb zYD{c>78tknf=^u%uY?hcwD!EB_}7x>)kLFvlc!l7O?j3Qyt6x7ehc#(KDmoh&RcaS zi5qMv^ZhVY-*lq$(rvd?ReImVq#4PxSHqUgn}Ro~9kMs()cgLU>1)4%F4wVTg|=rF)*Vw`p!2My zhIQNN4>B9NX6msPOG##y*Z9;L?ba9l**Bv+##G~)w|o9H!L1BY3U0Sr_sC6s-5_Eq zU0QVQZo;FFUn2uv9~OBi8xy?m+w*k@p^+_*(H zZ|M}tD^lU_%}#$PaO&K;GVTKVr@oJmRA-9K(dQ31(>OKYU*fEVQjGyg;VB0dQ~4CU z!tYbgZb*9d861_F>+c_MFqWfWGGEi`8Ko-x`&TvQt+KOc zyg##eW!&N?r<%371z%NP*%zM~!+3T(SKs~4{u<=@y$)9E;v>efG4r`HlW|dEbq@zp=`1xbvSO!dU-g z|0QkS3)}yGyPA9@+l1SH`j!>JYo~p_@#Xnj?G2i&)dqIcS!VY)?{-_h)7fr1lfiTG zXQ3G#PdgLxJvRC@-y}8WS!I5@10ul%36Ho^e-RhO;UKNyT(gl>9UZ5<2KidrF3{j zHg@aO_TE={o2Rq-w{ugCb7a8GzIe-Z39gAwA9a;o19#a}$8gQs@oIbE=essfK5A-T zv)CiTb6}zSmPehDC9|`F#0qAtI;eHMK=bDDwGY;_Jo~L&w?-)>AT;o1)vEVAXW6=I z966S~Gy353?Ptf4C#zRY3pv{!v@cDQ`@q4t<2U{@7`;gS(OEuARd3C{y?P&|Wq!=w zbcla7L+mq+fJ!~?RTmF_n=&mVCxqMZ4BLah6XG9<9Wwgx#ZWPDhd9@ZXM1PJJo>iw z$+JX8R@tRWE7$V;Otv|?VU^Mb?xqJ^3?)_i`=`y-ajlj(6tSe}cYPysBkQ#9uWxZ^ zY)r23h?yBvR)6L~V97LZNe8Q=4jwg(GNDUZEUjOE@d}kJI6uuWifO0+mc3SMd8)K^ zqW?4SdcD?mSatem(zLeJryZ@E`p#50T&(IA>7V&XvcNy9P_Da8X+KNiRb#!I(MPXv z%$3)-cYpEd8~??^psYoid^$HDuZ(JUe09gb6BG;^0(kE4&MIG3%v{ndEZ9+$vu*M9qVN z>CNkvX{t?gyk%~$Eqv7+79Xhaa^*IjgWhLd(^dNxd@8&9`q9$;f4L-MBX?vLcs(z< zUu>$OU*oo{w9j^~VerCj`U(vT`W#J zEB;UDuZ?sU7mwMO#7xKcOw0lLkJr1F7ipdej>xQc)Zliup3hw}L8c;$BrQ)bop|uHSay`qV#Wtqj15ieOrOsE)|9Vxo^$6BPbmX)t$T`#K7YAl z+N7NxHz$Q-z1E%OvsOizR$pJdBIENJo_E*d+&_xVKJxrY>&!d0avV&@nz$=>@0?_F z^p`2CLd5}2cLP1E$E8=K*>~u=rUu>K!^K(gLO15LU-Z_bi>wVRq;s$BKE7z_AyeC8 z-NqA6vAHRa9|f{4OM3C;qwb?%zGrD{6SjoaF74=-*~q{1nZd^G<~m2Bb|;!}?^uPfr?M-1`!qvdbvTNEMZYA~9Wix9Z2D4Q88!x;6PoXX7q0OYd z+UssC7t~%FRezvoV}P8qQH$lQ4lQ2R)j29fEjC`^K6jmV=z3o9eX>aKgn*+|$&nj> zCUu0LQQYWx+D_4w&nkPy5@u)hFWq;VKFh2s&&TaKq8YHISR>kd*P5@)#>M6riu4{8b&A?_ z3D4;EHC$7i;o+UPtK((AanX5SZ{3ii~o|??aHwJ8P3^t%FBZu zuFkoprsBT!_Tx)4?QFT8vM$RCUneeiG9xM4#%cf5!uK3PP3L$2>^ZyD;rD`P(;`~_ zDoMvrd;C!+>y3)iZl3_d;~$PLU)p%_)$!l|UL}=l-nhvXnlvT)<@7IC=knJckn0xy z_WX8XNP1#_`A4Y^w+p6kHC&dnmm2Lkuf8z1SGRr7sm?vYce~vWyohgZih1ff_eiA4 z59JRHVZUcRpAf~#=o-I(|GhBN?V3YN{g&=roGz-Za7%ld(az+vhus&&9IY{Qop30j z$>GgK4Z+`+ALWWwPW#L{XmC)XEx07`0c&aU57`DKlASdTF%62F9$Eu2AuQgISzmIf=3Y z)$_d=Gq)vts_a@@a(d>2-IcYx*H-MSDkxM(}`)kjg9 z$L6kz)a=QxIizFuBz4c^la?2S_WN0G7r)}=k$SYWbjQR;LhT!TUZl63uZ&Om{gG91 z*7Wx>hBmB+UnXWBF-t$QIp0mx$hC zzrUr*Xk_D^voY3To9oUWo^_KPwch?{EnM%!(47+$cy_a9L3V%|^SJ}5OsBgyshWjq znlc!i+I0Q?rPHg`R2OW~Q=avS>&li5A77bRrJgOhlUZj3cOKxA; zdqqpkdwt4+?Z&DVQOa?PeH;}o*!-GOCH{sQG+O^TCyZr-CTQIh)+PJ*#V@9jioHT#0=2_R5b)*`c zEBdS>ASJ2+5HTiw&$oOn@qv!@MHcydl^s5Dpcv~ z$TM#)YI${`MPnMj#g~hQ76uEJ8s0ARX32Ax>sMKl6=g2E!A&51+oQkEZu+P1IQcPK zee2xQ=sYPdYuhi5EdP7yA{Jj<3#LkaS;ES|@Gx21>BuuN%iPA?lNY}8t~!;w<&)!q z-8^e8lKURVJr}sO>g9QHF{VC#zZ+Z1^Sq`B@I-Bvxp?!=W93~_!adz5g$M~q$;IAh zImMmpbM0A?LC(~ICpM?_etz9>*ZG3S(UWh#EaP79oRiMn{;57Rw5!@n@aISI9rkx! z*1!KVv26N1)vm3RpXmf#t&2VUchUAgi(jU@KKP}dyrH8!&VT97xJ zU{S-4;+R8CyLvzMoZ9wFgH>`}+RvRg+d{6##soCH-@Zkopupl;u&!dvK{-vIet`>? z7q0hv8=kyht{lk*4?n-s;^M9moReIp*}o}s%Go1k z;Y>HC#aew`DEa-XN}+e;_k*uzo_yP7)8bsL#$&td=ij6X-sg8YR(U0`37>Uu%j}sg z{$5K?V8OSxe@7HNT9f+UX^iHVM#OOzoSsiwYXX_lc_6GK+#2dVu=#*ym zRkJCiZRb?8XGg-#%9%BEE_E<^Mvl3}Lt|kFe!~+1-?VtE zKEIgy!t}-Sg8fb=A>~{;>~|DY7wpe)@7}!i{v)f1t-p46B>d)Aic?vkoL{F{6uxYg zsL`3X{QJ)w>b~@OMa4J${|rLC8)b`MUAe1J!ds<#%Ve&Oa`Md_+tZp;nCEXfGqv-w zMEJGl8G(jJU!Pg>F<*{OLdsZCnj1^oBEcvkS{ zO32w?!iNI(FaIfY+Qz}dbcLKr+S0ql)1E50Je+#O{>`1$aUTupjy3*EzFPI`m)0Ax zw^t5$Yn`=!V6#ZwOTiAo8;K96a9iK;`tnHCDt>Ld;nFD{yepuf~>TTAgS04YG{^DM!gS&nH(o(bb z)Ur}G=@N_EzmGcUx_YULdhg%FB(?auft1$DxFCBUM&p9$(-TdZ409#*&$zQosmkSr z$aeW$VaZBTy5DiLDdW*YN73HX!oq9p-d7lyep>Y)I5;P3a`B9h9T`tPi!mI?n>BsS zJhxZMMNfH}%Ej*~DqTCgdBt|ykFCa8CXS-40p~lbd^Jj3>P-Y637&MG+Nvm_`68ft zndIGFfBcMiB0XY`K1<R3{yZi#WRXnWLPzUH76lQawx` z{xeu+L_TDHI5Tg`lNrb7&k0wuyY%)ygP?{B!#3}*E}!33+$t__I~>xFEwwe-_T=3D zjv|RSEJ7*~c**=ufoq0a2-|MUDYdz`eN3Yp&n@f-im>`D#l^0sdA9cGRJQVq zmOU4btUEoUZM(*;M8+nYV?56<_b-kQC=q5ZxGs3&`tgg&MQ{IF_3$m${9P#i?Z@iB zGqmjw%L7-u*$Fm-nwOa3K`Y@<~z(Ra3J@GHt*70bHeXUlv_YP!mv zRqLmj@h3d_m%7*^B6lB$3v=Ew{#?fR=*zh030w01{Qn*m?v?0SK%ucEu!Eko}luq}(Yx>>00me<56 zkxdIYc9v>i*dD%iF*n;I4HxPBOA9k(-QFbu0DU|n6~YiTc#)fNv-*vvt#LjRiYo>sq)@gwS7mD^zyI2 zLVOu~<&Mbw7F(rk#gY{wtMB-FZMV42>!R0^;_VA&{yl$2t8&@ibzylSZma%Gn%<^j zA?l}e)?2$QG3M%p3)R1_)rLCV=JjW-NpstGb=UW_2kR$JUEGkW)RuHO<|r$hA5)|! z+th}x_-99Bw>;vq+VzY>XP@jDL*LVSyBeM(%npAs?G^V!jm%n|J`;B1pYOk%`e4gi zmn!j}Vfl*k9drIJcxhSjpJ5AE=+wg~b&-}*VzbETPx742nt)8C$RD2hPH+Q^4w0$SoPtZ^^fI(Q6?wB%g*!LI~-w~B+9vO|CK4n=EnSI*cr0!V%+lJ_86Cxt#|)3bOBKFTfNmn-dODF$;)TBzC7bobXkAnpK2JV=7fTn+!ChOD@^Ay@!Zb4*?qw55C88K zM_f0S2)G11VNmf}(=zjvTJhyZzLRtt;|Fe;p_|c_>TNv4OYy^GCfK z%POb7_{dqR<59ITsU*g^{I&2~roiIJ_?eBB;znmd)PIrNe(8b(B4TfH= zXXQ~-yq(^}p30e9IB#jN-u$p5HQvj&zkOx<`Fe`8(>62vj&rZ--yRlLKlx>5L8d}W z^zV63*6Dn^{O>cj-#lmao&Ti&Dr|gxCi%LYi`^%^soI;pkA@p-{18um`|5Jkf;l^O z>+N8Bs-(Oizo%Xv_P`3G&MFLBx3A>?&!1;cG#x21I&iMGfW<8~} z?bw5zCqLMnI>NJ9)6Km@mrv%iVW9hRqjf?{tNIrmjScx|pmU-xMqz7^4YsXOB+L+swab$A&%2f24XbCH{2mv)%QX-)?JX{pl@&f=iaKu-c!L zG4o{UDMPNix)*0`6q|LsScRWgZh0HW3#m(YuM1{7to5t>t1KqXrzID5XPN8cBgKlL zvDJ=k&-fOxOeyqPW$t-=lab!yIa{Wzczr=+&RVOAkWlWKb^RUNj%c}TY!LWYzbI<5 z7w7$sG^Ypa--{M37J6{H=~(L7NqhB$)jv$xxG<*X*cP)lQ`R`d8a)W-@Y}i8$*<7VL{r=T4)*UPG5;+53j>ukMQg>^nWh^ZI5rTWz9){Wn%0~nKA)^0qI^ytOP zTg=~@WlvvjjHoO9a^>*TS!=#_>*#XcIQ%-F#mMc;m$R#;{Ix8SI`f^gaQ{==-KybV zY#W75*pK#43TmwCUHMJ7`aeT!#+=;`xo*BXeyL)0-^}RgH>PRFwH|X|T4>@B9LyA* z6B%@%Du3py+Am5MtQ&6bu~I5}w7GC$h|1$5Czl;Rthc#$OXy*rUiKX8qK!=FXQVJL zJd^eCKf{UHb7srzwcEBVBAQh|w9&QdPQj=1tRaVQ^~STPDM&QzoV&+RDPe}MLl>)t zE8~)xE6#tj>bxRj5PkT8%I3qj>QA*cM5I1Ta-Y2@`c%>O7xxmLJZzPjVpIOYd(H9v z_JLC!m(0k~m975sv!mDIU+-r*lfy=TBYr9{71+u5I;^qVHjSks|BrOLxqh$w@=Hg| zew9>)umAh5gW-N%Z*OsKb=3wQ_o)vK9?lM%;aySe8k66 zI6Xxswl0BX;fAOEk>QI3y#tEA{Op&RXJOmF;7UN_mw+RBu~~-kPaNb9OMdHNyXtUG zx4LD?v>k~8Gewi^`4;Zr=J;6SFlX65r^1`dUAAowU42G+4y&YIfareDJ1LH*e`j<& zmuuPg`u0xGh|8RoQ|3?K{CaoMF~6|3`7gCQUKEOF*vR}ots1p^`M3WJY%9a=X1~td zQTX~lgZAPpYgbn&UXYn8y=q?5%|OnRnmd9P-duHp@99M?pYqvXs>8IS_zflY-S6LW z_te@gJEklW$P}7TFqv|qiJ77XXMm|b+`T%+H`t-c&?+% z;U8{kU1xrD6;|x<$u`@|B04?W@Imo@@5c3gCnJ{aKmU8m2l-OLNn1O^SREc85y^S_ zQSb7R6MT#0hl|KUjNi?u<+o)uN#X*Z~qhE&a&Os!!Ewp9mCJr5bTX)RuS_U-;@u?}J+Dc1LsFQn!0NU|7mf3Dom7vurKaB2=X++p zy3~4(UH(7E-Rth2d0+DW>LuQ8pN-`cs!NW{aAq?3R{Q?vU)4vepQ(pjGyLE<@1ohF zOiSx257g$$8{}jy%v|Y~9uYt9uO7Qxy~QWTYwh+I>(BW8YFz&!Vq2@poBs^lyv8}J zq|Rg|)|{Mi_3_0Rd9~1n+7FLEN_{O0ufOoc{ytNZ-j1$0YVX{*Q*#UXeSLoWXvfYy z)s;4V>8aa((5!d+I@O z(WA!W7fa9NTv=_hQ#m4RMb?k0OBdEIe3<9k(=g@X{4e(PK5HNRwd>BwURkd-U(>|v z*3u}U$3c#X7p9$f_V>P5p>Hx<*GEgydvXCmb=_b*Bp zbqXsRyeeBNvI4uOJ?-fh+{-i9Yl1!tv&lQb*;+3jPSs{xsn1iebcu-LZ0FpqN#*jU zmX)a&U!>jjUX^K)nh=^lZ?VGR>jMA!&Kne&*1b8i&Ud>(+k;1}5#b_tTts(ByQ)3? z!1bdmAjG&~*V&J6`4+6L_|MSc-munO4M+=)!fTK_Y2ao5{lXqdQr;XApSZTqH7o?4YC60+-6 zu!zNJDcw1Hj;`RGrMf~||FY~Shg_k>T-OWx65pR+>Lq(;YK#j@@{`afj3o*JWm%tvX4^x^fFR5>!{H2utr zauS>P!`c4Ag3SS+%6a}o>|FQw$eH^VM|^U05`rEbpS*r0^NE?7G3(iXHZ*!|NdM2k z86o=ipSWYM*k4YU?&n7qb=_YSGwsZc?Dic&Ph(Q<{AYMFEA#n^`*~rCuG3cUIm9}p zSR-VrX2Xh*ODE<`TAG*1cS1*W+0ta^g2e_k{t25kWV^TRnQXZHR>Z*v8w#0U%lRIN zFwZxPSktU0_}lYH&c+7bqKTo2?l({B*ep$ZEc)$>)cFM#TeM$gcdhsTcJV*MR71It z{f$pMLgL${Uu{(JOL}(dx7|lQ<9#2!Cjar-P+WhZapTGTQLDuQV~)%XFd*eamU-~nYRkKM zyjU{xm3{2Lv@bteH{EYN%w75Pr>vV{(2vjJVh`iWri4e_j4svFo3SY_m*d3gbTrO@FcUUvjLHdB>UTd#dU>jI0UE zHp?)nXsjG`#ZQur z*-n1r@Ji5Kd~aFv%`?AT{`^wfxTI_6p3`#|P31n2{p-+|ADVG;5*Zte;%wIbRP#$< zI2$SZOSH0S+IgSZARJn zW9{(0miBY%Yx-a6cYch&ro6V-Ic|TV%;o9z*?$-1@YWjy*r>l0UtnBT9{N_WD5J^9XVUjmGC6izsD8=FpE-qFzo3~>wmmpaFMUy;GiSGS z!P_HR*$qujQBjZN-kE=!Rv|K>@#60HT60BKz4vY?3VflpCc5xy)Y^ah<=J)Inbs^T zTeBxsh55~2`-@NC%UPEAzQ0|o%lYv5t;9X`?e}8taYcT<{-aR)rTh;`HTN6#nm;(S zAN}QzwvFJ=Ed9*B`_T8}3#@F6CVt$%$019#(09Maw09liIbxN{x8>%#ERB}?%lzfc z_CwWL^ZSErUNYn*^WGKzY*e+juI2g)l?AI$uD|_D2X{;Aqs zCp1Z#_vXX-&3_XXS;f1pjGijp%vWvoYf59b;jBOAT)QSe?5?iXJO3j5$^FVJwOb!A zi`C)2vrxFL(!_qrgst=boQ!xU+VJw1;Ocpw`H!5MKVkk-GuzyMDXzF)m&;$35ukeE**| zs*;!D+l4;9Xq1iNa*9&la^_EcL`=Z?{(t`&!j3-CdHTft#rg=Z+M4^{InO-WuX3vD znX7bL|I4YJDI$Nh^Gm<9ni?iJcG%SYJ<&Glle}%se}=Yi`yVZyJ1LCw>@ta6K~;@e z9=Vo#_8v0YKC@3L%tT|o;fhz>yQUh3iA{9%qe9-;z_F9)2&{Z@*gZ{R-Z& zcS=?g{;O{b`nv3iU-`#7_T8@U7XKM|{;U-<9Br4I3a%DSVpglDS%b$)uo6RbA$V{~5}KW3^&e15Rw#jOan{5AlVF@NT+#$z*_nKkNzM3 zR7oGH)M5}{5wn>8&uZI<<>%KvU*4X6-1cuwg+kEErIGa)Zxu&;?~H%sbZ5nZU1zG- z+;9KlTlt?MiFIql^GDXbp0n&d?4LiXKeh9V%v|qNGyeWLU06E(-~5!qC%@*b3y$&g zs9*5w>B~pPt7^=@EIVSZml6Kv^FKZFS@xSktlJ)6&s+Ugc0s{!QH!H;cJWc%VO#$* ztUPqm{!;0aUt7igGic)SD9uIx>)BhRvT}V3KC)i}E zwlq!E^o!cf`u2YxnU0nn{L4FS_Gbn&?)~;p8TlPI_NuH6o>{qL`xi~#_V)JoJhQy& z7hTsk|1)d*U-SB>Ldgqj{xi(rZJ$xvweVj;tAqDANXc_G5RqOK8Les9;Fq7H~5S`f9a){eOl9AOC1zDBBUA z^6SIvlzz~$yML;a@^!<#(@?Gum`aoB)3Jo}eFW_Q`b$ZpaXw-O{k zB>w#E>}U6iKMQ2OSzzigORkFN`+L*-u!?)}0ZeHeB68syOD?zMFE;x#oexPDR|}&P z0|SG(f`qHa`^Anbxu!^xIE;b|i#%DM#4u-;W_4p$5L^(%sNe`%z#!6NUlLe3WBzBk zH7^2wohLR-!`7_3sCIMzkBf?DP@TfeTK<87k?re=FJY=p_1=NDudBg<46={_X0mCy zoVZ-|nBr{NWAje9=Wsb_!wPgI3lBU|D(eJ&V%#pj&>cq6Ua8l{{l=Kewxwr z@HEpI{U3Q4KDi!yUGr1(hDN}{8#bDggG@LpY}IEluzc9iFrnqNv_P!H!mp^|gUe)2 z$zJZWj`Oq@mg-(EFMd$^p!uUfqV~zn{f+Y%8O`LZ{Mqv*X1%4Lo?Dwj%(S{HT*jb^ zbIo3|*=1(b^e3OJr?q>=vfSnNY{<+Y98c~b zi~6rUxaalRfyu=4M3u)w$=ByS!wz5DuIzg2*M{W`d!6PzNH=l}Olb;Ga{Sdibpc2R zVH~73;i}x%56=bo&Y3Kc;yu>HZAqJo>yW;BtKF*a@T;Z(7&VU{(o%nw1;Lx6XLfnic8kB3g-^QNa? zF3SWsOnFx6ezV)Q^zhu{XMXMFlsxZb)PB*BfGKFwLJbTII@{j!ubT8d`~6YLO^NEM zFT&#_3b?cjju>oS+_fle)Bd@(3)2%A7$p8P5Sc$27#LX@m|3fT)jydo^~~+QW~$fP zORQ3idmW4!TxYpfM&8P~Rw~n+T-q7Z;9SA*l-2M9nzOKRjRhDOoEd~WdaYJ<^DTYj zdQ9n>f=saJe5U)yK6tKxaHl!1kTL+1*beym)c`hD9S7#QsT zHXMJGc0l_1e}iaMLOk9)oW^U~TE}~Kav;IE?kY%ig zzr3pd-R!9sALJk$I!FB7e}?rSaR!qH#^TdqzFYizmKt@-PbmQl5+XP_Kq|Z>%C6`Z z-MQg9P4Ui++WJWxe?=HzwY2VHhgkQknUg#c7P>PqutaP*j~y*0p0YXUVsQc0%u9zA4m+7BI;b#W_yLa%j1CM84hqG-421_&Hk{=tJj%ep zfM}yR9u=C%$Kb%ppv1rsz=+2fs8j%$ZeZ3BX0j1D!tjWZ>+?wsC0_;x1_?%Z(7Njx zAGcV*C<9hYJYmqpr?P=nVM zF!gMB)U4s$W#9w}Jw}O1&Nj@ADi0cY0uO`Y6s(q5;!}gtA@3d|4u;2PHJA>o1U9l1 zfVF<+lzWyh(%8wcfq}sQEJ8fN>}oRUz@k7Ofx|vFlY4obSTzzrp(kL>tn>1WMPjc= z1UD&deTc;zHVmvP2fIWH`gIzPY8>*`xNsPhgFYXV`PeH_a7^X^g9rnI04eDdq+Lz* zy2NKgRat3KLHYx9Y+KaPJ7AtgVnQh;(aVD{5!PGHbWjS5dFUq}6F_y*U!yXds3qa6tQ>t*gs#zL~lx^|Y)3 zgMwsmWRaiU!2_2s`$X-U=ydSK$JG*DOXQn>mc7@MlHbR!Kw^4= z7|jc6fbhuVO;|hYYt=Vi>0`_OEwc69Q#|c{>GN*!%|zAC5R))Sp^ks=SPe7pa#Vde zxACpa{jG~5tWpn1T%K3J@R7vWN0`lf<3;)NRoYnNZ(U;G&%Z!cm@+Uh7;}~|n4eg$Ga=zenRV`E zmwA!PUa4x`4N#uIQ2KmY{zkwN71A6K*81%`)KU7z>+=E?o-SJ(V!SaW~I0fwy$7?{owV+gt$g%2lc zEaX<$@Tln}E^|s)V3+gSL13Z2D07?-x>C~k`WA~OEGga*F!!%+s=!i?1I(8-B^YGe zz^RGIJ`|>f-wg%tJ8(uU?9JWHasP@w0|W0`^X<&PcVns~T7;XgWLZI6@ub-N)|LhT z874b0a5Fgls6F_dC19}!(Wam)WbV-_H^1+dFh@DcAf&~CiQS!nU0S|?!Rg}r??NOF zbRn4?misq=MRQ>V?$4_*1r1O!-NqiV&|1dC+ zRFUAfP`Cip)&mX9;a5kBEYmMiRFkXr{}Bc~K}H59CMHH^W)>zUCeR2qBZHu#p<|$c zLSkV+!a{?_i5ndbUVQlBV?o1&|F;-87?~Lv?FD|_?T(p{``LS4UCVv`GoG#5Khl_D zTq4V5i+wl9uG9Y3vNCe_Y4^?+g~|!&*}aKp-{167H^yFM>a0tk-d}aw_s|CTVK2T_I0iMKOK;smYg5# z+?vLuw#Ca!rGqbx?UIUkSG>;+Q=+-|D71) z>?V!1#dpL*#Wo$VH1ZZY>-=Y9rtAT3{Vk8gbj~QnJ?$_)BEeBuASUAG_9RbXThOHK zzdl^#y5n}{^yAk#T$xI~&#g0D9{UQ=6Wc(cFFpnOJ8T!(k{`S+r)SdJSPMlE7A)bA+1 z8vaZniy>%p!K(m~PK_Ip{sM9N}K;wA1+v-I_H3+vBW~h^F_C| zS=0ZD-o?%rJQctBxVx-$#bMZAonnPuqmPpD)_@{QC-Bs|yx? zAFfw35xwFRY4M+dG5f;lO?$NiA{+`eUMz7;H=4WV;*NKA26^iiNlH(NxTcqzA`x%d z)F^-b+SRZu#lDjc{AR~iiTF+oeZHdi7?0z!%}fugh2AnwdvW#4$B(SsUIkwnxD>9W z_tbZt@a{fR^<|sm`{E9_`*jO05*)4e?Zp5j3b)ucbH?j>hJZ<;^3=bkJftKZl8E5S!}m~Y5kUk(>rEN$$O=xZ#3_T+nuk5U-c*HY~wu=AYr$Gsi`9|zSD=zYy*d` zZkDOnLnT4iH6M-FbI*Guwz%s@$CbSI^E(=XS1b;#-*HmL)+=Pr{C8YhK}o_DY_D|u zeytN?^%G8SU9~S&tDsQqjm+VD2_+s)>t}9S#>8>qNBFlHjQ>*CS{?rU&^5R~>+=ph z&lw44qNcwHI4u$Qvz)J3uqHZ`L9*pU!Rcd4N;gzLJT_X;nweU`^=s>in9bU*30Di* z#6AkH{m*b`L$9Nvo4J6r-fKJAON`=ajOM@3JldAJ!8sFm=Sv)~IKR3^KA!P2H%4qTgZ1Bqo1DAuYuRH(8G>_TRyk)KzfBt8fk(I1i%FEPz+~9~p{LN{h1*+99VQYItrMkGf z*O%{}+OfW3;@0IA{GEZJmZ|DT)*Q`w++R^Wq4dG2<{72+-`bgGJXU>t|7%nIYa=iFEwS7`rb+GC6fAOU`>GzZ zor@pExQB|Jl*kJa?YP;<^xzEhzDGB{ew?vQb6%Ea$rX0%*p2%cDtf)IKMGs>C-s=N zQbo2f*2x`Sf>u|(4ytv75{i<8?w5uJ4B6>kvJ4(VER~2(8M|r0>9na7cVQS;J zdgWkhjHiyPT+;0h#Z9a`r^WS1aHgMD>IgXVOgrn*ZH>HuXs*>kTeGHW+!j$>@u4rM zk?B$Irmj1Sj!rUUo|nq2_fUGmi5(}T)O;U?i{745$QE+x8SC?a(la-`rk>II{58Ne zs?*o8QcsU3q%cmxvSD4oouWgn1||~@&)hnzC!1-h_FQM}IR`wFX52d>BG6c&R?Lyh z-qk6UIF%*pS^m*zp&8AEg?hOh8aElX8_bZ1IwQXx@`ZyPR(+s45qqnK;8@M{8$=vDhL}v!0j(t`gP_41#7!5eXkN((G=! zY>M4-s4Gz5La)IYZo{r5Zqtq;9^@ryKWvhWLZ`*>yins8;~O~J!LdtN8M z+>j@-DRDNtO!bdvZT=FD`OGP9Y$w_ck8z|}?cjAt=n-0-bY$im z4R>mOx{b4LTbs#2!Rdx=hQflJGaSo7LYC+9$H0hXKN;KmCKwI+W2V7oll`CF0wCFwHvC-a?vQFdH&PN&?5{FxPHZ8d3S#D5XtngB@ zIsQtTW86j2i89(bv1 z&dmoR2Bti$zKt)|#ApaLu?5GKKbZA+(SL?m2g|w(zA9X;Ttz-xu5aA%G(ac9lF zG{PN43`VCiRxMneJ@jZ6JOS#5SFDqf4 zUgUw)^#3A(#qcU8ULow{`QwA0noPN#0VboX?*?wxH>Q9rlje{Ea#C)V4$ zT=&lQotbsI{~2E9%m4e&aQ&`ht|QZx3(|9Da4oXVd{nb^cSEvVf?R@CYIXlU%ViJv z;#9Nc6y*Y^S|;4GOj0=O^KxZyuGd)?xA_b^6n@UtQ(DAW-nq0#_ssf2HMW{Xhk3HD z9$US~+p?ipXgkB(^;`#h-%qrhQgB>8-ZN}*ZaZ6_g1gRU-&sw(@kfIE6a~*4>TzsX zanSF9P)9&k&Dn@GT{juE*wY`{mGAW4(YT>8amVG5{VYsTSI%6VE;)6Dprh`y^eqi4 zeO`?Vu7oIBD7(vfb4(Z9#CoCTsBWZzv`d%nUf&Rt1E%IejqY!>X3iBnwWBX;T4LXG zo~feu4eljgG4hj4>eJHw-od57WO$NG&S;jK#fMynKp7Q|y%k;x8p>yOdWNN}Dilz1 z{oqn`hAmx^)nQ?hMa1f0qs8AGT5oHIURk^Pjq=j=ouRka3JR_4Kf_wMLtwSf0>=bT z^Fo6dSL^v2noi}sK?aM3rUq@A)#!5m@UiKCBV$Nj0MOsn` z2GVI0vs9;?nwwN4x5eT&i&CcUi+MkrB8-<-bVUn@X|Z|C+}O1)LZ4Z5I=?1&;);ds zhusz}IqUdN!O2@%;L)5Tn}mKQ&PcIJjTUCzm}Mbk(y_DIg?n12k-~blat1Bdss=-` zlofMpn?HRBl>I0eZJ5}ZTP12PbuDRy&K!gHnW{ewx+Nz?T;8$bz~vc?JZs9L_oZqr zh!k5aG;e1^tiZ;FQ<*I0xaxZ4@dj~Ji7jMXEOhR~iKOr~!76Kmd}<50Hra73z2V)p zN9exCg&zmSw62tEJ#ES|KT>KKP+WRPG~<}UiXPj(w5OJRVJFi(TnrgZPKN}Yy>!ZJ z>tV}2wLft+I!1TYo^+e_wR9ATev4S$pPYR$Xe&=Jz5?rY(!# z64l$on6fgx^Vr-Y+g3G&T$b!oUN7cluHm?1;;E?jm$z=}-Vydx!<^OV?qQ>kFF4k5 znfW|z{m)Re=xpU10|*E{hr#;5d-VxpGBi5Nqn z8wTG_drf5u5$g#$-KRQ3Dv__;KHG%9mG|IQ^Rq|Rvz|&)pXf8`Qt#x_e-}mVQ&?|5 zyBR9Eeq!+%fne5}K=Iritn1PhMA!UWuc4E{RFJ7%wx&CE1Jjp-n^=NNkBAiV_Dri3 z(F$J>tg>ZsN^Sq9cdR|%JKAncJ$S`c*@7ilq{|@u%nPl|ZIO+$8VV*lhil&16saxn zOysxH9jPg*^N(mv?0K5J@n2f}&zWU{Q-f-%*k*&`KFRAt^9&9bgEtLvi7O0w^%7bu zk8BY$oc&JMPrWXXGQzh;UEuSK#_&cCI{KUM}WGiM6C zBmLX=c8cGjr7L-_obK^bxOMkP@acjpsYiHaPMPPpPFw2OxxBfnF>sEw$+d6jC=2h&R#5cSzc@Q6qcO6SRb?eV5MXW#9$8!Dn!7S8o{@S$Q^5E{mw=-}V1hwFVxhyrjg18p zCLa6%9{XYfjeY&TYg(v1E9=*9!Pp5Qp?7#MT`}r@f<(ul~l{aK>D>-r7HJjGpRwaIbjlyR;+!e%#{d#-d|S zm3=DKKjC%J`_;8`ec)n$=Aa2{mR|j*q#2#qA(0THR(c>Y;o|yzT15_G=A4Q4?^g&F z3r34F)E8)&bhvF0m=41Q}^U^ zHs-Q-w%-1;E4aE-EMtZ_tKmf>nf-T)#X ++ ++ ++ ++ ++ ++ ++ systemd-detect-fash ++ systemd ++ ++ ++ ++ systemd-detect-fash ++ 1 ++ ++ ++ ++ systemd-detect-fash ++ Detect execution in a fascist environment ++ ++ ++ ++ ++ systemd-detect-fash ++ OPTIONS ++ ++ ++ ++ ++ Description ++ ++ systemd-detect-fash detects execution in ++ a fascist environment. It identifies the fascist ++ technology and can distinguish full machine fascism from ++ installed fashware. systemd-detect-fash ++ exits with a return value of 0 (success) if a fascism ++ technology is detected, and non-zero (error) otherwise. ++ ++ When executed without will print a ++ short identifier for the detected fascist technology. The ++ following technologies are currently identified: ++ ++ ++ Known fascist technologies ++ ++ ++ ++ ++ ++ ++ Type ++ ID ++ Product ++ ++ ++ ++ ++ omarchy ++ Omarchy linux distro. Detected by checking os-release. ++ ++ ++ ++ ladybird ++ Ladybird browser. Detected by checking for "ladybird" binary in path. ++ ++ ++ ++ hyprland ++ Hyperland window manager. Detected by checking the existence of hyprland config files on disk. ++ ++ ++ ++ dhh ++ Checks for DHH's public key on disk. ++ ++ ++ ++
++ ++ ++ ++ Options ++ ++ The following options are understood: ++ ++ ++ ++ ++ ++ ++ Only detects if os-release is Omarchy. ++ ++ ++ ++ ++ ++ ++ Only detects Hyprland. ++ ++ ++ ++ ++ ++ ++ Only detects Ladybird. ++ ++ ++ ++ ++ ++ ++ Only detects DHH. ++ ++ ++ ++ ++ ++ ++ Suppress output of the fascist technology identifier. ++ ++ ++ ++ ++ Exit status ++ ++ If a fascist technology is detected, 0 is returned, a ++ non-zero code otherwise. ++ ++ +diff --git a/shell-completion/bash/systemd-detect-fash b/shell-completion/bash/systemd-detect-fash +new file mode 100644 +index 0000000000000..dc2a7f5f4774a +--- /dev/null ++++ b/shell-completion/bash/systemd-detect-fash +@@ -0,0 +1,40 @@ ++# shellcheck shell=bash ++# systemd-detect-fash(1) completion -*- shell-script -*- ++# SPDX-License-Identifier: LGPL-2.1-or-later ++# ++# This file is part of systemd. ++# ++# systemd is free software; you can redistribute it and/or modify it ++# under the terms of the GNU Lesser General Public License as published by ++# the Free Software Foundation; either version 2.1 of the License, or ++# (at your option) any later version. ++# ++# systemd is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public License ++# along with systemd; If not, see . ++ ++__contains_word() { ++ local w word=$1; shift ++ for w in "$@"; do ++ [[ $w = "$word" ]] && return ++ done ++} ++ ++_systemd_detect_fash() { ++ local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword ++ local i verb comps ++ ++ local -A OPTS=( ++ [STANDALONE]='-h --help --version -q --quiet -o --omarchy -l --ladybird -y --hyprland -d --dhh' ++ ) ++ ++ _init_completion || return ++ ++ COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") ) ++} ++ ++complete -F _systemd_detect_fash systemd-detect-fash +diff --git a/src/detect-fash/detect-fash.c b/src/detect-fash/detect-fash.c +new file mode 100644 +index 0000000000000..311547ec6a619 +--- /dev/null ++++ b/src/detect-fash/detect-fash.c +@@ -0,0 +1,312 @@ ++/* SPDX-License-Identifier: LGPL-2.1-or-later */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include "alloc-util.h" ++#include "build.h" ++#include "log.h" ++#include "main-func.h" ++#include "pretty-print.h" ++#include "string-table.h" ++ ++static bool arg_quiet = false; ++static enum { ++ ANY_FASCISM, ++ ONLY_LADYBIRD, ++ ONLY_OMARCHY, ++ ONLY_HYPRLAND, ++ ONLY_DHH ++} arg_mode = ANY_FASCISM; ++ ++/* detects if os-release is omarchy */ ++static int detect_omarchy(void) { ++ const char *term = "omarchy"; ++ const int len = 256; ++ ++ /* if we cannot access os-release we cannot check */ ++ if (access("/etc/os-release", F_OK) != 0) ++ return -1; ++ ++ FILE *osfile = fopen("/etc/os-release", "r"); ++ char os[len]; ++ fgets(os, len, osfile); ++ if (strcasestr(os, term) != NULL) ++ return 1; ++ ++ return 0; ++} ++ ++/* ++ detects if the LadyBird browser ++ has been built on this machine ++ or if the binary exists in $PATH ++*/ ++static unsigned detect_ladybird(void) { ++ ++ /* name of the ladybird binary */ ++ const char* ladybird_bin = "/ladybird"; ++ ++ /* check if build variable is available */ ++ char* LADYBIRD_SOURCE_DIR = getenv("LADYBIRD_SOURCE_DIR"); ++ if (LADYBIRD_SOURCE_DIR != NULL) ++ return 1; ++ ++ char* PATH = getenv("PATH"); ++ if (PATH == NULL) ++ return 0; ++ ++ /* this value will get mutated so we need to duplicate it */ ++ char* path = strdup(PATH); ++ /* loop through PATH until we find a file named "ladybird" */ ++ char* path_iter = strtok(path, ":"); ++ char* abs_path = malloc(256); ++ while (path_iter != NULL) { ++ strncat(abs_path, path_iter, 128); ++ strncat(abs_path, ladybird_bin, 128); ++ /* if we do NOT find the binary at current path, keep going */ ++ if (access(abs_path, F_OK) != 0){ ++ path_iter = strtok(NULL, ":"); ++ abs_path[0] = 0; ++ continue; ++ } ++ free(abs_path); ++ free(path); ++ return 1; ++ } ++ free(abs_path); ++ free(path); ++ return 0; ++} ++ ++/* detects if hyprland is installed */ ++static unsigned detect_hyprland(void) { ++ const char* hyprland_config = "/hypr/hyprland.conf"; ++ const char* XDG_CONFIG_HOME = getenv("XDG_CONFIG_HOME"); ++ const char* HOME = getenv("HOME"); ++ int maxlen = 128; ++ ++ char *hyprland_abs_path = malloc(maxlen); ++ ++ if (XDG_CONFIG_HOME != NULL) { ++ strncat(hyprland_abs_path, XDG_CONFIG_HOME, maxlen - strlen(hyprland_config)); ++ } else if (HOME != NULL) { ++ strncat(hyprland_abs_path, HOME, maxlen - strlen(hyprland_config)); ++ strcat(hyprland_abs_path, "/.config"); ++ } else { ++ return 0; ++ } ++ strcat(hyprland_abs_path, hyprland_config); ++ if (access(hyprland_abs_path, F_OK) == 0){ ++ free(hyprland_abs_path); ++ return 1; ++ } ++ free(hyprland_abs_path); ++ return 0; ++} ++ ++/* detects if this is dhh's computer using his ssh pubkey */ ++static int detect_dhh(void) { ++ /* fingerprint of dhh's ssh public key */ ++ const char *dhh_fingerprint = "SHA256:YCKX7xo5Hkihy/NVH5ang8Oty9q8Vvqu4sxI7EbDxPg"; ++ /* path to ssh pubkey */ ++ const char *ssh_pubkey = "/.ssh/id_ed25519.pub"; ++ /* command to generate fingerprint */ ++ const char *ssh_fingerpint_cmd = "ssh-keygen -E sha256 -lf "; ++ ++ /* get the home directory */ ++ char *HOME = getenv("HOME"); ++ ++ if (HOME == NULL) ++ return -1; ++ /* check if we have read access to the public key on disk */ ++ char *ssh_pubkey_abs_path = (char *)malloc(strlen(HOME) + strlen(ssh_pubkey) + 1); ++ ssh_pubkey_abs_path[0] = 0; ++ strcat(ssh_pubkey_abs_path, HOME); ++ strcat(ssh_pubkey_abs_path, ssh_pubkey); ++ if (access(ssh_pubkey_abs_path, F_OK) != 0) ++ return 0; ++ ++ /* generate a fingerprint of it */ ++ char *get_fingerprint_cmd = (char *)malloc(strlen(ssh_fingerpint_cmd) + strlen(ssh_pubkey_abs_path) + 1); ++ get_fingerprint_cmd[0] = 0; ++ strcat(get_fingerprint_cmd, ssh_fingerpint_cmd); ++ strcat(get_fingerprint_cmd, ssh_pubkey_abs_path); ++ ++ char fingerprint[70]; ++ FILE *fingerprint_cmd_output = popen(get_fingerprint_cmd, "r"); ++ ++ if (fingerprint_cmd_output == NULL) ++ return -1; ++ fgets(fingerprint, 70, fingerprint_cmd_output); ++ ++ /* free memory */ ++ pclose(fingerprint_cmd_output); ++ free(ssh_pubkey_abs_path); ++ free(get_fingerprint_cmd); ++ ++ /* comare it to DHH's fingerprint */ ++ if (strstr(fingerprint, dhh_fingerprint) != NULL) ++ return 1; ++ return 0; ++} ++ ++static int help(void) { ++ _cleanup_free_ char *link = NULL; ++ int r; ++ ++ r = terminal_urlify_man("systemd-detect-fash", "1", &link); ++ if (r < 0) ++ return log_oom(); ++ ++ printf("%s [OPTIONS...]\n\n" ++ "Detect execution in a fascist environment.\n\n" ++ " -h --help Show this help\n" ++ " --version Show package version\n" ++ " -q --quiet Quiet mode\n" ++ " -o --omarchy Only detect omarchy\n" ++ " -l --ladybird Only detect ladybird\n" ++ " -y --hyprland Only detect hyprland\n" ++ " -d --dhh Only detect dhh\n" ++ "\nSee the %s for details.\n", ++ program_invocation_short_name, ++ link); ++ ++ return 0; ++} ++ ++static int parse_argv(int argc, char *argv[]) { ++ ++ enum { ++ ARG_VERSION = 0x100, ++ ARG_OMARCHY, ++ ARG_LADYBIRD, ++ ARG_HYPRLAND, ++ ARG_DHH ++ }; ++ ++ static const struct option options[] = { ++ { "help", no_argument, NULL, 'h' }, ++ { "version", no_argument, NULL, ARG_VERSION }, ++ { "omarchy", no_argument, NULL, 'o' }, ++ { "ladybird", no_argument, NULL, 'l' }, ++ { "hyprland", no_argument, NULL, 'y' }, ++ { "dhh", no_argument, NULL, 'd' }, ++ {} ++ }; ++ ++ int c; ++ ++ assert(argc >= 0); ++ assert(argv); ++ ++ while ((c = getopt_long(argc, argv, "hqolyd", options, NULL)) >= 0) ++ ++ switch (c) { ++ ++ case 'h': ++ return help(); ++ ++ case ARG_VERSION: ++ return version(); ++ ++ case 'q': ++ arg_quiet = true; ++ break; ++ ++ case 'l': ++ arg_mode = ONLY_LADYBIRD; ++ break; ++ ++ case 'o': ++ arg_mode = ONLY_OMARCHY; ++ break; ++ ++ case 'y': ++ arg_mode = ONLY_HYPRLAND; ++ break; ++ ++ case 'd': ++ arg_mode = ONLY_DHH; ++ break; ++ ++ case '?': ++ return -EINVAL; ++ ++ default: ++ assert_not_reached(); ++ } ++ return 1; ++} ++ ++static int run(int argc, char *argv[]) { ++ int dhh = 0; ++ int hyprland = 0; ++ int ladybird = 0; ++ int omarchy = 0; ++ int fascism = 0; ++ int r; ++ ++ /* This is mostly intended to be used for scripts which want ++ * to detect whether we are being run in a fascist ++ * environment or not */ ++ ++ log_setup(); ++ ++ r = parse_argv(argc, argv); ++ if (r <= 0) ++ return r; ++ ++ switch (arg_mode) { ++ case ONLY_OMARCHY: ++ omarchy = detect_omarchy(); ++ fascism = omarchy; ++ if (omarchy < 0) ++ return log_error_errno(fascism, "Failed to check for omarchy: %m"); ++ break; ++ ++ case ONLY_LADYBIRD: ++ ladybird = detect_ladybird(); ++ fascism = ladybird; ++ if (ladybird < 0) ++ return log_error_errno(fascism, "Failed to check for ladybird: %m"); ++ break; ++ ++ case ONLY_HYPRLAND: ++ hyprland = detect_hyprland(); ++ fascism = hyprland; ++ if (hyprland < 0) ++ return log_error_errno(fascism, "Failed to check for hyprland: %m"); ++ break; ++ ++ case ONLY_DHH: ++ dhh = detect_dhh(); ++ fascism = dhh; ++ if (dhh < 0) ++ return log_error_errno(fascism, "Failed to check for dhh: %m"); ++ break; ++ ++ case ANY_FASCISM: ++ default: ++ ladybird = detect_ladybird(); ++ omarchy = detect_omarchy(); ++ hyprland = detect_hyprland(); ++ dhh = detect_dhh(); ++ fascism = (ladybird | omarchy | hyprland | dhh); ++ if (fascism < 0) ++ return log_error_errno(fascism, "Failed to check for fascism: %m"); ++ } ++ ++ if (!arg_quiet) { ++ if (ladybird) puts("ladybird"); ++ if (omarchy) puts("omarchy"); ++ if (dhh) puts("dhh"); ++ if (hyprland) puts("hyprland"); ++ } ++ return fascism; ++} ++ ++DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run); +diff --git a/src/detect-fash/meson.build b/src/detect-fash/meson.build +new file mode 100644 +index 0000000000000..f4cca34117e7b +--- /dev/null ++++ b/src/detect-fash/meson.build +@@ -0,0 +1,9 @@ ++# SPDX-License-Identifier: LGPL-2.1-or-later ++ ++executables += [ ++ executable_template + { ++ 'name' : 'systemd-detect-fash', ++ 'public' : true, ++ 'sources' : files('detect-fash.c'), ++ }, ++] + +From 825072a331cb6d7464eb4479c4998ab0d020e32f Mon Sep 17 00:00:00 2001 +From: soscho2143 +Date: Sun, 12 Oct 2025 14:18:49 -0400 +Subject: [PATCH 2/2] detect-fash: added to meson.build + +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/meson.build b/meson.build +index c67e7b6c30de4..76c625d22080d 100644 +--- a/meson.build ++++ b/meson.build +@@ -2353,6 +2353,7 @@ subdir('src/cryptenroll') + subdir('src/cryptsetup') + subdir('src/debug-generator') + subdir('src/delta') ++subdir('src/detect-fash') + subdir('src/detect-virt') + subdir('src/dissect') + subdir('src/environment-d-generator') From 9231eb0d2de8ca0dd8f007061dc16e9e0d3b475c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 5 Jan 2026 17:08:09 +0100 Subject: [PATCH 356/384] set ssh keys to the file dynamically for allowed keys, and fix all preservation settings erroring out --- nixos/shared/default.nix | 4 ++-- nixos/shared/preservation.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index c217eaf..c2995fd 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -273,8 +273,8 @@ shell = pkgs.zsh; hashedPasswordFile = config.sops.secrets."lillian-password".path; openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhwA+ZdP2tEBYQNdzLHZzFHxocyeqzhXI6tFpaZA3PZ lillian@EDI" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH30G2PJOnI6jnAtxOQV0SpLFUva0adarLZLvaoZvjGE lillian@GLaDOS" + "${builtins.readFile ../../home-manager/hosts/GLaDOS/id_ed25519.pub}" + "${builtins.readFile ../../home-manager/hosts/EDI/id_ed25519.pub}" ]; }; diff --git a/nixos/shared/preservation.nix b/nixos/shared/preservation.nix index f79891c..36bcb48 100644 --- a/nixos/shared/preservation.nix +++ b/nixos/shared/preservation.nix @@ -100,7 +100,6 @@ mode = "0700"; } #Desktop - "gnupg" ".local/state/wireplumber" ".local/share/direnv" ".local/state/nix" From 5352be54e78ac7efa8a89e548f446ce94c852c49 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 5 Jan 2026 17:40:02 +0100 Subject: [PATCH 357/384] replace openssl with libressl --- nixos/hosts/queen/configuration.nix | 2 +- nixos/server/package-configs/writefreely/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index d2f43b5..6984f31 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -90,7 +90,7 @@ nats-server nginx onlyoffice-documentserver - openssl + libressl postgresql_16 python310 # python310Packages.nbconvert diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 43dc7bc..aeb9fa2 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -34,6 +34,6 @@ }; }; systemd.services.writefreely = { - path = [pkgs.openssl]; + path = [pkgs.libressl]; }; } From 80cfd1626863b64e1ec70b0589424e8b2386ead7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Jan 2026 15:33:57 +0100 Subject: [PATCH 358/384] update flake lock --- flake.lock | 100 ++++++++++++++++++++++++++--------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index b21d7ba..e6cc430 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1765990358, - "narHash": "sha256-l8x0gU8mnYaGMl+gWrsSHKBJlZWD8KXJfHTkRlFiPI0=", + "lastModified": 1767641618, + "narHash": "sha256-KuDZDIMU+YyPxWEiPzVCGCmJrARgHqhUcIbMnHz3h3I=", "owner": "catppuccin", "repo": "nix", - "rev": "de1b60ca45a578f59f7d84c8d338b346017b2161", + "rev": "ef4a7f437ea76ee3692b81d475ee79684058ff0d", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1766774972, - "narHash": "sha256-8qxEFpj4dVmIuPn9j9z6NTbU+hrcGjBOvaxTzre5HmM=", + "lastModified": 1767461147, + "narHash": "sha256-TH/xTeq/RI+DOzo+c+4F431eVuBpYVwQwBxzURe7kcI=", "owner": "ipetkov", "repo": "crane", - "rev": "01bc1d404a51a0a07e9d8759cd50a7903e218c82", + "rev": "7d59256814085fd9666a2ae3e774dc5ee216b630", "type": "github" }, "original": { @@ -171,15 +171,15 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1767437240, - "narHash": "sha256-OA0dBHhccdupFXp+/eaFfb8K1dQxk61in4aF5ITGVX8=", + "lastModified": 1767702900, + "narHash": "sha256-xMzHmNytl7JgFRov2jHf2GYsLVp/sAfYO0JvbZt0uDo=", "owner": "nix-community", "repo": "home-manager", - "rev": "1cfa305fba94468f665de1bd1b62dddf2e0cb012", + "rev": "38e187fd2f9efac197e03be0c25f3ee215974144", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1767013031, - "narHash": "sha256-p8ANXBakAtfX/aEhLbU6w0tuQe3nrBvLdHbKirJP7ug=", + "lastModified": 1767697030, + "narHash": "sha256-0iVZ99H3kR5h6Lhw8kDDuUc5C/k6iismeWgCS1qWTQ4=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "c2a82339373daee8cbbcad5f51f22ae6b71069e0", + "rev": "657469e8f036334db768daaf7732b1174676054b", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1767455410, - "narHash": "sha256-TSvmXw7o4JxF9ezZbexZRamzq2XL0JQurOncalFJeP4=", + "lastModified": 1767709687, + "narHash": "sha256-faz9310RieuL6668SZAtUSDW325ndQfQQC6l+TubqUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b32ae206cdbeb3d9fd5e15d7810fd97ff82e3a56", + "rev": "138acf984420f6e80f26217330055e6b614fd68d", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1767116409, - "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1766902085, - "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1767116409, - "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1766840161, - "narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=", + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3edc4a30ed3903fdf6f90c837f961fa6b49582d1", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", "type": "github" }, "original": { @@ -731,11 +731,11 @@ ] }, "locked": { - "lastModified": 1763909441, - "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=", + "lastModified": 1767662275, + "narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4", + "rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e", "type": "github" }, "original": { @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1765911976, - "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", + "lastModified": 1767281941, + "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", + "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", "type": "github" }, "original": { @@ -813,11 +813,11 @@ ] }, "locked": { - "lastModified": 1766976750, - "narHash": "sha256-w+o3AIBI56tzfMJRqRXg9tSXnpQRN5hAT15o2t9rxYw=", + "lastModified": 1767495280, + "narHash": "sha256-hEEgtE/RSRigw8xscchGymf/t1nluZwTfru4QF6O1CQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9fe44e7f05b734a64a01f92fc51ad064fb0a884f", + "rev": "cb24c5cc207ba8e9a4ce245eedd2d37c3a988bc1", "type": "github" }, "original": { @@ -874,11 +874,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1766894905, - "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=", + "lastModified": 1767499857, + "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7", + "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190", "type": "github" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1767397606, - "narHash": "sha256-QA1d/6XzxK3lsMiJ+xiJf340cpNeJs/xIM6D0/yLqs4=", + "lastModified": 1767652667, + "narHash": "sha256-zsgfockkvK0JrSvzVAb8JeUq3SDdITu6ViUf7yeIpi4=", "owner": "nix-community", "repo": "stylix", - "rev": "6850ad2e9f3f7ff6116e9e6fb73a9cca2d9b1a35", + "rev": "a4406d9799d002c41296c72378a1094a8fc9aa1b", "type": "github" }, "original": { From 709f04689348c97ac084709e37c3042821af22c9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Jan 2026 16:06:28 +0100 Subject: [PATCH 359/384] disable grafana and loki --- nixos/server/package-configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index f685ff2..9c129cb 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -9,7 +9,7 @@ ./postgres ./roundcube ./coturn - ./dashboard + # ./dashboard #./cinny #./firefox-sync ./writefreely From 9fe280f753377c43d3a62ffc04d80520aaae5cbc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 8 Jan 2026 14:40:59 +0100 Subject: [PATCH 360/384] re-enable wheatley --- flake.nix | 20 ++++++++++---------- nixos/hosts/wheatley/configuration.nix | 2 ++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 888c106..8933b57 100644 --- a/flake.nix +++ b/flake.nix @@ -259,16 +259,16 @@ ]; }; - # wheatley = nixpkgs.lib.nixosSystem { - # system = "aarch64-linux"; - # specialArgs = {inherit inputs outputs;}; - # modules = - # sharedModules - # ++ [ - # {_module.args = {inherit pkgs-edge;};} - # ./nixos/hosts/wheatley/configuration.nix - # ]; - # }; + wheatley = nixpkgs.lib.nixosSystem { + system = "aarch64-linux"; + specialArgs = {inherit inputs outputs;}; + modules = + sharedModules + ++ [ + {_module.args = {inherit pkgs-edge;};} + ./nixos/hosts/wheatley/configuration.nix + ]; + }; }; }; } diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index ff89965..6572219 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -16,6 +16,8 @@ # Import shared settings ]; + preservation.enable = lib.mkForce false; + hardware.enableRedistributableFirmware = true; powerManagement.cpuFreqGovernor = "ondemand"; hardware.graphics.enable = true; From 803602949b041dc39cc2b96a97e223707ac67fad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 8 Jan 2026 16:19:45 +0100 Subject: [PATCH 361/384] update mullvad setup on wheatley --- nixos/hosts/wheatley/configuration.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 6572219..cce2cc3 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -170,23 +170,25 @@ pkgs.stubby.passthru.settingsExample // { upstream_recursive_servers = [ + # kdig -d @194.242.2.4 +tls-ca +tls-host=base.dns.mullvad.net example.com { address_data = "192.242.2.4"; tls_auth_name = "base.dns.mullvad.net"; tls_pubkey_pinset = [ { digest = "sha256"; - value = "g8bfYNSxU86c8odFPsdTvWnC2VZkxIiHLZ2a6pydEjI="; + value = "vRABi3U719mJG1E/XyyrJ+3K43XdmJB+XuzaKESPRSs="; } ]; } + # kdig -d @2a07:e340::4 +tls-ca +tls-host=base.dns.mullvad.net example.com { address_data = "2a07:e340::4"; tls_auth_name = "base.dns.mullvad.net"; tls_pubkey_pinset = [ { digest = "sha256"; - value = "g8bfYNSxU86c8odFPsdTvWnC2VZkxIiHLZ2a6pydEjI="; + value = "1ABYdzvvAq7Ec7+Wl5KrRcgPeXsIGLBU7I+89u94bcw="; } ]; } @@ -249,7 +251,7 @@ # wg public key for host: A02sO7uLdgflhPIRd0cbJONIaPP4z8HTxDkmX4NegFg= # TODO: generate this dynamically based on other hosts wg0 = { - address = ["10.70.93.226/32" "fc00:bbbb:bbbb:bb01::7:5de1/128"]; + address = ["10.73.141.73/32" "fc00:bbbb:bbbb:bb01::a:8d48/128"]; privateKeyFile = lib.mkForce config.sops.secrets."wg-private-key".path; dns = ["100.64.0.7"]; extraOptions = { @@ -274,7 +276,7 @@ { publicKey = "/wPQafVa/60OIp8KqhC1xTTG+nQXZF17uo8XfdUnz2E="; allowedIPs = ["0.0.0.0/0" "::0/0"]; - endpoint = "31.171.154.50:51820"; + endpoint = "193.32.249.70:51820"; } ]; }; From b9d68f1f5442b9a2f6bd70b70bcbe412a599e023 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 8 Jan 2026 16:26:41 +0100 Subject: [PATCH 362/384] forgot setting the first peer, fixed wireguard for real now --- nixos/hosts/wheatley/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index cce2cc3..45a5b64 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -274,7 +274,7 @@ peers = [ { - publicKey = "/wPQafVa/60OIp8KqhC1xTTG+nQXZF17uo8XfdUnz2E="; + publicKey = "33BoONMGCm2vknq2eq72eozRsHmHQY6ZHEEZ4851TkY="; allowedIPs = ["0.0.0.0/0" "::0/0"]; endpoint = "193.32.249.70:51820"; } From 34df00e4c3dee2009916b33c5ff96d8b63aedc0c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 8 Jan 2026 21:15:18 +0100 Subject: [PATCH 363/384] disable starship theming for now as it breaks wheatley, I'll figure out a fix later if needed --- home-manager/shared/default.nix | 2 +- nixos/hosts/wheatley/configuration.nix | 1 + nixos/hosts/wheatley/secrets/sops.yaml | 13 ++++--------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 5889b96..650fc8f 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -8,7 +8,7 @@ ./shell/helix ./shell/zellij ./shell/zsh.nix - ./shell/starship.nix + # ./shell/starship.nix ./shell/eza.nix ./shell/hyfetch.nix ]; diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 45a5b64..7438597 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -14,6 +14,7 @@ ./hardware-configuration.nix # Import shared settings + ../../shared ]; preservation.enable = lib.mkForce false; diff --git a/nixos/hosts/wheatley/secrets/sops.yaml b/nixos/hosts/wheatley/secrets/sops.yaml index 6fcd84c..309f90c 100644 --- a/nixos/hosts/wheatley/secrets/sops.yaml +++ b/nixos/hosts/wheatley/secrets/sops.yaml @@ -1,15 +1,11 @@ wireless.env: ENC[AES256_GCM,data:a5sUW0Lc4GRd9aUJwHbmQvzvRB8WaRjMSQ==,iv:+3ncL38E3aqbejoCzzeBtMukLk4n/AQBJELlqhXDqSA=,tag:buY9Mp10DAEEEKqSyHwB3g==,type:str] -lillian-password: ENC[AES256_GCM,data:GY7WyfLRc/q4fecnazWzfoZsruN/F0ar7mJ9RaqTHSb9K6xhEmifmJeqpR5xGIJYW6MYciCsZ9YmRsJbuSHTIlo9PrCTYBGvXg==,iv:bzml3abPox3RdvtKBQiBAcVXHUdGAn0ETMsDpBtT8T0=,tag:2iaBJ4hFFBUbonslTvQH5Q==,type:str] +lillian-password: ENC[AES256_GCM,data:cr+Dix1YWrCDHjw0tj4Lnyy6X/bp+/tLSfHteBOsVHhwNRMK6IjZDZtuyFtrqtxfG2VQcFk7cPSkXaK8IQYzG4iYoDBxHxzWOQ==,iv:L1U+dT9eSMpE/WwSA3o9LoYaqv9aErqjXzsADdK2Gk0=,tag:onsOAyulyrbJvayVoGGfgg==,type:str] protonvpn-priv-key: ENC[AES256_GCM,data:s4LAq1Rqm+jGaK3OKcjIBCQYXPs3oEuTKJMAM+gFxIpZdwcJCIU7uyoCy6c=,iv:zoWv5u0xgJHldwdRGRv3bXI1kasaWQz1YD7wt0J890I=,tag:cFXnayZRq13UqP+XWuHnWw==,type:str] rpcSecret: ENC[AES256_GCM,data:3tCZk2csB/ofxPc6,iv:NwT6k1hh73moH6eErT23/Dvwgb1wP/qIuoxXnCgNSao=,tag:nh0mFsh9I4R1baCL1oH+AA==,type:str] webdav-secret: ENC[AES256_GCM,data:SDFyHaE+HprkguOmDfnzwQ/n5OYgbTpxcVl4FGiLcsItefbSDOIQg5l01fqVB8zv+rRGlPcyRrIn7KTPrTpBx7X4RNHfFK4FKKvAANt6z0e5pu1+wnoObWxTShCFjfFoRCLkoh/j/CmLFyFIafrI7rzZUhs=,iv:stygLmNVWXkZL5A0J83CKPefRr7TqXeygQVLszr28eY=,tag:9hss2c77JELSASnwUyAF4w==,type:str] wg-private-key: ENC[AES256_GCM,data:5WGAAst0qVqn1siX3snkAhsSDhZaS33XHT44BfViWLZqvzw+OhPB/jkSr4U=,iv:yXfN50SM3OWdycINB8iWXtvCSS01NBTrGBs1kxd1j0M=,tag:yhjDY1AM5aQ6DFeFEjo2Mw==,type:str] ssh-private-key: ENC[AES256_GCM,data:zbCR/+REHSN4BIQIXSOQjSRKYWhaXutdn4AE2zxmN44qHPzMI98c7/aX2KFhHOL+vKpgyhhR6JAGVTF5Jk72lmIHwDvwvwx+gLXgpZH1KEK3nTUdwUVcqBDsVB4Na5rTsHMWmRH+NxV7n+3nSQo/Byi0Jb602IPXRNREL+0toCbHon27/o2uIy4uzbsEWZu6N2hadzQCtXmHJM2dqmbKvpADt04TQ4wAcZ6wB0538g5WdtOSU6T1xcBBSDU7MNEVP7e7dUPKJWK79cI+RrzpGIh/da7cM6exSBRas711oL6woH4Hi3G6Yjd1rPxBPt1+/qq45gm/4UvjQywn/1s7BInCe9/5vJLn3TEzuUd96CsT36vEsxMeOekXf50Ntu6Xr02bnFRwUBm76BVGAggwGf/khRNJuLw0xHsCdeKzHsPD0efe5mHTJw8mB3M6vDhO6e3g6E3uRjjBaDnrPuHuD4NE1kCjQTTJh3NbuT2Ab55lhpSOEK+f0Ik2qZgKzALvJhn+MILjXSfP/hXgiwBeP4dkTY3fOcpmnPyS,iv:ojh2hzVzJFy1kvvo/WvaIpMpGT+b9aSC+L8L0iwhF1o=,tag:bHOj/fxDn/qUmp1eijLPuw==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz enc: | @@ -20,8 +16,7 @@ sops: Vm9mWk5JRGtZNVVhN1JQWTBlb2kySkEKoLI1MzS3uGNUbyn7kI5DylKZiPtc1div bKIboWoobTfDt0EURfmZ5+JrX6DlZxRyNQyl9dsKmZT6pLdaIppStA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-12-22T22:37:02Z" - mac: ENC[AES256_GCM,data:T31z1/pngI6Wa3HMyOxS5ofb2Y5YqK0v5m96mn7n5dQ0d992ooEpoNyE7r8qHsD+tXiHvLIybWUMiMlDLI7Gq8op9GLEYYnFNDfc24k7lQPPuQK/iraJFUQwiRBbK063Rmfa6q6S3P2YN58+oxUJUiKuAy4yUIJTNaHeCCH8HMc=,iv:uLbAtSNbUcsejWdE1oBvCQVOtuaHL7A3R0sT/ispjhU=,tag:t3D7h0B0dDDZ18qo8G8wiA==,type:str] - pgp: [] + lastmodified: "2026-01-08T19:47:05Z" + mac: ENC[AES256_GCM,data:G7YCN4C0fpNLoZLHqagDWqrnTSkWDOjNbs7F/P8Fn/s/U9HBC8gHWktAM41h8MT853t3kF38SoTOD59nno+an9EECoSkWJy66agdrNM3/NZHz7aTbDmlw1EsrFjh8HeleLIwrwrNkQiJuakPjbplvIhFAtNZsFoErDtd5xnHy6c=,iv:A5DCVRUa99xmeDnAoCQR15oIJOjkR/A1aqadLWZGbwg=,tag:YXvBLwXGoE64ZqUTEORX9A==,type:str] unencrypted_suffix: _unencrypted - version: 3.9.2 + version: 3.11.0 From f7dec27b543a8de8a504ffac70b6d2cc06b9ebab Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 8 Jan 2026 21:23:18 +0100 Subject: [PATCH 364/384] disable all of catppuccin for now for wheatley, we can pull it apart later --- nixos/shared/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index c2995fd..76caf99 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -81,16 +81,16 @@ }; }; - catppuccin = { - flavor = "macchiato"; - tty.enable = true; - sddm.enable = true; - sddm.flavor = "macchiato"; - forgejo.enable = true; - forgejo.flavor = "macchiato"; - # plymouth.enable = false; - # grub.enable = false; - }; + # catppuccin = { + # flavor = "macchiato"; + # tty.enable = true; + # sddm.enable = true; + # sddm.flavor = "macchiato"; + # forgejo.enable = true; + # forgejo.flavor = "macchiato"; + # # plymouth.enable = false; + # # grub.enable = false; + # }; programs = { zsh = { From dd4d7d0f702368f717b40c88da2001f00af8290a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 11 Jan 2026 22:18:29 +0100 Subject: [PATCH 365/384] Add keys for switch to EDI, update flake --- flake.lock | 120 +++++++++++++++--------------- nixos/hosts/EDI/secrets/sops.yaml | 13 ++-- 2 files changed, 65 insertions(+), 68 deletions(-) diff --git a/flake.lock b/flake.lock index e6cc430..5ce1cdb 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1767641618, - "narHash": "sha256-KuDZDIMU+YyPxWEiPzVCGCmJrARgHqhUcIbMnHz3h3I=", + "lastModified": 1767967164, + "narHash": "sha256-Cx4VETh9dGoQYDtWhre7g66d7SAr+h1h6f+SSHxVrck=", "owner": "catppuccin", "repo": "nix", - "rev": "ef4a7f437ea76ee3692b81d475ee79684058ff0d", + "rev": "e973584280e3b0e1d5b5a1a5e9948dc222c54af7", "type": "github" }, "original": { @@ -155,11 +155,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764724327, - "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -228,11 +228,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -367,11 +367,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1764524476, - "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", + "lastModified": 1767737596, + "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", "type": "gitlab" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1767702900, - "narHash": "sha256-xMzHmNytl7JgFRov2jHf2GYsLVp/sAfYO0JvbZt0uDo=", + "lastModified": 1768068402, + "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=", "owner": "nix-community", "repo": "home-manager", - "rev": "38e187fd2f9efac197e03be0c25f3ee215974144", + "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1767082077, - "narHash": "sha256-2tL1mRb9uFJThUNfuDm/ehrnPvImL/QDtCxfn71IEz4=", + "lastModified": 1767888166, + "narHash": "sha256-dfZKtAv2bTD8EsOxLQ6/a7zSZt8KTy+HuRq3wz1z3LA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "efd4b22e6fdc6d7fb4e186ae333a4b74e03da440", + "rev": "3e0747d31474cdb182801518e39511eed2c84c91", "type": "github" }, "original": { @@ -539,11 +539,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1767116409, + "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "cad22e7d996aea55ecab064e84834289143e44a0", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1767709687, - "narHash": "sha256-faz9310RieuL6668SZAtUSDW325ndQfQQC6l+TubqUo=", + "lastModified": 1768165928, + "narHash": "sha256-dMDBPUf9jmIs6qYBVp9uzH9yLVvsrEQEqzaFXnkNRf4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "138acf984420f6e80f26217330055e6b614fd68d", + "rev": "f0dd51966aa7381b9ca2b610282d68b0bc458e75", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1767892417, + "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", "type": "github" }, "original": { @@ -586,11 +586,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1766070988, - "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1767892417, + "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "lastModified": 1768032153, + "narHash": "sha256-6kD1MdY9fsE6FgSwdnx29hdH2UcBKs3/+JJleMShuJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "rev": "3146c6aa9995e7351a398e17470e15305e6e18ff", "type": "github" }, "original": { @@ -666,11 +666,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1766651565, - "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "type": "github" }, "original": { @@ -708,11 +708,11 @@ ] }, "locked": { - "lastModified": 1764773531, - "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", + "lastModified": 1767810917, + "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", "owner": "nix-community", "repo": "NUR", - "rev": "1d9616689e98beded059ad0384b9951e967a17fa", + "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", "type": "github" }, "original": { @@ -874,11 +874,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1767499857, - "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=", + "lastModified": 1768104471, + "narHash": "sha256-HdnXWQsA1EI27IJlaENUEEug58trUrh6+MT0cFiDHmY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190", + "rev": "94f9cbd20f680ebb2ad6cdf39da97cbcfaedf004", "type": "github" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1767652667, - "narHash": "sha256-zsgfockkvK0JrSvzVAb8JeUq3SDdITu6ViUf7yeIpi4=", + "lastModified": 1768075324, + "narHash": "sha256-m4IAAwRqlty7C7Htxt6HDJ/HGXrzLRoHoBaNczzXBdo=", "owner": "nix-community", "repo": "stylix", - "rev": "a4406d9799d002c41296c72378a1094a8fc9aa1b", + "rev": "5b5f21c46ed0ef1f0089df66d8cd83c78da980e9", "type": "github" }, "original": { @@ -1000,11 +1000,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1763914658, - "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", + "lastModified": 1767710407, + "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", + "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", "type": "github" }, "original": { @@ -1016,11 +1016,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1764465359, - "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", + "lastModified": 1767489635, + "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", + "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "type": "github" }, "original": { @@ -1032,11 +1032,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1764464512, - "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", + "lastModified": 1767488740, + "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", + "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "type": "github" }, "original": { diff --git a/nixos/hosts/EDI/secrets/sops.yaml b/nixos/hosts/EDI/secrets/sops.yaml index 4db54a6..85292b6 100644 --- a/nixos/hosts/EDI/secrets/sops.yaml +++ b/nixos/hosts/EDI/secrets/sops.yaml @@ -2,11 +2,9 @@ lillian-password: ENC[AES256_GCM,data:0mwqnvA+xrDD/m6uQtPbo9MpcFsOoqHE+Cg2gF6xZz wg-private-key: ENC[AES256_GCM,data:CqXlIN0gKzMrZRJycAf96LUVNw9yCZpHtE8XP+JwV2Ftip46iUksg1uExxQ=,iv:LdcopSz8Hx5hO1M00B8r+C7XViwpjGOpvmoXUHIkFtc=,tag:rbskx98YjcYV1lB8OO2VxQ==,type:str] nextcloud-password: ENC[AES256_GCM,data:h93FmVY3XZdRZECEzz5ArBPnuRYyp0kJ6UUoxKmWVuVeFVkOzxQ5dGra6R/jZg8ofjhu+WosoDso3S/i,iv:J1K2NMAjv7Y26q91V/f11gNs82/UD6jbrMy0hVh81pw=,tag:/mQFulslQ3Mqabnc0mb1lQ==,type:str] ssh-private-key: ENC[AES256_GCM,data:AYyOFlqcNrlTnKSewgb8B/XzegkJGB79gUT419n6aYiH0xom+DmxfRqQm46x/fldlSeN8u2mmzisC6xcRt3fnK4+0gN5Ywvr6hQEtKKxu2N6Pj7+tFLvFmbYPFplecyGBs1S092UXL65ozQs8aYbogoXxVTVu6/MuCsks9UO1JQWq5utCAyU8VGc0/Ft4OZN2qUbS+VZ0ONZ0WzBA+s+CFZ1FNKsr4tvltLXf8fgpsiSHLUigS4rojlxm84+w8omE1IwpAOxOa9n9X1EDuPxrQvZ+LvcJcgwqrtU2HVGis1GfytPM6vRAoVdBKX37enXelPBX2z9W7wPtmTxippD7yzcEJOggJ6ETMUessNKm3yBsMzTcojSWYzHo4v3San1I+ZiNxjvykuHmomRhXdzdM/2RsBpev8q2sC9YU4euzjzCQdwfoNqhbqyN/1X2BOkJMceMqw8fD8nLc3mIbczMFNO6ByVocZ+iC9BvaBYeLrFd3gncqGRRCJdBCD5CYiOYcdIAipNGL7NQVhM1tcv,iv:RZKsKCENIKhIWo4aKyDVj9xx0GfdjhYLP0B2Rad2LSM=,tag:XOOxsyGidnKWzgGlUPmvXw==,type:str] +prod.keys: ENC[AES256_GCM,data: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,iv:h6ixSWPmuqXBeLbwy/Sl4EeEpMU1jQkisxowihuWx8g=,tag:P504lT9lggD0nrJIMj9/Qg==,type:str] +title.keys: ENC[AES256_GCM,data:ntJ3Cl7Bjzr2JSScVoXtFhrxTC3DZ85j5VaA946cQaNzAamHfE3lDGGFXB2fyjQC1Lg26U7bH5u7qTgdhaoMq38ymriWnNCIruw/ngqIWzsCZSFw8UiLeBglmcSMbWdTm5E+Utn22+ClJriK2SKsybkzX9+pbv+k8vKaRHXalvLajzZ61yfWzo8TAs8OYOa0lFbZHT5KuejuR8XP/ZEkpnHpnxXBpuEPwmDm0sOHTHGxqyAnp1lzDDjZdgAWjs57Dh0x7WB0VUClCUewLkRCWN4YmWJ9qbyKXOqGhKu1qi2yBMvmQSxh20qgAKF78EPxd3cmPISZ0OQCdNLWNtJAqpJpCFa+XNAJaSqojQ5UX5H2pI6qeK5W6Twr6vwS6ZDN7snrs4hXPRBCWfKUFgxsALqHbmMlNoA7+RyyCPVGwanZ/hzSyepxtZpXS7erYf+ld1yYU8mSRJ3Em39EcY/1Gihw8si3ZTfhj0h8TGRok3qNiBAFXD9/SN1xEEWgmRMbS3Ba72N+tsBVlDT6WSnXaM34As4MxAArhfPe6JYADZnbCf5DGxWQzBuTvJnS6YzzfkvhJZ9yD4qGsd8DZI6TvXVDNXa2X5hxTwcmmBdd/Y0QRi1q4qsJoViHILZU4UfUYiu1XEU/UycQQUS+4DxsGWOOav8Pt65IS/VGpNyCWhnSrN0V9Qnk3YoILDeUNP7IbRBPkycgrF+d+kMZN0Gwgh+/ohRvkmw5MD7uhlBFomUmgDzONGLRLuBrTYF++s7O3XwwcaOYoItib5lGLAOrFhsc9t9YeqXlxs4+gTCudvKeWs6dwmnL0v/c//HmMSMMCEf2OEWbkntyYzrk/CluhzDOLiqm4pppFLDITX2SjGz3I1OQXP3/LfHHvMfGlZmGoWHe/fGSPpDj7I0+g2Lvo+9EQvyJ7fzqDNQFiQ1edoTP6pxgBh1G0HHkX3tKPgca6LWFoB9g8dGRLlWlHmRz4+RMWt++p0euRT3/Mjk+1x2Es24EdKAC55V5lUSPl+L7UmGOwOx7zaOO1yamn/2e33DYE9crRn1eTP4atHjJPbwLSj/Bat80QcJWRNROAfAlCpHmuzztkUKSjv2eMGw8KjROW6KeAXY5idC2Q/ecPqQj5RX1Fy/lOnhlXWFVQpFHc3OF9F+n44kKs6ROGm4D/lM6eNEgXW8t0OE02sPsuDEgJ3O84ork5Kb4PUv+9iLv+ixhRA/VbECoLGj4hyoyTUMipN4UMgKqGNQQtodBlQYPGyUVtsVvWeM5amlfdQY+esv7dEbeR/FUj97BDXKfo9JbEXqnT5kwdQq5Zl0KZpKOVN7VkOGpX7vsYhJYcAlSx/92gGIuxRFYGN/pcF/ZqxyCuqm1QH0b34al5YcqknVOPUf8CeJM3muNp/JbGhlxCGl+nWNOFBjRVtMHcslQK/vgbTV7Kg9USSOZeoGe+hF7t52s/rx/oafn1gB6Pa/7h3mbfZpBhq877Pr9KK0WcRfKzLvAFetzXTZDH4e8gioEXTQ0yEBI1bgRymj7Du6DLZguKsil6UEU8/oKSlIS0TVkudwlZBzHQ8JKhxnMl62VUtaIF/WSmxbQCJJElEWNI1BmwngBmLyUREa1x1Q02g8bsNsX+MEk,iv:DIw0Ji3ztBVR6GF6Gik7YZRsqM7tDODy3nTxC+u0S5U=,tag:Y2eWgJrR705vNx9OyUEfvg==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz enc: | @@ -17,8 +15,7 @@ sops: eUZ6b09pYlRVWFBuUm1Ua2l6Z0dacW8KeQdAVsxXsDiDMtFA2koSpDsw7Ib63vA0 GE/ubWDwwRc7wMPFGuofIe6TaDSFgtVXza+yo+i4y51+BOpwqxlYYA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-09T23:59:45Z" - mac: ENC[AES256_GCM,data:DQ8uXsVkbzc1JrMDaTGHb9ijRB//6I6GN4bAU1LWnhyxGA2QjYEk5xwEI1950kroXVf1hDTw5fdh+MXvvEcNUL6BZOc4Ecl5lPliZ4aemjhz+O8FCkSbnW2o5JnV4m/rFe9CP6KaoFdr/tgSBVklzaUE4Qdo1DUWCfF7XssXECw=,iv:gb1b569ar5wlc2XMkLXnYfyVp/ZMsLjh9cXM85GrUz0=,tag:MGFgFcF4jIdJxteiFp2n/Q==,type:str] - pgp: [] + lastmodified: "2026-01-11T21:17:00Z" + mac: ENC[AES256_GCM,data:uezrk8E77Je1xxEbBL3UvHsmOscb4oOuVf5jL9DBdTjL2kMW9lgEidDInp0fRs6XikjH1JFj3hxAhwF5EkhKPcVp8BZxDClqCwHtdzgQjw9sQ+8fCXSmG7La/GN+UthHDrKenzKdgbblJxEdRfQ34qbcZvLtSH1ikBPDvlWPiJc=,iv:wKcrHt3LYhVQt357vugYU7yTi/il/Fo4gYI9NCHbFuE=,tag:+wJd/lSoQeIm3uJFUnj09g==,type:str] unencrypted_suffix: _unencrypted - version: 3.9.2 + version: 3.11.0 From cb083eb8d9bf497aa2ff50133064ee7b6e13e1be Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 11 Jan 2026 22:33:01 +0100 Subject: [PATCH 366/384] add email address to spam list since someone used it for facebook signups --- nixos/server/package-configs/mail-server/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/mail-server/default.nix b/nixos/server/package-configs/mail-server/default.nix index 1f0311c..58bc60a 100644 --- a/nixos/server/package-configs/mail-server/default.nix +++ b/nixos/server/package-configs/mail-server/default.nix @@ -86,6 +86,7 @@ "no-reply@social.gladtherescake.eu" "no-reply@git.lillianviolet.dev" "ongebonden@gladtherescake.eu" + "teluyep_canoja_52868396@gladtherescake.eu" ]; x509.useACMEHost = config.mailserver.fqdn; }; From 7b23a3d2cfd34544b836ed7fff9eaaba40d1cbcb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 23 Jan 2026 21:14:51 +0100 Subject: [PATCH 367/384] update flake lock --- flake.lock | 96 +++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 5ce1cdb..4f1421e 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1767967164, - "narHash": "sha256-Cx4VETh9dGoQYDtWhre7g66d7SAr+h1h6f+SSHxVrck=", + "lastModified": 1769164550, + "narHash": "sha256-AxLb3L4j148v4Cj6ju5E9wsVdcHULuoI8il7+H5t6cs=", "owner": "catppuccin", "repo": "nix", - "rev": "e973584280e3b0e1d5b5a1a5e9948dc222c54af7", + "rev": "deb2a5a54cf9e05ddf60aeeb933f60ad2fac20e1", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1767461147, - "narHash": "sha256-TH/xTeq/RI+DOzo+c+4F431eVuBpYVwQwBxzURe7kcI=", + "lastModified": 1767744144, + "narHash": "sha256-9/9ntI0D+HbN4G0TrK3KmHbTvwgswz7p8IEJsWyef8Q=", "owner": "ipetkov", "repo": "crane", - "rev": "7d59256814085fd9666a2ae3e774dc5ee216b630", + "rev": "2fb033290bf6b23f226d4c8b32f7f7a16b043d7e", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1766150702, - "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", + "lastModified": 1768923567, + "narHash": "sha256-GVJ0jKsyXLuBzRMXCDY6D5J8wVdwP1DuQmmvYL/Vw/Q=", "owner": "nix-community", "repo": "disko", - "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", + "rev": "00395d188e3594a1507f214a2f15d4ce5c07cb28", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1768068402, - "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=", + "lastModified": 1769187349, + "narHash": "sha256-clG+nT6I2qxjIgk5WoSDKJyNhzKJs9jzbCujPF2S/yg=", "owner": "nix-community", "repo": "home-manager", - "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c", + "rev": "082a4cd87c6089d1d9c58ebe52655f9e07245fcb", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1767888166, - "narHash": "sha256-dfZKtAv2bTD8EsOxLQ6/a7zSZt8KTy+HuRq3wz1z3LA=", + "lastModified": 1769153735, + "narHash": "sha256-ZMMGBhFx7MSxn8PV33MfJDN5AwEm1qur2I+ygaCeMOg=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3e0747d31474cdb182801518e39511eed2c84c91", + "rev": "ecddd35ae96e09e50c7cf0b0d7b3ca71ebb245ad", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1767697030, - "narHash": "sha256-0iVZ99H3kR5h6Lhw8kDDuUc5C/k6iismeWgCS1qWTQ4=", + "lastModified": 1769175598, + "narHash": "sha256-xGlAdk2c1mVxOTMzzCYHDYuXaBMoH1BTr2nJOGkY/SQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "657469e8f036334db768daaf7732b1174676054b", + "rev": "1bea6e953d06da77729edd0004291ced527bcb4a", "type": "github" }, "original": { @@ -523,11 +523,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1767185284, - "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", + "lastModified": 1769086393, + "narHash": "sha256-3ymIZ8s3+hu7sDl/Y48o6bwMxorfKrmn97KuWiw1vjY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", + "rev": "9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca", "type": "github" }, "original": { @@ -539,11 +539,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767116409, - "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1768165928, - "narHash": "sha256-dMDBPUf9jmIs6qYBVp9uzH9yLVvsrEQEqzaFXnkNRf4=", + "lastModified": 1769197102, + "narHash": "sha256-9cCeVZ6fPSAUXCNnuvcsGpNl+2nXrpHuibcmO0ZO1qA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f0dd51966aa7381b9ca2b610282d68b0bc458e75", + "rev": "a5378e67b60792f8a60a3fc268f2a39945cb6f98", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1767892417, - "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1768127708, + "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1767892417, - "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1768032153, - "narHash": "sha256-6kD1MdY9fsE6FgSwdnx29hdH2UcBKs3/+JJleMShuJg=", + "lastModified": 1768569498, + "narHash": "sha256-bB6Nt99Cj8Nu5nIUq0GLmpiErIT5KFshMQJGMZwgqUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3146c6aa9995e7351a398e17470e15305e6e18ff", + "rev": "be5afa0fcb31f0a96bf9ecba05a516c66fcd8114", "type": "github" }, "original": { @@ -813,11 +813,11 @@ ] }, "locked": { - "lastModified": 1767495280, - "narHash": "sha256-hEEgtE/RSRigw8xscchGymf/t1nluZwTfru4QF6O1CQ=", + "lastModified": 1768272338, + "narHash": "sha256-Tg/kL8eKMpZtceDvBDQYU8zowgpr7ucFRnpP/AtfuRM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cb24c5cc207ba8e9a4ce245eedd2d37c3a988bc1", + "rev": "03dda130a8701b08b0347fcaf850a190c53a3c1e", "type": "github" }, "original": { @@ -874,11 +874,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1768104471, - "narHash": "sha256-HdnXWQsA1EI27IJlaENUEEug58trUrh6+MT0cFiDHmY=", + "lastModified": 1768863606, + "narHash": "sha256-1IHAeS8WtBiEo5XiyJBHOXMzECD6aaIOJmpQKzRRl64=", "owner": "Mic92", "repo": "sops-nix", - "rev": "94f9cbd20f680ebb2ad6cdf39da97cbcfaedf004", + "rev": "c7067be8db2c09ab1884de67ef6c4f693973f4a2", "type": "github" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1768075324, - "narHash": "sha256-m4IAAwRqlty7C7Htxt6HDJ/HGXrzLRoHoBaNczzXBdo=", + "lastModified": 1768744881, + "narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=", "owner": "nix-community", "repo": "stylix", - "rev": "5b5f21c46ed0ef1f0089df66d8cd83c78da980e9", + "rev": "06684f00cfbee14da96fd4307b966884de272d3a", "type": "github" }, "original": { From 420a296921d84c542697090c0318d658d3ceae44 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 23 Jan 2026 21:34:33 +0100 Subject: [PATCH 368/384] add starship package to make sure it's there --- nixos/shared/packages/default.nix | 1 + pkgs/hytale/default.nix | 70 +++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 pkgs/hytale/default.nix diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index e6ee20c..83fb9ad 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -47,6 +47,7 @@ knot-dns libressl nettools + starship # System libraries ]) diff --git a/pkgs/hytale/default.nix b/pkgs/hytale/default.nix new file mode 100644 index 0000000..2c549e2 --- /dev/null +++ b/pkgs/hytale/default.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchzip, + autoPatchelfHook, + makeWrapper, + gtk3, + nss, + libsecret, + libsoup_3, + gdk-pixbuf, + glib, + webkitgtk_4_1, + xdg-utils, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "hytale-launcher-bin"; + version = "2026.01.11.b022ef5"; + + src = fetchzip { + url = "https://launcher.hytale.com/builds/release/linux/amd64/hytale-launcher-2026.01.11-b022ef5.zip"; + hash = "sha256-bJQwGSj7B1szXv1e7RN2VQdriSbGe+En1EQONIeLQ84="; + stripRoot = false; + }; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ + gtk3 + nss + libsecret + libsoup_3 + gdk-pixbuf + glib + webkitgtk_4_1 + ]; + + dontStrip = true; + + installPhase = '' + runHook preInstall + mkdir -p "$out/lib/${finalAttrs.pname}" "$out/bin" "$out/share/applications" + install -Dm755 "hytale-launcher" "$out/lib/${finalAttrs.pname}/hytale-launcher" + makeWrapper "$out/lib/${finalAttrs.pname}/hytale-launcher" "$out/bin/hytale-launcher" \ + --prefix PATH : "${lib.makeBinPath [xdg-utils]}" \ + --set __NV_DISABLE_EXPLICIT_SYNC 1 \ + --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \ + --set DESKTOP_STARTUP_ID com.hypixel.HytaleLauncher + cat > "$out/share/applications/com.hypixel.HytaleLauncher.desktop" <<'desktop' + [Desktop Entry] + Type=Application + Name=Hytale Launcher + Exec=hytale-launcher + Terminal=false + Categories=Game; + desktop + runHook postInstall + ''; + + meta = { + description = "Hytale Launcher (Native Linux)"; + homepage = "https://hytale.com"; + platforms = ["x86_64-linux"]; + license = lib.licenses.unfreeRedistributable; + mainProgram = "hytale-launcher"; + }; +}) From a3ccf6a5654e6fd58b0b7e34c2e97810e6c3985c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 28 Jan 2026 14:01:58 +0100 Subject: [PATCH 369/384] update flake lock --- flake.lock | 102 ++++++++++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index 4f1421e..797491f 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1769164550, - "narHash": "sha256-AxLb3L4j148v4Cj6ju5E9wsVdcHULuoI8il7+H5t6cs=", + "lastModified": 1769432988, + "narHash": "sha256-q4arZjXnLiuMnLzO972lrXIGdzyGb4DGaIt69CcCYdE=", "owner": "catppuccin", "repo": "nix", - "rev": "deb2a5a54cf9e05ddf60aeeb933f60ad2fac20e1", + "rev": "d7a8632c0d8d144478aac1a8c8d5083b770cbb03", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1767744144, - "narHash": "sha256-9/9ntI0D+HbN4G0TrK3KmHbTvwgswz7p8IEJsWyef8Q=", + "lastModified": 1769287525, + "narHash": "sha256-gABuYA6BzoRMLuPaeO5p7SLrpd4qExgkwEmYaYQY4bM=", "owner": "ipetkov", "repo": "crane", - "rev": "2fb033290bf6b23f226d4c8b32f7f7a16b043d7e", + "rev": "0314e365877a85c9e5758f9ea77a9972afbb4c21", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1768923567, - "narHash": "sha256-GVJ0jKsyXLuBzRMXCDY6D5J8wVdwP1DuQmmvYL/Vw/Q=", + "lastModified": 1769524058, + "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", "owner": "nix-community", "repo": "disko", - "rev": "00395d188e3594a1507f214a2f15d4ce5c07cb28", + "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1769187349, - "narHash": "sha256-clG+nT6I2qxjIgk5WoSDKJyNhzKJs9jzbCujPF2S/yg=", + "lastModified": 1769579508, + "narHash": "sha256-EE2bs7xFrC64qrj0N2zP6E6e/nmhcdw6v/grdYi+BiY=", "owner": "nix-community", "repo": "home-manager", - "rev": "082a4cd87c6089d1d9c58ebe52655f9e07245fcb", + "rev": "eec72f127831326b042d1f35003767a4ab6a9516", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1769153735, - "narHash": "sha256-ZMMGBhFx7MSxn8PV33MfJDN5AwEm1qur2I+ygaCeMOg=", + "lastModified": 1769596123, + "narHash": "sha256-kcElu+HiwNIJiaNH41IdemFaaGyU3TqI4ebx5CQMHFs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "ecddd35ae96e09e50c7cf0b0d7b3ca71ebb245ad", + "rev": "d6bf85533180720680544a0791c7334e315c4fd6", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1769175598, - "narHash": "sha256-xGlAdk2c1mVxOTMzzCYHDYuXaBMoH1BTr2nJOGkY/SQ=", + "lastModified": 1769417433, + "narHash": "sha256-0WZ7I/N9InaBHL96/qdiJxg8mqFW3vRla8Z062JmQFE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "1bea6e953d06da77729edd0004291ced527bcb4a", + "rev": "1902463415745b992dbaf301b2a35a1277be1584", "type": "github" }, "original": { @@ -523,11 +523,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1769086393, - "narHash": "sha256-3ymIZ8s3+hu7sDl/Y48o6bwMxorfKrmn97KuWiw1vjY=", + "lastModified": 1769302137, + "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca", + "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1769197102, - "narHash": "sha256-9cCeVZ6fPSAUXCNnuvcsGpNl+2nXrpHuibcmO0ZO1qA=", + "lastModified": 1769604778, + "narHash": "sha256-cVQGv7ghlNFS7IZl5NctoqBdzLz6w1CILF5GM+Px6z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a5378e67b60792f8a60a3fc268f2a39945cb6f98", + "rev": "9e5ba754d025adb74b9e1a62fbeba655667621b7", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -586,11 +586,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1767767207, - "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1768127708, - "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", + "lastModified": 1769170682, + "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", + "rev": "c5296fdd05cfa2c187990dd909864da9658df755", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1768569498, - "narHash": "sha256-bB6Nt99Cj8Nu5nIUq0GLmpiErIT5KFshMQJGMZwgqUo=", + "lastModified": 1769268028, + "narHash": "sha256-mAdJpV0e5IGZjnE4f/8uf0E4hQR7ptRP00gnZKUOdMo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "be5afa0fcb31f0a96bf9ecba05a516c66fcd8114", + "rev": "ab9fbbcf4858bd6d40ba2bbec37ceb4ab6e1f562", "type": "github" }, "original": { @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1767281941, - "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", + "lastModified": 1769069492, + "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", + "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23", "type": "github" }, "original": { @@ -813,11 +813,11 @@ ] }, "locked": { - "lastModified": 1768272338, - "narHash": "sha256-Tg/kL8eKMpZtceDvBDQYU8zowgpr7ucFRnpP/AtfuRM=", + "lastModified": 1769309768, + "narHash": "sha256-AbOIlNO+JoqRJkK1VrnDXhxuX6CrdtIu2hSuy4pxi3g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "03dda130a8701b08b0347fcaf850a190c53a3c1e", + "rev": "140c9dc582cb73ada2d63a2180524fcaa744fad5", "type": "github" }, "original": { @@ -874,11 +874,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1768863606, - "narHash": "sha256-1IHAeS8WtBiEo5XiyJBHOXMzECD6aaIOJmpQKzRRl64=", + "lastModified": 1769469829, + "narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c7067be8db2c09ab1884de67ef6c4f693973f4a2", + "rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff", "type": "github" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1768744881, - "narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=", + "lastModified": 1769471853, + "narHash": "sha256-aqs0HkV2T/7Syf/pYLRVSwfk23PPAyGJmWT43U5ZSF4=", "owner": "nix-community", "repo": "stylix", - "rev": "06684f00cfbee14da96fd4307b966884de272d3a", + "rev": "805fa4262a21ada28cc918fa014359b9b35caea7", "type": "github" }, "original": { From 6d172184694fe0574deccfca2519c41b566aee7b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 28 Jan 2026 15:15:48 +0100 Subject: [PATCH 370/384] re-enable starship --- home-manager/shared/default.nix | 3 ++- home-manager/shared/shell/starship.nix | 6 +++--- home-manager/shared/shell/zsh.nix | 18 +++++++++--------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 650fc8f..7f4c1d9 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -8,7 +8,7 @@ ./shell/helix ./shell/zellij ./shell/zsh.nix - # ./shell/starship.nix + ./shell/starship.nix ./shell/eza.nix ./shell/hyfetch.nix ]; @@ -34,6 +34,7 @@ navi nil gh + starship ]; }; diff --git a/home-manager/shared/shell/starship.nix b/home-manager/shared/shell/starship.nix index 90dda44..0fa93c5 100644 --- a/home-manager/shared/shell/starship.nix +++ b/home-manager/shared/shell/starship.nix @@ -41,9 +41,9 @@ { owner = "catppuccin"; repo = "starship"; - rev = "5629d23"; # Replace with the latest commit hash - sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0="; + rev = "5906cc3"; # Replace with the latest commit hash + sha256 = "sha256-FLHjbClpTqaK4n2qmepCPkb8rocaAo3qeV4Zp1hia0g="; } - + /palettes/${flavor}.toml)); + + /themes/${flavor}.toml)); }; } diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index 7579669..fea6086 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -27,15 +27,15 @@ sha256 = "sha256-Z6EYQdasvpl1P78poj9efnnLj7QQg13Me8x1Ryyw+dM="; }; } - { - name = "terraform"; - src = pkgs.fetchFromGitHub { - owner = "macunha1"; - repo = "zsh-terraform"; - rev = "fd1471d3757f8ed13f56c4426f88616111de2a87"; - sha256 = "0z6i9wjjklb4lvr7zjhbphibsyx51psv50gm07mbb0kj9058j6kc"; - }; - } + # { + # name = "terraform"; + # src = pkgs.fetchFromGitHub { + # owner = "macunha1"; + # repo = "zsh-terraform"; + # rev = "fd1471d3757f8ed13f56c4426f88616111de2a87"; + # sha256 = "0z6i9wjjklb4lvr7zjhbphibsyx51psv50gm07mbb0kj9058j6kc"; + # }; + # } ]; autosuggestion.enable = true; enableCompletion = true; From b671e61a0aab73898fc45eca0b0b37774336d84a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 31 Jan 2026 16:10:37 +0100 Subject: [PATCH 371/384] add keys switch to shodan --- nixos/hosts/shodan/secrets/sops.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/secrets/sops.yaml b/nixos/hosts/shodan/secrets/sops.yaml index c6a2065..2ea5876 100644 --- a/nixos/hosts/shodan/secrets/sops.yaml +++ b/nixos/hosts/shodan/secrets/sops.yaml @@ -2,6 +2,8 @@ lillian-password: ENC[AES256_GCM,data:uPNBvMyhkiX3eedduFlsFUIcas/VBVSYrsmGTlgGUO wg-private-key: ENC[AES256_GCM,data:PeuKeYRHfOzGlekLI95EH3qq+blntZrrboPKaKC0ghD5zIyaCYrFHYWLkug=,iv:BcugGYW7+i7d04H4EKn+BdJJPqwMVVvlHBETO0x0kQM=,tag:Z/ammSrFpWTIbVfi4VJZ9w==,type:str] ssh-private-key: ENC[AES256_GCM,data:7K3p6Lu4je2fNmvtKpLY2z7MG5E0gg3486PCLTlm/NzWpiH0FO8KO2yPkPPVurXfUWj7ig3eiP+bc6+kufRQ8+MCHaR+JA056cdMch0MMK92FyPvJjNKzwB4W3BpdvOKipaZvuvSfgdrEdpz6rWRwBb9KaUW5aHBjW5eQNm+q0yP2uZjW6Ncp/zrdevjlRJyXGnNJD8CBDQgLILvqlvziRO4xBnSZOmFpdCKM9jMkxwHIQUND4ic71G6cheN+kIsgsa67DlJjfrngGWxKrlC3Q2DC+30vHtW8f18oa+g7eu9eTz8+bSLxYJf9TADwE+UYe2Hakib1ju67yxBkcomIjBvqgo+zEr0jC2qYmOvlKfqn64gSbAE7zEVCbavz6gA2EMb0g47twtAdgGUyzppGQ4LXjZXv6lyYov2gdXP7bzAcXXfzDh92BuTUOp9HXOTsLh7XC7cPKziowwwT+oUeOaSujMT9tgqkazgcVR3ne+PjxduptV75gxOwxeu6F2Zm+4Y4xJBdJeyP1Baq0yj4HNY/gv3pxEEXgU5,iv:TJ3AsSvXeUmBsKd6xy+Kc1ws+Yc9ZQ5Q4A8UFHI7Wsg=,tag:egCYoe3Mkbvkup0itszm4w==,type:str] nextcloud-password: ENC[AES256_GCM,data:vA+L/7rTne16AZbibUAaLAcQKLoKPvM1ATNL/hbzjVt+qmxHhmuQq0cqKdoPOFlOftMNLo5HSKiHdLxh,iv:kw0IorbyjT/ocanJDcR3kuPCqHsPwSD4axIp2dfn1Fc=,tag:5QLl3xKq4a0EiImO07ardQ==,type:str] +prod.keys: ENC[AES256_GCM,data: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,iv:KLy+ZPTzetrbJxCkkmqO2ywSOxQu3x973mMN6LtyLbc=,tag:vPy7805yJVv3hIpYiq3Ijw==,type:str] +title.keys: ENC[AES256_GCM,data:n+2dvLPwSFDUUjKAWasOk11jdcE5EAzFOTLepIYbALCxpBgCIMGDYLXv8HM6k5R6CHzMMnkLawCUgfqG8ozc+mnD7HDgpje1zjH2x/sEjyG93ThrSwaW2ydN8KrU4LvNgRUbGCr1gTBQ2utX5jbaOrO/P4PDLtjxLofqEHQKz3PXjQQuSs9CT0dif1daTNKhSqTHLojxuFS5FMPKTT5KxmDXj2tJi898izi+ZLz/MpM5S+ovs23Jz/nFPFzZcZcb9K9/KjjZAE92ArwMYaHu7SlLVyKmCyEB6kbKN6V7W9/UsQwglSH6KBH/PiknLtsdOwlZFBa7kR4dws+kOlzhR4SakEZZjYtTtZl+Fhbl1vGgn7npbTL1dHEIrbRd8IJSTIkDKdnSUPatEpnfM9BDhDRnYGQsShy0Pf3UENwadu2qDXtu1/RuztlR4XlOmcc2BbGytJ2TkqRcTclMGsT0CPtFORKIo0Mb9nsnOY/049oEkFjXQOaI9Gw3ahc73GgO+Fb256oGmJXmMCcvVDGm3qGR/ZjbFLB7VTOPCDO7M6Dy0kPUvPQYsGN43Wu8cM84cIYRV52JAwUJ5IunoKXl6ONHNMy2LpATGAQ35IKGVFUSJSK4y1RggFIU8ON/2L31u+gsfCrv0UNDQXyIJrZINA8YEFfsarlfBukakgJH8OvQ+DTTLbmJT9bEyhuDut8jR3u1tuEovWRhCtRqnYEiEBKeHzg377I47OFx8oYGABzibQecQf7/pvuvoYRU0pE+CnAW45rrhJMOrZ4U//4HbI+5e5VO7UMrfkuMQcddN0vXJaGpGjLb4O8l+9W+VYAZF/NZZ1vjjfy40coRwa6veiwo0BG4MyhRg9uvwFv27ne+33v7CEmvVUyY+8yafxTQkoaGSPVS1eawEKTdhC2VcsNaH9+LOhe0T8di5FxIho1QOJXYnyuZkIrcHbmIJt7lwwsDLxO1pjqa9xLcbwLDCjsqXVG42K8ZYQOvshuCR/YSG8lBXvqDQsZa7YzTX/gBFJ6d+t+4huPx17PT+oUaJu2Npy7FFb4RfKHWwjshveRG03MI5sYl6tBfZfyODHB8litTgQl0TGvKLkR6RC5jHoSt+ajy+hbB8f7Wenxb9XFoBW59gJVcvdkLXKNz2+b+0ZSLmKK1RkwA1iVSwlvsy7HOqF2Eb8FdaLQGNPBwnsGKYTTLO3+tgKEWH2vDoPQNUCvVcUTVYm+pEIgcGNfVGaw8ZcDUHk/h0D+XBoQYBOIf5Robsie78aTMVMxrZQ3Sf/PK9p0fDFzXNIUyqyUPECGIoXCdGtPDL7jYSlQheQFQulpu59m1A06uqakeUlVtQnaooe3IsRwwHh0UmtonZyv4HTxlb6mg33aLG2RMEyztV6yKRsUkV+TQYHr37Zmht1r7YL46yS1WOX9Gymxoz/5Gpvsf9zXP6+2TGzeRU9xcMaQSppDMrPLJrfBULXVZpXUCLCCnmtF0eemx0cUkILgbG+4U4plkHuvqAsHGPbyEPEhPILpLkF78k33KRpClS0eeVSJ+Sh2UVnZLBTg5tEVKenuuAtT3WNLyuaw4pDTmVzuZegsexbcNj8sMu+bFnxAvZk+WmtY8eLUfBohFiiPoIfdF6Hjf,iv:em/onbNK9UerSYcShqsw3iAhZMfhIQ5NOHB5Li1aJ88=,tag:Y/mILY1zxh3QhZ5pFuvy3g==,type:str] sops: age: - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz @@ -13,7 +15,7 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-10-22T13:25:05Z" - mac: ENC[AES256_GCM,data:qGLiJvoU+lyzMBr1jW3My5kNLCm59xVmdc3knyg64KMbAL65q7m5EJBC9uvRX0ZcxaNXWuRJWyUu1VV9tIKtSW+HLVJUZuTCi+0qswOL331LLuyDzhIkOKbPUPiDzKaMLif7EqENN9kN2aGSivpMVB5QkqRccmg6ya1Qkx5Ao7A=,iv:RiaIdq5Ve/PNVTD38Qh4YM+2x8fEU027r7hlmoNZI9A=,tag:jm9ZThwSVtpyed+kMIgaJw==,type:str] + lastmodified: "2026-01-31T15:10:12Z" + mac: ENC[AES256_GCM,data:9E1Ghev2RWb+r3+k7bomLTVEmdeUiQXdkO29fs6amMcJvsScvOqAfqXocbw/AQn+hj1KOVfLoGknPlQmUm9FQE3MCfASuJe01y8HjPXwU2C0PFB4qK+LoWyPax0GxfLRZqplCSJShFdhgIXKep5MAoJFTm48QQlmEw+yF10fKI8=,iv:EKbz3/ASb8SsDL3lqrHggnfdBehynYSzIKCXtsSCpmA=,tag:BTzlh1f8EnXhV3DEbf/+oQ==,type:str] unencrypted_suffix: _unencrypted version: 3.11.0 From cf4990e1d8dc1fecf709deb3241a0297881bc677 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 1 Feb 2026 21:35:30 +0100 Subject: [PATCH 372/384] shodan says it doesn't have zellij, let's add it to hm --- home-manager/shared/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 7f4c1d9..0b5bae7 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -35,6 +35,7 @@ nil gh starship + zellij ]; }; From 25a7ebe6101cd6f16f9902bc3449c6418048c5a1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 6 Feb 2026 20:40:23 +0100 Subject: [PATCH 373/384] smol updates --- home-manager/hosts/GLaDOS/lillian.nix | 1 - nixos/hosts/EDI/configuration.nix | 2 ++ nixos/hosts/GLaDOS/configuration.nix | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index a978fd4..691837e 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -20,7 +20,6 @@ ryubing lutris vscodium - intiface-central unrar ]; diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index fbe3c05..ab62e21 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -91,6 +91,8 @@ # for now. loader.systemd-boot.enable = lib.mkForce false; initrd.systemd.enable = true; + kernelPackages = pkgs.linuxPackages_latest; + supportedFilesystems = ["btrfs" "bcachefs"]; binfmt.emulatedSystems = ["aarch64-linux"]; diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index e8c31c5..ba002ed 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -79,6 +79,8 @@ boot = { loader.systemd-boot.enable = false; initrd.systemd.enable = true; + kernelPackages = pkgs.linuxPackages_latest; + supportedFilesystems = ["btrfs" "bcachefs"]; binfmt.emulatedSystems = ["aarch64-linux"]; From e86ec419c2115ab1f12f0904cf126d6a2c52185b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 6 Feb 2026 20:43:29 +0100 Subject: [PATCH 374/384] update flake lock --- flake.lock | 114 ++++++++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 797491f..cecb968 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1769432988, - "narHash": "sha256-q4arZjXnLiuMnLzO972lrXIGdzyGb4DGaIt69CcCYdE=", + "lastModified": 1770388745, + "narHash": "sha256-tmAONUMNHnlkozNcMR1kZJ/68OGea5wS56vl6vaUS5U=", "owner": "catppuccin", "repo": "nix", - "rev": "d7a8632c0d8d144478aac1a8c8d5083b770cbb03", + "rev": "5e9efb97caeffea3bf248023b6d8b68e63b839b9", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1769287525, - "narHash": "sha256-gABuYA6BzoRMLuPaeO5p7SLrpd4qExgkwEmYaYQY4bM=", + "lastModified": 1769737823, + "narHash": "sha256-DrBaNpZ+sJ4stXm+0nBX7zqZT9t9P22zbk6m5YhQxS4=", "owner": "ipetkov", "repo": "crane", - "rev": "0314e365877a85c9e5758f9ea77a9972afbb4c21", + "rev": "b2f45c3830aa96b7456a4c4bc327d04d7a43e1ba", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1769579508, - "narHash": "sha256-EE2bs7xFrC64qrj0N2zP6E6e/nmhcdw6v/grdYi+BiY=", + "lastModified": 1770318660, + "narHash": "sha256-yFVde8QZK7Dc0Xa8eQDsmxLX4NJNfL1NKfctSyiQgMY=", "owner": "nix-community", "repo": "home-manager", - "rev": "eec72f127831326b042d1f35003767a4ab6a9516", + "rev": "471e6a065f9efed51488d7c51a9abbd387df91b8", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1769596123, - "narHash": "sha256-kcElu+HiwNIJiaNH41IdemFaaGyU3TqI4ebx5CQMHFs=", + "lastModified": 1770366813, + "narHash": "sha256-q6dmMSV2EcA6/EXy2oJXoLgxSGjrKY0bixfYbK4fi/4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d6bf85533180720680544a0791c7334e315c4fd6", + "rev": "2af374cd694b45c7d1773edda154081d0ee81f64", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1769417433, - "narHash": "sha256-0WZ7I/N9InaBHL96/qdiJxg8mqFW3vRla8Z062JmQFE=", + "lastModified": 1770064250, + "narHash": "sha256-3HB6gfnKZnwDoH77lnJktJtQWEZ+D35Oi53pNF6YwO4=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "1902463415745b992dbaf301b2a35a1277be1584", + "rev": "9985b98c74dcc7b1c7ccfe8693daf37caa4ed2ea", "type": "github" }, "original": { @@ -472,11 +472,11 @@ ] }, "locked": { - "lastModified": 1765267181, - "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", + "lastModified": 1770315571, + "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", + "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb", "type": "github" }, "original": { @@ -508,11 +508,11 @@ ] }, "locked": { - "lastModified": 1764234087, - "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=", + "lastModified": 1769813415, + "narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "032a1878682fafe829edfcf5fdfad635a2efe748", + "rev": "8946737ff703382fda7623b9fab071d037e897d5", "type": "github" }, "original": { @@ -539,11 +539,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1769604778, - "narHash": "sha256-cVQGv7ghlNFS7IZl5NctoqBdzLz6w1CILF5GM+Px6z4=", + "lastModified": 1770406597, + "narHash": "sha256-LmX0PAyFXs/5WWXCFeWu+6g8uNA+Yl6Ht6b/jyfdt7w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e5ba754d025adb74b9e1a62fbeba655667621b7", + "rev": "8ea8ad0ad112e0aaa2a3bc583558a689a3345393", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1769170682, - "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", + "lastModified": 1770019141, + "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5296fdd05cfa2c187990dd909864da9658df755", + "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1769268028, - "narHash": "sha256-mAdJpV0e5IGZjnE4f/8uf0E4hQR7ptRP00gnZKUOdMo=", + "lastModified": 1769740369, + "narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab9fbbcf4858bd6d40ba2bbec37ceb4ab6e1f562", + "rev": "6308c3b21396534d8aaeac46179c14c439a89b8a", "type": "github" }, "original": { @@ -731,11 +731,11 @@ ] }, "locked": { - "lastModified": 1767662275, - "narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=", + "lastModified": 1769956244, + "narHash": "sha256-12RCFLyAedyMOdenUi7cN3ioJPEGjA/ZG1BLjugfUVs=", "owner": "pjones", "repo": "plasma-manager", - "rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e", + "rev": "fe54ea85c6e4413fba03b84d50f2b431d2f7c831", "type": "github" }, "original": { @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1769069492, - "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=", + "lastModified": 1769939035, + "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23", + "rev": "a8ca480175326551d6c4121498316261cbb5b260", "type": "github" }, "original": { @@ -813,11 +813,11 @@ ] }, "locked": { - "lastModified": 1769309768, - "narHash": "sha256-AbOIlNO+JoqRJkK1VrnDXhxuX6CrdtIu2hSuy4pxi3g=", + "lastModified": 1770001842, + "narHash": "sha256-ZAyTeILfdWwDp1nuF0RK3McBduMi49qnJvrS+3Ezpac=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "140c9dc582cb73ada2d63a2180524fcaa744fad5", + "rev": "5018343419ea808f8a413241381976b7e60951f2", "type": "github" }, "original": { @@ -874,11 +874,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1769469829, - "narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=", + "lastModified": 1770145881, + "narHash": "sha256-ktjWTq+D5MTXQcL9N6cDZXUf9kX8JBLLBLT0ZyOTSYY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff", + "rev": "17eea6f3816ba6568b8c81db8a4e6ca438b30b7c", "type": "github" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1769471853, - "narHash": "sha256-aqs0HkV2T/7Syf/pYLRVSwfk23PPAyGJmWT43U5ZSF4=", + "lastModified": 1770382623, + "narHash": "sha256-NB9j2JsIcSPcY7FzzoIqJA04p4xSdJpgyLAwzzzncpc=", "owner": "nix-community", "repo": "stylix", - "rev": "805fa4262a21ada28cc918fa014359b9b35caea7", + "rev": "05c798e0074296df9bfc6ef3df0e936b878b835a", "type": "github" }, "original": { From 022ec828a8c0f06e0ddc43f8ac1f204ac3b974c6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 15 Feb 2026 17:06:15 +0100 Subject: [PATCH 375/384] fix all the issues with persistence, and change GLaDOS to btrfs as an experiment --- disko/GLaDOS/default.nix | 56 ++++++++++++------------- home-manager/hosts/GLaDOS/lillian.nix | 12 +++++- nixos/desktop/default.nix | 3 ++ nixos/hosts/GLaDOS/configuration.nix | 33 +++++++++++++-- nixos/shared/preservation.nix | 25 +++++------ pkgs/install-nix-no-inhibit/default.nix | 4 +- 6 files changed, 84 insertions(+), 49 deletions(-) diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix index f998acc..6e64efe 100644 --- a/disko/GLaDOS/default.nix +++ b/disko/GLaDOS/default.nix @@ -30,8 +30,34 @@ allowDiscards = true; }; content = { - type = "lvm_pv"; - vg = "nvme_pool"; + type = "btrfs"; + extraArgs = ["-f"]; + subvolumes = { + "/root" = { + mountpoint = "/"; + mountOptions = ["subvol=root" "compress=zstd:1" "noatime" "ssd" "discard=async" "space_cache=v2" "commit=120"]; + }; + "/home" = { + mountpoint = "/home"; + mountOptions = ["subvol=home" "compress=zstd:1" "noatime" "ssd" "discard=async" "space_cache=v2" "commit=120" "autodefrag"]; + }; + "/nix" = { + mountpoint = "/nix"; + mountOptions = ["subvol=nix" "compress=zstd:1" "noatime" "ssd" "discard=async" "space_cache=v2" "commit=120" "nodatacow" "nodatasum"]; + }; + "/persist" = { + mountpoint = "/persistent"; + mountOptions = ["subvol=persistent" "compress=zstd:1" "noatime" "ssd" "discard=async" "space_cache=v2" "commit=120"]; + }; + "/log" = { + mountpoint = "/var/log"; + mountOptions = ["subvol=log" "compress=zstd:1" "noatime" "ssd" "discard=async" "space_cache=v2" "commit=120" "nodatacow" "nodatasum"]; + }; + "/swap" = { + mountpoint = "/swap"; + swap.swapfile.size = "8G"; + }; + }; }; }; }; @@ -39,32 +65,6 @@ }; }; }; - lvm_vg = { - nvme_pool = { - type = "lvm_vg"; - lvs = { - nvme_swap = { - size = "32G"; - content = { - type = "swap"; - discardPolicy = "both"; - resumeDevice = true; # resume from hiberation from this device - }; - }; - nvme_root = { - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - mountOptions = [ - "defaults" - ]; - }; - }; - }; - }; - }; nodev = { "/home/lillian/Downloads" = { fsType = "tmpfs"; diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index 691837e..7e1c8a9 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -1,6 +1,10 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{pkgs, ...}: { +{ + pkgs, + config, + ... +}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): @@ -22,6 +26,12 @@ vscodium unrar ]; + home.file = { + nextcloud = { + source = config.lib.file.mkOutOfStoreSymlink "/run/media/lillian/big-SSD/Nextcloud/"; + target = "Nextcloud"; + }; + }; programs.mangohud = { enable = true; diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index bbb9dc8..9829611 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -33,6 +33,8 @@ KERNEL=="hidraw*", KERNELS=="*057e:*", MODE="0660", TAG+="uaccess" KERNEL=="hidraw*", ATTRS{idVendor}=="2dc8", MODE="0660", TAG+="uaccess" KERNEL=="hidraw*", KERNELS=="*2DC8:*", MODE="0660", TAG+="uaccess" + KERNEL=="hidraw*", ATTRS{idProduct}=="6012", ATTRS{idVendor}=="2dc8", MODE="0660", TAG+="uaccess" + KERNEL=="hidraw*", KERNELS=="*2DC8:6012*", MODE="0660", TAG+="uaccess" ''; environment.systemPackages = with pkgs; @@ -60,6 +62,7 @@ pciutils podman podman-compose + python3Minimal sbctl tpm2-tools tpm2-tss diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index ba002ed..3ae30f8 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -75,8 +75,36 @@ # }; # }; }; - boot = { + # Nuke root AND home subvolumes on every boot + initrd.systemd.services.wipe-my-fs = { + requires = ["dev-mapper-nvme_crypted.device"]; + after = ["dev-mapper-nvme_crypted.device"]; + wantedBy = ["initrd.target"]; + script = '' + mkdir -p /btrfs_tmp + mount /dev/mapper/cryptroot /btrfs_tmp + + delete_subvolume_recursively() { + IFS=$'\n' + for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do + delete_subvolume_recursively "/btrfs_tmp/$i" + done + btrfs subvolume delete "$1" + } + + # Nuke and recreate root + delete_subvolume_recursively /btrfs_tmp/root + btrfs subvolume create /btrfs_tmp/root + + # Nuke and recreate home (wipes /home — but we restore via impermanence) + delete_subvolume_recursively /btrfs_tmp/home + btrfs subvolume create /btrfs_tmp/home + + umount /btrfs_tmp + ''; + }; + loader.systemd-boot.enable = false; initrd.systemd.enable = true; kernelPackages = pkgs.linuxPackages_latest; @@ -89,9 +117,6 @@ pkiBundle = "/var/lib/sbctl"; }; extraModprobeConfig = '' - #fix for https://gitlab.freedesktop.org/drm/amd/-/issues/4141 - amdgpu.runpm=0 - amdgpu.dcdebugmask=0x10 ''; }; diff --git a/nixos/shared/preservation.nix b/nixos/shared/preservation.nix index 36bcb48..c3acb6c 100644 --- a/nixos/shared/preservation.nix +++ b/nixos/shared/preservation.nix @@ -62,6 +62,7 @@ { file = "/etc/machine-id"; inInitrd = true; + how = "symlink"; } { file = "/etc/ssh/ssh_host_rsa_key"; @@ -155,20 +156,16 @@ }; }; }; - - # Create some directories with custom permissions. - # - # In this configuration the path `/home/butz/.local` is not an immediate parent - # of any persisted file, so it would be created with the systemd-tmpfiles default - # ownership `root:root` and mode `0755`. This would mean that the user `butz` - # could not create other files or directories inside `/home/butz/.local`. - # - # Therefore systemd-tmpfiles is used to prepare such directories with - # appropriate permissions. - # - # Note that immediate parent directories of persisted files can also be - # configured with ownership and permissions from the `parent` settings if - # `configureParent = true` is set for the file. + systemd.services.systemd-machine-id-commit = { + unitConfig.ConditionPathIsMountPoint = [ + "" + "/persistent/etc/machine-id" + ]; + serviceConfig.ExecStart = [ + "" + "systemd-machine-id-setup --commit --root /persistent" + ]; + }; systemd.tmpfiles.settings.preservation = { "/home/lillian/.config".d = { user = "lillian"; diff --git a/pkgs/install-nix-no-inhibit/default.nix b/pkgs/install-nix-no-inhibit/default.nix index a1dff9e..cee56c6 100644 --- a/pkgs/install-nix-no-inhibit/default.nix +++ b/pkgs/install-nix-no-inhibit/default.nix @@ -37,8 +37,8 @@ writeShellApplication --mode zap_create_mount \ "./disko/''${dir}/default.nix" echo "NixOS Installing..." - sudo nixos-install --flake .#"''${dir}" --show-trace --log-format internal-json -v |& nom --json - sudo nixos-install --flake .#"''${dir}" --show-trace --log-format internal-json -v |& nom --json + sudo nixos-install --flake .#"''${dir}" --show-trace -v |& nom + sudo nixos-install --flake .#"''${dir}" --show-trace -v |& nom popd > /dev/null echo "Cleaning up repository in '/tmp/install-nix'..." rm -rf ./install-nix From 45f1b7c7ed57ffc765cbd28668322bdc6a627eb2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 15 Feb 2026 17:10:39 +0100 Subject: [PATCH 376/384] update flake lock and disable personal servo package --- flake.lock | 134 +++++++++++++++++++++++------------------------ pkgs/default.nix | 2 +- 2 files changed, 68 insertions(+), 68 deletions(-) diff --git a/flake.lock b/flake.lock index cecb968..772403f 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1770388745, - "narHash": "sha256-tmAONUMNHnlkozNcMR1kZJ/68OGea5wS56vl6vaUS5U=", + "lastModified": 1770551880, + "narHash": "sha256-+cS5yXWsSLiK36+PP/+dcQdxpXSclx2d65p7l6Dis+A=", "owner": "catppuccin", "repo": "nix", - "rev": "5e9efb97caeffea3bf248023b6d8b68e63b839b9", + "rev": "db4dfe3f2a80e9c33492d839accd49f75c7324c2", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1769737823, - "narHash": "sha256-DrBaNpZ+sJ4stXm+0nBX7zqZT9t9P22zbk6m5YhQxS4=", + "lastModified": 1770419512, + "narHash": "sha256-o8Vcdz6B6bkiGUYkZqFwH3Pv1JwZyXht3dMtS7RchIo=", "owner": "ipetkov", "repo": "crane", - "rev": "b2f45c3830aa96b7456a4c4bc327d04d7a43e1ba", + "rev": "2510f2cbc3ccd237f700bb213756a8f35c32d8d7", "type": "github" }, "original": { @@ -187,15 +187,15 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1763988335, - "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", + "lastModified": 1769939035, + "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", + "rev": "a8ca480175326551d6c4121498316261cbb5b260", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1770318660, - "narHash": "sha256-yFVde8QZK7Dc0Xa8eQDsmxLX4NJNfL1NKfctSyiQgMY=", + "lastModified": 1771132481, + "narHash": "sha256-Tc+YqZ/Q1K35vJK4ji4RbLB/qKGcEq6yh7p4CKoZF60=", "owner": "nix-community", "repo": "home-manager", - "rev": "471e6a065f9efed51488d7c51a9abbd387df91b8", + "rev": "1e53254671f36cb7d0e2dcca08730f066d5e69b4", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1770366813, - "narHash": "sha256-q6dmMSV2EcA6/EXy2oJXoLgxSGjrKY0bixfYbK4fi/4=", + "lastModified": 1770915266, + "narHash": "sha256-2oD6ud7iathz3rb0TcZyMqAsG+u2KRpkcAY3CCBt5rs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2af374cd694b45c7d1773edda154081d0ee81f64", + "rev": "deee66bd287521aa4008f0bb616060f37c058980", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1770064250, - "narHash": "sha256-3HB6gfnKZnwDoH77lnJktJtQWEZ+D35Oi53pNF6YwO4=", + "lastModified": 1770734117, + "narHash": "sha256-PNXSnK507MRj+hYMgnUR7InNJzVCmOfsjHV4YXZgpwQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "9985b98c74dcc7b1c7ccfe8693daf37caa4ed2ea", + "rev": "2038a9a19adb886eccba775321b055fdbdc5029d", "type": "github" }, "original": { @@ -472,11 +472,11 @@ ] }, "locked": { - "lastModified": 1770315571, - "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=", + "lastModified": 1771130777, + "narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb", + "rev": "efec7aaad8d43f8e5194df46a007456093c40f88", "type": "github" }, "original": { @@ -523,11 +523,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1769302137, - "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", + "lastModified": 1771170586, + "narHash": "sha256-rGILJNlD8aDt8tIPRURnlbPjZ2kA0wA8I6v6g4bRB7E=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", + "rev": "f9b0314599f0fa628c7d05433f15a42a2eef836a", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1770406597, - "narHash": "sha256-LmX0PAyFXs/5WWXCFeWu+6g8uNA+Yl6Ht6b/jyfdt7w=", + "lastModified": 1771171048, + "narHash": "sha256-mfvEZzZPoh5g7wguxUVIwdg5HjDL3okIRAeduw8tA4U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8ea8ad0ad112e0aaa2a3bc583558a689a3345393", + "rev": "605407a873a521ff6b0e39cdabda60b07307a56c", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -586,11 +586,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1770019141, - "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -634,11 +634,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1764374374, - "narHash": "sha256-naS7hg/D1yLKSZoENx9gvsPLFiNEOTcqamJSu0OEvCA=", + "lastModified": 1770650459, + "narHash": "sha256-hGeOnueXorzwDD1V9ldZr+y+zad4SNyqMnQsa/mIlvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a49303095abc094ee77dc243a9e351b642e8e75", + "rev": "fff0554c67696d76a0cdd9cfe14403fbdbf1f378", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1769740369, - "narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=", + "lastModified": 1770843696, + "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6308c3b21396534d8aaeac46179c14c439a89b8a", + "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16", "type": "github" }, "original": { @@ -731,11 +731,11 @@ ] }, "locked": { - "lastModified": 1769956244, + "lastModified": 1770766818, "narHash": "sha256-12RCFLyAedyMOdenUi7cN3ioJPEGjA/ZG1BLjugfUVs=", "owner": "pjones", "repo": "plasma-manager", - "rev": "fe54ea85c6e4413fba03b84d50f2b431d2f7c831", + "rev": "44b928068359b7d2310a34de39555c63c93a2c90", "type": "github" }, "original": { @@ -813,11 +813,11 @@ ] }, "locked": { - "lastModified": 1770001842, - "narHash": "sha256-ZAyTeILfdWwDp1nuF0RK3McBduMi49qnJvrS+3Ezpac=", + "lastModified": 1770520253, + "narHash": "sha256-6rWuHgSENXKnC6HGGAdRolQrnp/8IzscDn7FQEo1uEQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5018343419ea808f8a413241381976b7e60951f2", + "rev": "ebb8a141f60bb0ec33836333e0ca7928a072217f", "type": "github" }, "original": { @@ -855,11 +855,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1766321686, - "narHash": "sha256-icOWbnD977HXhveirqA10zoqvErczVs3NKx8Bj+ikHY=", + "lastModified": 1770659507, + "narHash": "sha256-RVZno9CypFN3eHxfULKN1K7mb/Cq0HkznnWqnshxpWY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "7d433bf89882f61621f95082e90a4ab91eb0bdd3", + "rev": "781e833633ebc0873d251772a74e4400a73f5d78", "type": "gitlab" }, "original": { @@ -874,11 +874,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1770145881, - "narHash": "sha256-ktjWTq+D5MTXQcL9N6cDZXUf9kX8JBLLBLT0ZyOTSYY=", + "lastModified": 1771166946, + "narHash": "sha256-UFc4lfGBr+wJmwgDGJDn1cVD6DTr0/8TdronNUiyXlU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "17eea6f3816ba6568b8c81db8a4e6ca438b30b7c", + "rev": "2d0cf89b4404529778bc82de7e42b5754e0fe4fa", "type": "github" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1770382623, - "narHash": "sha256-NB9j2JsIcSPcY7FzzoIqJA04p4xSdJpgyLAwzzzncpc=", + "lastModified": 1770914701, + "narHash": "sha256-QHFYyngohNhih4w+3IqQty5DV+p1txsx1kkk6XJWar8=", "owner": "nix-community", "repo": "stylix", - "rev": "05c798e0074296df9bfc6ef3df0e936b878b835a", + "rev": "db03fed72e5ca02be34e1d24789345a943329738", "type": "github" }, "original": { @@ -1053,11 +1053,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1766016463, - "narHash": "sha256-aWp608krMtk5I+c3GXyuHkb6ugah40cBI0R52fNqMiI=", + "lastModified": 1771148613, + "narHash": "sha256-nLzdw8jskekSRrunxBDCA0NCHr/2aJjcXqZ1Fcqm5eY=", "owner": "dj95", "repo": "zjstatus", - "rev": "9a4b88fdceee8eb2b8c28111c53e94254d61c994", + "rev": "7a039f56da80681408454d6e175fde3f54b9e592", "type": "github" }, "original": { diff --git a/pkgs/default.nix b/pkgs/default.nix index c979e58..66e28aa 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -3,7 +3,7 @@ pkgs: { dvd = pkgs.callPackage ./dvd {}; dvt = pkgs.callPackage ./dvt {}; - servo = pkgs.callPackage ./servo {}; + # servo = pkgs.callPackage ./servo {}; rebuild-no-inhibit = pkgs.callPackage ./rebuild-no-inhibit {}; rebuild = pkgs.callPackage ./rebuild {}; install-nix-no-inhibit = pkgs.callPackage ./install-nix-no-inhibit {}; From 782ef1437ba139623b5f1c7d0271d453ff748557 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 15 Feb 2026 17:13:08 +0100 Subject: [PATCH 377/384] replace winewow with winewow64 --- nixos/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 9829611..ff11589 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -48,7 +48,7 @@ # System tools aha ttf-ms-win10 - wineWowPackages.stable + wineWow64Packages.stable bottles tpm2-abrmd jdk21_headless From 32385907d3088d0fa259b583c062e819c427ec13 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 16 Feb 2026 17:35:07 +0100 Subject: [PATCH 378/384] add some startup programs with links, do some other maintanance for impermanence saving --- .../plasma-desktop/default.nix | 112 ++++++++++++------ nixos/shared/preservation.nix | 1 + 2 files changed, 79 insertions(+), 34 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop/default.nix b/home-manager/desktop/package-configs/plasma-desktop/default.nix index c9f3f9e..745fce1 100644 --- a/home-manager/desktop/package-configs/plasma-desktop/default.nix +++ b/home-manager/desktop/package-configs/plasma-desktop/default.nix @@ -18,42 +18,86 @@ RemainAfterExit = true; }; }; - home.file.".config/kdeconnect/config" = { - text = '' - [General] - keyAlgorithm=EC - name=${osConfig.networking.hostName} - customDevices=10.0.0.2,10.0.0.3,10.0.0.4,10.0.0.5 - ''; - target = ".config/kdeconnect/config"; - force = true; - }; - home.file."Games/.directory" = { - text = '' - [Desktop Entry] - Icon=folder-games - ''; - target = "Games/.directory"; - force = true; - }; - home.file."Code/.directory" = { - text = '' - [Desktop Entry] - Icon=folder-script - ''; - target = "Code/.directory"; - force = true; - }; - home.file."Writing/.directory" = { - text = '' - [Desktop Entry] - Icon=folder-notes - ''; - target = "Writing/.directory"; - force = true; - }; + home.file = { + ".config/kdeconnect/config" = { + text = '' + [General] + keyAlgorithm=EC + name=${osConfig.networking.hostName} + customDevices=10.0.0.2,10.0.0.3,10.0.0.4,10.0.0.5 + ''; + target = ".config/kdeconnect/config"; + force = true; + }; + "Games/.directory" = { + text = '' + [Desktop Entry] + Icon=folder-games + ''; + target = "Games/.directory"; + force = true; + }; + "Code/.directory" = { + text = '' + [Desktop Entry] + Icon=folder-script + ''; + target = "Code/.directory"; + force = true; + }; + "Writing/.directory" = { + text = '' + [Desktop Entry] + Icon=folder-notes + ''; + target = "Writing/.directory"; + force = true; + }; + "mimeapps.list" = { + text = '' + [Added Associations] + x-scheme-handler/http=librewolf.desktop; + x-scheme-handler/https=librewolf.desktop; + [Default Applications] + x-scheme-handler/discord=vesktop.desktop + x-scheme-handler/http=librewolf.desktop; + x-scheme-handler/https=librewolf.desktop; + x-scheme-handler/sgnl=signal.desktop + x-scheme-handler/signalcaptcha=signal.desktop + x-scheme-handler/email=thunderbird.desktop + x-scheme-handler/text=helix.desktop + ''; + target = ".config/mimeapps.list"; + force = true; + }; + "librewolf.desktop" = { + target = ".config/autostart/librewolf.desktop"; + source = "${pkgs.librewolf}/share/applications/librewolf.desktop"; + }; + "signal.desktop" = { + target = ".config/autostart/signal.desktop"; + source = "${pkgs.signal-desktop}/share/applications/signal.desktop"; + }; + "foot.desktop" = { + target = ".config/autostart/foot.desktop"; + source = "${pkgs.foot}/share/applications/foot.desktop"; + }; + "vesktop.desktop" = { + target = ".config/autostart/vesktop.desktop"; + source = "${pkgs.vesktop}/share/applications/vesktop.desktop"; + }; + "com.nextcloud.desktopclient.nextcloud.desktop" = { + target = ".config/autostart/com.nextcloud.desktopclient.nextcloud.desktop"; + source = "${pkgs.nextcloud-client}/share/applications/com.nextcloud.desktopclient.nextcloud.desktop"; + }; + }; programs.plasma = { + workspace = { + lookAndFeel = "Catppuccin-Macchiato-Mauve"; + colorScheme = "CatppuccinMacchiatoMauve"; + cursor.theme = "catppuccin-macchiato-mauve-cursors"; + }; enable = true; desktop.mouseActions.verticalScroll = "switchVirtualDesktop"; kscreenlocker.appearance.wallpaper = "${osConfig.stylix.image}"; diff --git a/nixos/shared/preservation.nix b/nixos/shared/preservation.nix index c3acb6c..56f4a87 100644 --- a/nixos/shared/preservation.nix +++ b/nixos/shared/preservation.nix @@ -136,6 +136,7 @@ ".config/Signal" ".config/sops" ".config/vesktop" + ".config/kde.org" ]; #Shared files = [ From 3b1ee8ebff7c52ee058e632d36116651b8f9bc0b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 19 Feb 2026 20:46:39 +0100 Subject: [PATCH 379/384] update flake lock --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 772403f..7d8a4f7 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1770551880, - "narHash": "sha256-+cS5yXWsSLiK36+PP/+dcQdxpXSclx2d65p7l6Dis+A=", + "lastModified": 1771508520, + "narHash": "sha256-srt94sUlkaGEJHQg7k6gVrBF1QZcHUY/VBESjCgZmKI=", "owner": "catppuccin", "repo": "nix", - "rev": "db4dfe3f2a80e9c33492d839accd49f75c7324c2", + "rev": "ec35c21e843e4748e60822cd5543983eb61dc87a", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1770419512, - "narHash": "sha256-o8Vcdz6B6bkiGUYkZqFwH3Pv1JwZyXht3dMtS7RchIo=", + "lastModified": 1771121070, + "narHash": "sha256-aIlv7FRXF9q70DNJPI237dEDAznSKaXmL5lfK/Id/bI=", "owner": "ipetkov", "repo": "crane", - "rev": "2510f2cbc3ccd237f700bb213756a8f35c32d8d7", + "rev": "a2812c19f1ed2e5ed5ce2ef7109798b575c180e1", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1769524058, - "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", + "lastModified": 1771469470, + "narHash": "sha256-GnqdqhrguKNN3HtVfl6z+zbV9R9jhHFm3Z8nu7R6ml0=", "owner": "nix-community", "repo": "disko", - "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", + "rev": "4707eec8d1d2db5182ea06ed48c820a86a42dc13", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1771132481, - "narHash": "sha256-Tc+YqZ/Q1K35vJK4ji4RbLB/qKGcEq6yh7p4CKoZF60=", + "lastModified": 1771519029, + "narHash": "sha256-H59Qf82wv5kBXVoyXsmUKW+9J3o8FqgY4uKaLdsLdLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "1e53254671f36cb7d0e2dcca08730f066d5e69b4", + "rev": "167e0b6837115e672ec5f58e2b0ea39093abe807", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1770915266, - "narHash": "sha256-2oD6ud7iathz3rb0TcZyMqAsG+u2KRpkcAY3CCBt5rs=", + "lastModified": 1771440156, + "narHash": "sha256-IrznE3ZQ+tf6amuQW/zlVkA18LzknWK+Hbt6tdmNtnw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "deee66bd287521aa4008f0bb616060f37c058980", + "rev": "faf829408344456d53c33df0a99f2f307498c830", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1770734117, - "narHash": "sha256-PNXSnK507MRj+hYMgnUR7InNJzVCmOfsjHV4YXZgpwQ=", + "lastModified": 1771492583, + "narHash": "sha256-nQzvnU4BGu8dA6BsPPCqmVcab/3ebVmHtX3ZWbW3Hxc=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2038a9a19adb886eccba775321b055fdbdc5029d", + "rev": "5e9380994665ef66c87ab8e22c913ff837174ce4", "type": "github" }, "original": { @@ -523,11 +523,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1771170586, - "narHash": "sha256-rGILJNlD8aDt8tIPRURnlbPjZ2kA0wA8I6v6g4bRB7E=", + "lastModified": 1771423359, + "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f9b0314599f0fa628c7d05433f15a42a2eef836a", + "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1771171048, - "narHash": "sha256-mfvEZzZPoh5g7wguxUVIwdg5HjDL3okIRAeduw8tA4U=", + "lastModified": 1771529647, + "narHash": "sha256-jg/CvWdnL3ZZhx58j8g1WDXJHALqiutiwnSyP4zPLj8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "605407a873a521ff6b0e39cdabda60b07307a56c", + "rev": "64a253ac18f1496577a30251a06c3871bdcaaa99", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1770562336, - "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1769939035, - "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=", + "lastModified": 1770726378, + "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "a8ca480175326551d6c4121498316261cbb5b260", + "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae", "type": "github" }, "original": { @@ -813,11 +813,11 @@ ] }, "locked": { - "lastModified": 1770520253, - "narHash": "sha256-6rWuHgSENXKnC6HGGAdRolQrnp/8IzscDn7FQEo1uEQ=", + "lastModified": 1771125043, + "narHash": "sha256-ldf/s49n6rOAxl7pYLJGGS1N/assoHkCOWdEdLyNZkc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ebb8a141f60bb0ec33836333e0ca7928a072217f", + "rev": "4912f951a26dc8142b176be2c2ad834319dc06e8", "type": "github" }, "original": { @@ -874,11 +874,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1771166946, - "narHash": "sha256-UFc4lfGBr+wJmwgDGJDn1cVD6DTr0/8TdronNUiyXlU=", + "lastModified": 1771524872, + "narHash": "sha256-eksVUcUsfS9mQx4D9DrYu88u9w70bAf+n6KmTDuIGEE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2d0cf89b4404529778bc82de7e42b5754e0fe4fa", + "rev": "e85540ffe97322dc1fea14dd11cdc2f59d540ac7", "type": "github" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1770914701, - "narHash": "sha256-QHFYyngohNhih4w+3IqQty5DV+p1txsx1kkk6XJWar8=", + "lastModified": 1771428844, + "narHash": "sha256-rTzo6bZEsdT7yHUZ0B4BYe32XQZzm8SiWKvWLJnxerE=", "owner": "nix-community", "repo": "stylix", - "rev": "db03fed72e5ca02be34e1d24789345a943329738", + "rev": "801843d10e9e22d7a00f660d069e2de70aa2980a", "type": "github" }, "original": { From a15584654c4cbb453eb5c436124799268a379d1e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 19 Feb 2026 21:39:56 +0100 Subject: [PATCH 380/384] disable python310 on queen for nw --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 6984f31..47a99db 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -92,7 +92,7 @@ onlyoffice-documentserver libressl postgresql_16 - python310 + # python310 # python310Packages.nbconvert janus-gateway jupyter From b8bbe16a7b7f6691e52b9bef2e066f2c9eacfc4a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 19 Feb 2026 22:29:45 +0100 Subject: [PATCH 381/384] disable anubis for now --- nixos/hosts/queen/configuration.nix | 50 ++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 47a99db..4de2ab2 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -32,33 +32,33 @@ preservation.enable = lib.mkForce false; - services.anubis.instances.default.settings.TARGET = "http://localhost:8123"; + # services.anubis.instances.default.settings.TARGET = "http://localhost:8123"; - # required due to unix socket permissions - users.users.nginx.extraGroups = [config.users.groups.anubis.name]; - services.nginx.virtualHosts."*.gladtherescake.eu" = { - locations = { - "/".proxyPass = "http://unix:${config.services.anubis.instances.default.settings.BIND}"; - }; - }; - services.nginx.virtualHosts."*.lillianviolet.dev" = { - locations = { - "/".proxyPass = "http://unix:${config.services.anubis.instances.default.settings.BIND}"; - }; - }; + # # required due to unix socket permissions + # users.users.nginx.extraGroups = [config.users.groups.anubis.name]; + # services.nginx.virtualHosts."*.gladtherescake.eu" = { + # locations = { + # "/".proxyPass = "http://unix:${config.services.anubis.instances.default.settings.BIND}"; + # }; + # }; + # services.nginx.virtualHosts."*.lillianviolet.dev" = { + # locations = { + # "/".proxyPass = "http://unix:${config.services.anubis.instances.default.settings.BIND}"; + # }; + # }; - zramSwap.enable = false; - services = { - openssh = { - enable = true; - settings = { - # require public key authentication for better security - PasswordAuthentication = false; - KbdInteractiveAuthentication = false; - PermitRootLogin = "no"; - }; - }; - }; + # zramSwap.enable = false; + # services = { + # openssh = { + # enable = true; + # settings = { + # # require public key authentication for better security + # PasswordAuthentication = false; + # KbdInteractiveAuthentication = false; + # PermitRootLogin = "no"; + # }; + # }; + # }; nixpkgs = { # You can add overlays here From 1c9764f8fdaa159fc74f83440da2e9301546b627 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 19 Feb 2026 22:37:12 +0100 Subject: [PATCH 382/384] Enable SSH lmao, don't break that --- nixos/hosts/queen/configuration.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 4de2ab2..da17a6c 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -47,18 +47,18 @@ # }; # }; - # zramSwap.enable = false; - # services = { - # openssh = { - # enable = true; - # settings = { - # # require public key authentication for better security - # PasswordAuthentication = false; - # KbdInteractiveAuthentication = false; - # PermitRootLogin = "no"; - # }; - # }; - # }; + zramSwap.enable = false; + services = { + openssh = { + enable = true; + settings = { + # require public key authentication for better security + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + PermitRootLogin = "no"; + }; + }; + }; nixpkgs = { # You can add overlays here From 2601555ac7237a0d2294abe46197fa8fd63528ad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 19 Feb 2026 22:45:58 +0100 Subject: [PATCH 383/384] fix continuwuity settings from conduit > new name --- nixos/server/package-configs/conduit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 17424c4..09268ee 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -28,7 +28,7 @@ } ''; in { - # Configure Conduit itself + # Configure continuwuity itself services.matrix-continuwuity = { enable = true; @@ -91,7 +91,7 @@ in { ]; locations."/_matrix/" = { - proxyPass = "http://backend_conduit"; + proxyPass = "http://backend_continuwuity"; proxyWebsockets = true; extraConfig = '' proxy_set_header Host $host; @@ -139,9 +139,9 @@ in { }; upstreams = { - "backend_conduit" = { + "backend_continuwuity" = { servers = { - "[::1]:${toString config.services.matrix-conduit.settings.global.port}" = {}; + "[::1]:${toString config.services.matrix-continuwuity.settings.global.port}" = {}; }; }; }; From c6d25885c15d49f476cdddbfc654c06ff3d222eb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 19 Feb 2026 23:18:58 +0100 Subject: [PATCH 384/384] add qrca for qr code scanning wifi networks on plasma --- nixos/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index ff11589..8284ad6 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -98,6 +98,7 @@ kdePackages.krdc kdePackages.krfb kdePackages.kate + kdePackages.qrca libportal-qt5 libportal