xyno/nix-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update

Browse source
This commit is contained in:
Lucy Hochkamp 2024-08-30 13:16:18 +02:00
parent e5b7a4b9c6
commit 279570c40b
No known key found for this signature in database
4 changed files with 39 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

68
flake.lock generated
View file

@ -74,11 +74,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723859949, "lastModified": 1724994893,
"narHash": "sha256-kiaGz4deGYKMjJPOji/JVvSP/eTefrIA3rAjOnOpXl4=", "narHash": "sha256-yutISDGg6HUaZqCaa54EcsfTwew3vhNtt/FNXBBo44g=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "076b9a905af8a52b866c8db068d6da475839d97b", "rev": "c8d3157d1f768e382de5526bb38e74d2245cad04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -201,11 +201,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1724100338, "lastModified": 1724856988,
"narHash": "sha256-NAhc/wMVno4DSM9RW6a9R5LGskCScjSm7bwWlFNy9Pg=", "narHash": "sha256-JBLe2CxAhG+J8+x8qmbzkGHNYmGcSiuY2QO4Zhb72lI=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "e2904794749ccc709a238a10e6ee364411c2b820", "rev": "1b5295a3f3d7cccd96eed5bfd394807a4dae87fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -265,11 +265,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1723969902, "lastModified": 1724438132,
"narHash": "sha256-XI9pRlrFapdvT44JxhM3JQqCIf8FleJdFTs41qQcTHw=", "narHash": "sha256-GkA9QmJkHrknVzNJTyIPuR2Crpx/vOdSMFSKBxmmjvk=",
"owner": "ulyssa", "owner": "ulyssa",
"repo": "iamb", "repo": "iamb",
"rev": "4fc05c7b40b1d5cbeed1b0f1d1d0ba2cd46afda7", "rev": "3355eb2d2622f28d2fed6eb00a6aa78868a87b83",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -280,11 +280,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1724098307, "lastModified": 1724489415,
"narHash": "sha256-7SKGkqrXPLRD0jbs9IOnUhmjJZv2wawrlkgtzF0tMrw=", "narHash": "sha256-ey8vhwY/6XCKoh7fyTn3aIQs7WeYSYtLbYEG87VCzX4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "9de98e038ae91e15ea725700386044309b340299", "rev": "c7f5b394397398c023000cf843986ee2571a1fd7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -296,15 +296,15 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1720626042, "lastModified": 1723503926,
"narHash": "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=", "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
"rev": "2a4376be20d70feaa2b0e640c5041fb66ddc67ed", "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
"type": "tarball", "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": { "original": {
"type": "tarball", "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": { "lix-module": {
@ -317,15 +317,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720641669, "lastModified": 1723510904,
"narHash": "sha256-yEO2cGNgzm9x/XxiDQI+WckSWnZX63R8aJLBRSXtYNE=", "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
"rev": "5c48c833c15bb80d127a398a8c2484d42fdd8257", "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
"type": "tarball", "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": { "original": {
"type": "tarball", "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": { "lolpizza": {
@ -367,11 +367,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1724067415, "lastModified": 1724878143,
"narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=", "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2", "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -399,11 +399,11 @@
}, },
"nixpkgs-darwin": { "nixpkgs-darwin": {
"locked": { "locked": {
"lastModified": 1724013388, "lastModified": 1724967238,
"narHash": "sha256-vAq+I0IWsIDq5RUc01t25iL46LLxdsmlTJ96A30bMEY=", "narHash": "sha256-fydaoGWHKzpDbhWMuKixf+slmiYFqSLOnmVYfFntQxs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3f38e71a8e23a27569acbbfee0e83b76c86fa569", "rev": "893e9c69f3324ae99e87f1e8e49014c3c0ab12cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -415,11 +415,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1724102008, "lastModified": 1725016030,
"narHash": "sha256-NFzNwyoTmnUmBMIKE7lzY7d0QtJ++onGN1K55cIc5Kw=", "narHash": "sha256-Pg/lT6VV1Fk0Ld9oJGcvgD9NK5W0ftZfkQ5WaqylCpw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6ebe64bfe00e71b619578b3539fcba7a28cd1c8c", "rev": "e5a5a40ef65f73afb94e63faa046f5e77afb294a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -447,11 +447,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1723938990, "lastModified": 1724855419,
"narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", "narHash": "sha256-WXHSyOF4nBX0cvHN3DfmEMcLOVdKH6tnMk9FQ8wTNRc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", "rev": "ae2fc9e0e42caaf3f068c1bfdc11c71734125e06",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -17,7 +17,7 @@
darwin.url = "github:lnl7/nix-darwin/master"; darwin.url = "github:lnl7/nix-darwin/master";
darwin.inputs.nixpkgs.follows = "nixpkgs"; darwin.inputs.nixpkgs.follows = "nixpkgs";
lix-module = { 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"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -149,7 +149,7 @@
darwin.lib.darwinSystem darwin.lib.darwinSystem
{ {
inherit system; inherit system;
specialArgs = { inherit lib pkgs inputs self darwin; }; specialArgs = { inherit lib inputs self darwin; };
modules = [ modules = [
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
{ {
@ -160,6 +160,7 @@
home-manager.extraSpecialArgs = { inherit inputs pkgs; }; home-manager.extraSpecialArgs = { inherit inputs pkgs; };
} }
./darwin-common.nix ./darwin-common.nix
lix-module.nixosModules.default
] ++ extraModules; ] ++ extraModules;
}; };

2
hosts/picard/default.nix
View file

@ -11,7 +11,7 @@
./hardware-configuration.nix ./hardware-configuration.nix
./xynospace-matrix.nix ./xynospace-matrix.nix
./plausible.nix ./plausible.nix
./ts-ovpn.nix # ./ts-ovpn.nix
../../nixos-modules/system/persist.nix ../../nixos-modules/system/persist.nix
../../nixos-modules/system/agenix.nix ../../nixos-modules/system/agenix.nix

1
hosts/picard/xynospace-matrix.nix
View file

@ -67,6 +67,7 @@ in
enable = true; enable = true;
settings.server_name = serverName; settings.server_name = serverName;
extraConfigFiles = [ "/host${ms}" ]; extraConfigFiles = [ "/host${ms}" ];
settings.experimental.msc3575_enabled = true;
settings.database.args.user = "matrix-synapse-xynospace"; settings.database.args.user = "matrix-synapse-xynospace";
settings.database.name = "psycopg2"; settings.database.name = "psycopg2";
settings.database.args.database = "matrix-synapse-xynospace"; settings.database.args.database = "matrix-synapse-xynospace";