From 279570c40ba2d0db2e9a92b04e17c297a66e4d6d Mon Sep 17 00:00:00 2001 From: Lucy Hochkamp Date: Fri, 30 Aug 2024 13:16:18 +0200 Subject: [PATCH] update --- flake.lock | 68 +++++++++++++++---------------- flake.nix | 5 ++- hosts/picard/default.nix | 2 +- hosts/picard/xynospace-matrix.nix | 1 + 4 files changed, 39 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index a376b6f4..2299b793 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1723859949, - "narHash": "sha256-kiaGz4deGYKMjJPOji/JVvSP/eTefrIA3rAjOnOpXl4=", + "lastModified": 1724994893, + "narHash": "sha256-yutISDGg6HUaZqCaa54EcsfTwew3vhNtt/FNXBBo44g=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "076b9a905af8a52b866c8db068d6da475839d97b", + "rev": "c8d3157d1f768e382de5526bb38e74d2245cad04", "type": "github" }, "original": { @@ -201,11 +201,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1724100338, - "narHash": "sha256-NAhc/wMVno4DSM9RW6a9R5LGskCScjSm7bwWlFNy9Pg=", + "lastModified": 1724856988, + "narHash": "sha256-JBLe2CxAhG+J8+x8qmbzkGHNYmGcSiuY2QO4Zhb72lI=", "owner": "helix-editor", "repo": "helix", - "rev": "e2904794749ccc709a238a10e6ee364411c2b820", + "rev": "1b5295a3f3d7cccd96eed5bfd394807a4dae87fc", "type": "github" }, "original": { @@ -265,11 +265,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1723969902, - "narHash": "sha256-XI9pRlrFapdvT44JxhM3JQqCIf8FleJdFTs41qQcTHw=", + "lastModified": 1724438132, + "narHash": "sha256-GkA9QmJkHrknVzNJTyIPuR2Crpx/vOdSMFSKBxmmjvk=", "owner": "ulyssa", "repo": "iamb", - "rev": "4fc05c7b40b1d5cbeed1b0f1d1d0ba2cd46afda7", + "rev": "3355eb2d2622f28d2fed6eb00a6aa78868a87b83", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "impermanence": { "locked": { - "lastModified": 1724098307, - "narHash": "sha256-7SKGkqrXPLRD0jbs9IOnUhmjJZv2wawrlkgtzF0tMrw=", + "lastModified": 1724489415, + "narHash": "sha256-ey8vhwY/6XCKoh7fyTn3aIQs7WeYSYtLbYEG87VCzX4=", "owner": "nix-community", "repo": "impermanence", - "rev": "9de98e038ae91e15ea725700386044309b340299", + "rev": "c7f5b394397398c023000cf843986ee2571a1fd7", "type": "github" }, "original": { @@ -296,15 +296,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1720626042, - "narHash": "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=", - "rev": "2a4376be20d70feaa2b0e640c5041fb66ddc67ed", + "lastModified": 1723503926, + "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=", + "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a4376be20d70feaa2b0e640c5041fb66ddc67ed.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.90.0.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz" } }, "lix-module": { @@ -317,15 +317,15 @@ ] }, "locked": { - "lastModified": 1720641669, - "narHash": "sha256-yEO2cGNgzm9x/XxiDQI+WckSWnZX63R8aJLBRSXtYNE=", - "rev": "5c48c833c15bb80d127a398a8c2484d42fdd8257", + "lastModified": 1723510904, + "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=", + "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/5c48c833c15bb80d127a398a8c2484d42fdd8257.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz" } }, "lolpizza": { @@ -367,11 +367,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724067415, - "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=", + "lastModified": 1724878143, + "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2", + "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", "type": "github" }, "original": { @@ -399,11 +399,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1724013388, - "narHash": "sha256-vAq+I0IWsIDq5RUc01t25iL46LLxdsmlTJ96A30bMEY=", + "lastModified": 1724967238, + "narHash": "sha256-fydaoGWHKzpDbhWMuKixf+slmiYFqSLOnmVYfFntQxs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f38e71a8e23a27569acbbfee0e83b76c86fa569", + "rev": "893e9c69f3324ae99e87f1e8e49014c3c0ab12cf", "type": "github" }, "original": { @@ -415,11 +415,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1724102008, - "narHash": "sha256-NFzNwyoTmnUmBMIKE7lzY7d0QtJ++onGN1K55cIc5Kw=", + "lastModified": 1725016030, + "narHash": "sha256-Pg/lT6VV1Fk0Ld9oJGcvgD9NK5W0ftZfkQ5WaqylCpw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6ebe64bfe00e71b619578b3539fcba7a28cd1c8c", + "rev": "e5a5a40ef65f73afb94e63faa046f5e77afb294a", "type": "github" }, "original": { @@ -447,11 +447,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1723938990, - "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", + "lastModified": 1724855419, + "narHash": "sha256-WXHSyOF4nBX0cvHN3DfmEMcLOVdKH6tnMk9FQ8wTNRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", + "rev": "ae2fc9e0e42caaf3f068c1bfdc11c71734125e06", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fafb5c65..c9d39604 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ darwin.url = "github:lnl7/nix-darwin/master"; darwin.inputs.nixpkgs.follows = "nixpkgs"; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -149,7 +149,7 @@ darwin.lib.darwinSystem { inherit system; - specialArgs = { inherit lib pkgs inputs self darwin; }; + specialArgs = { inherit lib inputs self darwin; }; modules = [ home-manager.darwinModules.home-manager { @@ -160,6 +160,7 @@ home-manager.extraSpecialArgs = { inherit inputs pkgs; }; } ./darwin-common.nix + lix-module.nixosModules.default ] ++ extraModules; }; diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 34aba735..e40f14f6 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -11,7 +11,7 @@ ./hardware-configuration.nix ./xynospace-matrix.nix ./plausible.nix - ./ts-ovpn.nix + # ./ts-ovpn.nix ../../nixos-modules/system/persist.nix ../../nixos-modules/system/agenix.nix diff --git a/hosts/picard/xynospace-matrix.nix b/hosts/picard/xynospace-matrix.nix index a21ec284..2114b833 100644 --- a/hosts/picard/xynospace-matrix.nix +++ b/hosts/picard/xynospace-matrix.nix @@ -67,6 +67,7 @@ in enable = true; settings.server_name = serverName; extraConfigFiles = [ "/host${ms}" ]; + settings.experimental.msc3575_enabled = true; settings.database.args.user = "matrix-synapse-xynospace"; settings.database.name = "psycopg2"; settings.database.args.database = "matrix-synapse-xynospace";